commit 6a7f9c91f9612836c650633bbb44df66440785ab
parent 26aa76964f1f11a50edbaf4f7563e53a2eb08f88
Author: Timo A. Hummel <felicitus@felicitus.org>
Date: Tue, 16 Feb 2016 13:14:51 +0100
Updated doctrine/doctrine-bundle and doctrine/doctrine to newer version
Diffstat:
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/composer.lock b/composer.lock
@@ -689,16 +689,16 @@
},
{
"name": "doctrine/doctrine-bundle",
- "version": "v1.5.2",
+ "version": "1.6.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3"
+ "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3",
- "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3",
+ "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/e9c2ccf573b59b7cea566390f34254fed3c20ed9",
+ "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9",
"shasum": ""
},
"require": {
@@ -714,6 +714,7 @@
"doctrine/orm": "~2.3",
"phpunit/phpunit": "~4",
"satooshi/php-coveralls": "~0.6.1",
+ "symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/validator": "~2.2|~3.0",
"symfony/yaml": "~2.2|~3.0",
"twig/twig": "~1.10"
@@ -763,7 +764,7 @@
"orm",
"persistence"
],
- "time": "2015-08-31 14:47:06"
+ "time": "2016-01-10 17:21:44"
},
{
"name": "doctrine/doctrine-cache-bundle",
@@ -1210,32 +1211,31 @@
},
{
"name": "doctrine/orm",
- "version": "v2.5.1",
+ "version": "v2.5.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
- "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945"
+ "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6a83bedbe67579cb0bfb688e982e617943a2945",
- "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945",
+ "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/bc4ddbfb0114cb33438cc811c9a740d8aa304aab",
+ "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab",
"shasum": ""
},
"require": {
"doctrine/cache": "~1.4",
"doctrine/collections": "~1.2",
- "doctrine/common": ">=2.5-dev,<2.6-dev",
+ "doctrine/common": ">=2.5-dev,<2.7-dev",
"doctrine/dbal": ">=2.5-dev,<2.6-dev",
"doctrine/instantiator": "~1.0.1",
"ext-pdo": "*",
"php": ">=5.4",
- "symfony/console": "~2.5"
+ "symfony/console": "~2.5|~3.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
- "satooshi/php-coveralls": "dev-master",
- "symfony/yaml": "~2.1"
+ "symfony/yaml": "~2.3|~3.0"
},
"suggest": {
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
@@ -1283,7 +1283,7 @@
"database",
"orm"
],
- "time": "2015-08-31 12:59:39"
+ "time": "2016-01-05 21:34:58"
},
{
"name": "dunglas/api-bundle",