aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2015-11-06 23:39:14 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2015-11-06 23:39:14 +0100
commit872384b0c18a4c39d7d996e600b25a8568fa6963 (patch)
treea3218d02d0465b97bf9dcdc95f77619eb590ead0
parent3d9ccf9390f35e73428ebf42258253c6808f1590 (diff)
downloadwallabag-872384b0c18a4c39d7d996e600b25a8568fa6963.tar.gz
wallabag-872384b0c18a4c39d7d996e600b25a8568fa6963.tar.zst
wallabag-872384b0c18a4c39d7d996e600b25a8568fa6963.zip
Update deps & add PHPUnit Bridge
Changelogs summary: - symfony/phpunit-bridge installed in version v2.7.6 Release notes: https://github.com/symfony/phpunit-bridge/releases/tag/v2.7.6 - twig/twig updated from v1.23.0 to v1.23.1 See changes: https://github.com/twigphp/Twig/compare/v1.23.0...v1.23.1 Release notes: https://github.com/twigphp/Twig/releases/tag/v1.23.1 - doctrine/inflector updated from v1.0.1 to v1.1.0 See changes: https://github.com/doctrine/inflector/compare/v1.0.1...v1.1.0 Release notes: https://github.com/doctrine/inflector/releases/tag/v1.1.0 - doctrine/cache updated from v1.5.0 to v1.5.1 See changes: https://github.com/doctrine/cache/compare/v1.5.0...v1.5.1 Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.1 - doctrine/doctrine-cache-bundle updated from v1.0.1 to 1.2.1 See changes: https://github.com/doctrine/DoctrineCacheBundle/compare/v1.0.1...1.2.1 Release notes: https://github.com/doctrine/DoctrineCacheBundle/releases/tag/1.2.1 - doctrine/doctrine-bundle updated from v1.5.2 to 1.6.0 See changes: https://github.com/doctrine/DoctrineBundle/compare/v1.5.2...1.6.0 Release notes: https://github.com/doctrine/DoctrineBundle/releases/tag/1.6.0 - friendsofsymfony/user-bundle updated from dev-master to dev-master See changes: https://github.com/FriendsOfSymfony/FOSUserBundle/compare/d5b28c3...45d6f40
-rw-r--r--composer.json3
-rw-r--r--composer.lock144
2 files changed, 100 insertions, 47 deletions
diff --git a/composer.json b/composer.json
index e16de833..b8c936f0 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,8 @@
60 "require-dev": { 60 "require-dev": {
61 "doctrine/doctrine-fixtures-bundle": "~2.2.0", 61 "doctrine/doctrine-fixtures-bundle": "~2.2.0",
62 "sensio/generator-bundle": "~2.5", 62 "sensio/generator-bundle": "~2.5",
63 "phpunit/phpunit": "~4.4" 63 "phpunit/phpunit": "~4.4",
64 "symfony/phpunit-bridge": "~2.7.0"
64 }, 65 },
65 "scripts": { 66 "scripts": {
66 "post-install-cmd": [ 67 "post-install-cmd": [
diff --git a/composer.lock b/composer.lock
index 368f9f95..ee6e483a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "7fb67fafde0e24c1802714a2a47da5e1", 7 "hash": "01e7829e7ff2b39b288871661bb05e9a",
8 "content-hash": "372936ba75537d8422a8e63bd419c213", 8 "content-hash": "76830bc9c2cd6f600613c9eea7c0f1b1",
9 "packages": [ 9 "packages": [
10 { 10 {
11 "name": "doctrine/annotations", 11 "name": "doctrine/annotations",
@@ -77,16 +77,16 @@
77 }, 77 },
78 { 78 {
79 "name": "doctrine/cache", 79 "name": "doctrine/cache",
80 "version": "v1.5.0", 80 "version": "v1.5.1",
81 "source": { 81 "source": {
82 "type": "git", 82 "type": "git",
83 "url": "https://github.com/doctrine/cache.git", 83 "url": "https://github.com/doctrine/cache.git",
84 "reference": "eb8a73619af4f1c8711e2ce482f5de3643258a1f" 84 "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e"
85 }, 85 },
86 "dist": { 86 "dist": {
87 "type": "zip", 87 "type": "zip",
88 "url": "https://api.github.com/repos/doctrine/cache/zipball/eb8a73619af4f1c8711e2ce482f5de3643258a1f", 88 "url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e",
89 "reference": "eb8a73619af4f1c8711e2ce482f5de3643258a1f", 89 "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e",
90 "shasum": "" 90 "shasum": ""
91 }, 91 },
92 "require": { 92 "require": {
@@ -143,7 +143,7 @@
143 "cache", 143 "cache",
144 "caching" 144 "caching"
145 ], 145 ],
146 "time": "2015-10-28 11:27:45" 146 "time": "2015-11-02 18:35:48"
147 }, 147 },
148 { 148 {
149 "name": "doctrine/collections", 149 "name": "doctrine/collections",
@@ -357,16 +357,16 @@
357 }, 357 },
358 { 358 {
359 "name": "doctrine/doctrine-bundle", 359 "name": "doctrine/doctrine-bundle",
360 "version": "v1.5.2", 360 "version": "1.6.0",
361 "source": { 361 "source": {
362 "type": "git", 362 "type": "git",
363 "url": "https://github.com/doctrine/DoctrineBundle.git", 363 "url": "https://github.com/doctrine/DoctrineBundle.git",
364 "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3" 364 "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da"
365 }, 365 },
366 "dist": { 366 "dist": {
367 "type": "zip", 367 "type": "zip",
368 "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", 368 "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a5b3ba908ba68f3e14e42762a7b940fde65ed7da",
369 "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", 369 "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da",
370 "shasum": "" 370 "shasum": ""
371 }, 371 },
372 "require": { 372 "require": {
@@ -431,42 +431,42 @@
431 "orm", 431 "orm",
432 "persistence" 432 "persistence"
433 ], 433 ],
434 "time": "2015-08-31 14:47:06" 434 "time": "2015-11-04 21:33:02"
435 }, 435 },
436 { 436 {
437 "name": "doctrine/doctrine-cache-bundle", 437 "name": "doctrine/doctrine-cache-bundle",
438 "version": "v1.0.1", 438 "version": "1.2.1",
439 "target-dir": "Doctrine/Bundle/DoctrineCacheBundle",
440 "source": { 439 "source": {
441 "type": "git", 440 "type": "git",
442 "url": "https://github.com/doctrine/DoctrineCacheBundle.git", 441 "url": "https://github.com/doctrine/DoctrineCacheBundle.git",
443 "reference": "e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d" 442 "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e"
444 }, 443 },
445 "dist": { 444 "dist": {
446 "type": "zip", 445 "type": "zip",
447 "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d", 446 "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/3233bc78e222d528ca89a6a47d48d6f37888e95e",
448 "reference": "e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d", 447 "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e",
449 "shasum": "" 448 "shasum": ""
450 }, 449 },
451 "require": { 450 "require": {
452 "doctrine/cache": "~1.3", 451 "doctrine/cache": "^1.4.2",
453 "doctrine/inflector": "~1.0", 452 "doctrine/inflector": "~1.0",
454 "php": ">=5.3.2", 453 "php": ">=5.3.2",
455 "symfony/doctrine-bridge": "~2.2", 454 "symfony/doctrine-bridge": "~2.2|~3.0",
456 "symfony/framework-bundle": "~2.2", 455 "symfony/security-acl": "~2.3|~3.0"
457 "symfony/security": "~2.2"
458 }, 456 },
459 "require-dev": { 457 "require-dev": {
460 "instaclick/coding-standard": "~1.1", 458 "instaclick/coding-standard": "~1.1",
461 "instaclick/object-calisthenics-sniffs": "dev-master", 459 "instaclick/object-calisthenics-sniffs": "dev-master",
462 "instaclick/symfony2-coding-standard": "dev-remaster", 460 "instaclick/symfony2-coding-standard": "dev-remaster",
463 "phpunit/phpunit": "~3.7", 461 "phpunit/phpunit": "~4",
464 "satooshi/php-coveralls": "~0.6.1", 462 "satooshi/php-coveralls": "~0.6.1",
465 "squizlabs/php_codesniffer": "dev-master", 463 "squizlabs/php_codesniffer": "~1.5",
466 "symfony/console": "~2.2", 464 "symfony/console": "~2.2|~3.0",
467 "symfony/finder": "~2.2", 465 "symfony/finder": "~2.2|~3.0",
468 "symfony/validator": "~2.2", 466 "symfony/framework-bundle": "~2.2|~3.0",
469 "symfony/yaml": "~2.2" 467 "symfony/phpunit-bridge": "~2.7|~3.0",
468 "symfony/validator": "~2.2|~3.0",
469 "symfony/yaml": "~2.2|~3.0"
470 }, 470 },
471 "type": "symfony-bundle", 471 "type": "symfony-bundle",
472 "extra": { 472 "extra": {
@@ -475,8 +475,8 @@
475 } 475 }
476 }, 476 },
477 "autoload": { 477 "autoload": {
478 "psr-0": { 478 "psr-4": {
479 "Doctrine\\Bundle\\DoctrineCacheBundle": "" 479 "Doctrine\\Bundle\\DoctrineCacheBundle\\": ""
480 } 480 }
481 }, 481 },
482 "notification-url": "https://packagist.org/downloads/", 482 "notification-url": "https://packagist.org/downloads/",
@@ -509,26 +509,26 @@
509 "email": "fabien@symfony.com" 509 "email": "fabien@symfony.com"
510 } 510 }
511 ], 511 ],
512 "description": "Symfony2 Bundle for Doctrine Cache", 512 "description": "Symfony Bundle for Doctrine Cache",
513 "homepage": "http://www.doctrine-project.org", 513 "homepage": "http://www.doctrine-project.org",
514 "keywords": [ 514 "keywords": [
515 "cache", 515 "cache",
516 "caching" 516 "caching"
517 ], 517 ],
518 "time": "2014-11-28 09:43:36" 518 "time": "2015-11-05 13:48:27"
519 }, 519 },
520 { 520 {
521 "name": "doctrine/inflector", 521 "name": "doctrine/inflector",
522 "version": "v1.0.1", 522 "version": "v1.1.0",
523 "source": { 523 "source": {
524 "type": "git", 524 "type": "git",
525 "url": "https://github.com/doctrine/inflector.git", 525 "url": "https://github.com/doctrine/inflector.git",
526 "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604" 526 "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
527 }, 527 },
528 "dist": { 528 "dist": {
529 "type": "zip", 529 "type": "zip",
530 "url": "https://api.github.com/repos/doctrine/inflector/zipball/0bcb2e79d8571787f18b7eb036ed3d004908e604", 530 "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
531 "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604", 531 "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
532 "shasum": "" 532 "shasum": ""
533 }, 533 },
534 "require": { 534 "require": {
@@ -540,7 +540,7 @@
540 "type": "library", 540 "type": "library",
541 "extra": { 541 "extra": {
542 "branch-alias": { 542 "branch-alias": {
543 "dev-master": "1.0.x-dev" 543 "dev-master": "1.1.x-dev"
544 } 544 }
545 }, 545 },
546 "autoload": { 546 "autoload": {
@@ -582,7 +582,7 @@
582 "singularize", 582 "singularize",
583 "string" 583 "string"
584 ], 584 ],
585 "time": "2014-12-20 21:24:13" 585 "time": "2015-11-06 14:35:42"
586 }, 586 },
587 { 587 {
588 "name": "doctrine/instantiator", 588 "name": "doctrine/instantiator",
@@ -1027,12 +1027,12 @@
1027 "source": { 1027 "source": {
1028 "type": "git", 1028 "type": "git",
1029 "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git", 1029 "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git",
1030 "reference": "d5b28c367d393f9d9fbc48c4138b2a74d51c0c83" 1030 "reference": "45d6f40178216a840885b4ca6d7de9e67068568a"
1031 }, 1031 },
1032 "dist": { 1032 "dist": {
1033 "type": "zip", 1033 "type": "zip",
1034 "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/d5b28c367d393f9d9fbc48c4138b2a74d51c0c83", 1034 "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/45d6f40178216a840885b4ca6d7de9e67068568a",
1035 "reference": "d5b28c367d393f9d9fbc48c4138b2a74d51c0c83", 1035 "reference": "45d6f40178216a840885b4ca6d7de9e67068568a",
1036 "shasum": "" 1036 "shasum": ""
1037 }, 1037 },
1038 "require": { 1038 "require": {
@@ -1086,7 +1086,7 @@
1086 "keywords": [ 1086 "keywords": [
1087 "User management" 1087 "User management"
1088 ], 1088 ],
1089 "time": "2015-09-15 13:15:07" 1089 "time": "2015-11-03 10:24:23"
1090 }, 1090 },
1091 { 1091 {
1092 "name": "guzzlehttp/guzzle", 1092 "name": "guzzlehttp/guzzle",
@@ -3437,16 +3437,16 @@
3437 }, 3437 },
3438 { 3438 {
3439 "name": "twig/twig", 3439 "name": "twig/twig",
3440 "version": "v1.23.0", 3440 "version": "v1.23.1",
3441 "source": { 3441 "source": {
3442 "type": "git", 3442 "type": "git",
3443 "url": "https://github.com/twigphp/Twig.git", 3443 "url": "https://github.com/twigphp/Twig.git",
3444 "reference": "5868cd822fd6cf626d5f805439575f9c323cee2a" 3444 "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6"
3445 }, 3445 },
3446 "dist": { 3446 "dist": {
3447 "type": "zip", 3447 "type": "zip",
3448 "url": "https://api.github.com/repos/twigphp/Twig/zipball/5868cd822fd6cf626d5f805439575f9c323cee2a", 3448 "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
3449 "reference": "5868cd822fd6cf626d5f805439575f9c323cee2a", 3449 "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
3450 "shasum": "" 3450 "shasum": ""
3451 }, 3451 },
3452 "require": { 3452 "require": {
@@ -3494,7 +3494,7 @@
3494 "keywords": [ 3494 "keywords": [
3495 "templating" 3495 "templating"
3496 ], 3496 ],
3497 "time": "2015-10-29 23:29:01" 3497 "time": "2015-11-05 12:49:06"
3498 }, 3498 },
3499 { 3499 {
3500 "name": "willdurand/hateoas", 3500 "name": "willdurand/hateoas",
@@ -4713,6 +4713,58 @@
4713 ], 4713 ],
4714 "description": "This bundle generates code for you", 4714 "description": "This bundle generates code for you",
4715 "time": "2015-03-17 06:36:52" 4715 "time": "2015-03-17 06:36:52"
4716 },
4717 {
4718 "name": "symfony/phpunit-bridge",
4719 "version": "v2.7.6",
4720 "source": {
4721 "type": "git",
4722 "url": "https://github.com/symfony/phpunit-bridge.git",
4723 "reference": "896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4"
4724 },
4725 "dist": {
4726 "type": "zip",
4727 "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4",
4728 "reference": "896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4",
4729 "shasum": ""
4730 },
4731 "require": {
4732 "php": ">=5.3.3"
4733 },
4734 "suggest": {
4735 "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
4736 },
4737 "type": "symfony-bridge",
4738 "extra": {
4739 "branch-alias": {
4740 "dev-master": "2.7-dev"
4741 }
4742 },
4743 "autoload": {
4744 "files": [
4745 "bootstrap.php"
4746 ],
4747 "psr-4": {
4748 "Symfony\\Bridge\\PhpUnit\\": ""
4749 }
4750 },
4751 "notification-url": "https://packagist.org/downloads/",
4752 "license": [
4753 "MIT"
4754 ],
4755 "authors": [
4756 {
4757 "name": "Nicolas Grekas",
4758 "email": "p@tchwork.com"
4759 },
4760 {
4761 "name": "Symfony Community",
4762 "homepage": "https://symfony.com/contributors"
4763 }
4764 ],
4765 "description": "Symfony PHPUnit Bridge",
4766 "homepage": "https://symfony.com",
4767 "time": "2015-09-27 10:08:51"
4716 } 4768 }
4717 ], 4769 ],
4718 "aliases": [], 4770 "aliases": [],