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: d5b28c3...45d6f40
This commit is contained in:
Jeremy Benoist 2015-11-06 23:39:14 +01:00
parent 3d9ccf9390
commit 872384b0c1
2 changed files with 100 additions and 47 deletions

View file

@ -60,7 +60,8 @@
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "~2.2.0",
"sensio/generator-bundle": "~2.5",
"phpunit/phpunit": "~4.4"
"phpunit/phpunit": "~4.4",
"symfony/phpunit-bridge": "~2.7.0"
},
"scripts": {
"post-install-cmd": [

144
composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "7fb67fafde0e24c1802714a2a47da5e1",
"content-hash": "372936ba75537d8422a8e63bd419c213",
"hash": "01e7829e7ff2b39b288871661bb05e9a",
"content-hash": "76830bc9c2cd6f600613c9eea7c0f1b1",
"packages": [
{
"name": "doctrine/annotations",
@ -77,16 +77,16 @@
},
{
"name": "doctrine/cache",
"version": "v1.5.0",
"version": "v1.5.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "eb8a73619af4f1c8711e2ce482f5de3643258a1f"
"reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/eb8a73619af4f1c8711e2ce482f5de3643258a1f",
"reference": "eb8a73619af4f1c8711e2ce482f5de3643258a1f",
"url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e",
"reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e",
"shasum": ""
},
"require": {
@ -143,7 +143,7 @@
"cache",
"caching"
],
"time": "2015-10-28 11:27:45"
"time": "2015-11-02 18:35:48"
},
{
"name": "doctrine/collections",
@ -357,16 +357,16 @@
},
{
"name": "doctrine/doctrine-bundle",
"version": "v1.5.2",
"version": "1.6.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineBundle.git",
"reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3"
"reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3",
"reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3",
"url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a5b3ba908ba68f3e14e42762a7b940fde65ed7da",
"reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da",
"shasum": ""
},
"require": {
@ -431,42 +431,42 @@
"orm",
"persistence"
],
"time": "2015-08-31 14:47:06"
"time": "2015-11-04 21:33:02"
},
{
"name": "doctrine/doctrine-cache-bundle",
"version": "v1.0.1",
"target-dir": "Doctrine/Bundle/DoctrineCacheBundle",
"version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineCacheBundle.git",
"reference": "e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d"
"reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d",
"reference": "e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d",
"url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/3233bc78e222d528ca89a6a47d48d6f37888e95e",
"reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e",
"shasum": ""
},
"require": {
"doctrine/cache": "~1.3",
"doctrine/cache": "^1.4.2",
"doctrine/inflector": "~1.0",
"php": ">=5.3.2",
"symfony/doctrine-bridge": "~2.2",
"symfony/framework-bundle": "~2.2",
"symfony/security": "~2.2"
"symfony/doctrine-bridge": "~2.2|~3.0",
"symfony/security-acl": "~2.3|~3.0"
},
"require-dev": {
"instaclick/coding-standard": "~1.1",
"instaclick/object-calisthenics-sniffs": "dev-master",
"instaclick/symfony2-coding-standard": "dev-remaster",
"phpunit/phpunit": "~3.7",
"phpunit/phpunit": "~4",
"satooshi/php-coveralls": "~0.6.1",
"squizlabs/php_codesniffer": "dev-master",
"symfony/console": "~2.2",
"symfony/finder": "~2.2",
"symfony/validator": "~2.2",
"symfony/yaml": "~2.2"
"squizlabs/php_codesniffer": "~1.5",
"symfony/console": "~2.2|~3.0",
"symfony/finder": "~2.2|~3.0",
"symfony/framework-bundle": "~2.2|~3.0",
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/validator": "~2.2|~3.0",
"symfony/yaml": "~2.2|~3.0"
},
"type": "symfony-bundle",
"extra": {
@ -475,8 +475,8 @@
}
},
"autoload": {
"psr-0": {
"Doctrine\\Bundle\\DoctrineCacheBundle": ""
"psr-4": {
"Doctrine\\Bundle\\DoctrineCacheBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@ -509,26 +509,26 @@
"email": "fabien@symfony.com"
}
],
"description": "Symfony2 Bundle for Doctrine Cache",
"description": "Symfony Bundle for Doctrine Cache",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"cache",
"caching"
],
"time": "2014-11-28 09:43:36"
"time": "2015-11-05 13:48:27"
},
{
"name": "doctrine/inflector",
"version": "v1.0.1",
"version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604"
"reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/0bcb2e79d8571787f18b7eb036ed3d004908e604",
"reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
"reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
"shasum": ""
},
"require": {
@ -540,7 +540,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.1.x-dev"
}
},
"autoload": {
@ -582,7 +582,7 @@
"singularize",
"string"
],
"time": "2014-12-20 21:24:13"
"time": "2015-11-06 14:35:42"
},
{
"name": "doctrine/instantiator",
@ -1027,12 +1027,12 @@
"source": {
"type": "git",
"url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git",
"reference": "d5b28c367d393f9d9fbc48c4138b2a74d51c0c83"
"reference": "45d6f40178216a840885b4ca6d7de9e67068568a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/d5b28c367d393f9d9fbc48c4138b2a74d51c0c83",
"reference": "d5b28c367d393f9d9fbc48c4138b2a74d51c0c83",
"url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/45d6f40178216a840885b4ca6d7de9e67068568a",
"reference": "45d6f40178216a840885b4ca6d7de9e67068568a",
"shasum": ""
},
"require": {
@ -1086,7 +1086,7 @@
"keywords": [
"User management"
],
"time": "2015-09-15 13:15:07"
"time": "2015-11-03 10:24:23"
},
{
"name": "guzzlehttp/guzzle",
@ -3437,16 +3437,16 @@
},
{
"name": "twig/twig",
"version": "v1.23.0",
"version": "v1.23.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "5868cd822fd6cf626d5f805439575f9c323cee2a"
"reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/5868cd822fd6cf626d5f805439575f9c323cee2a",
"reference": "5868cd822fd6cf626d5f805439575f9c323cee2a",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
"reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
"shasum": ""
},
"require": {
@ -3494,7 +3494,7 @@
"keywords": [
"templating"
],
"time": "2015-10-29 23:29:01"
"time": "2015-11-05 12:49:06"
},
{
"name": "willdurand/hateoas",
@ -4713,6 +4713,58 @@
],
"description": "This bundle generates code for you",
"time": "2015-03-17 06:36:52"
},
{
"name": "symfony/phpunit-bridge",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4",
"reference": "896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"suggest": {
"symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
},
"type": "symfony-bridge",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
}
},
"autoload": {
"files": [
"bootstrap.php"
],
"psr-4": {
"Symfony\\Bridge\\PhpUnit\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com",
"time": "2015-09-27 10:08:51"
}
],
"aliases": [],