From 43b37308de86c566a11cbb9bd03a13b9b008604b Mon Sep 17 00:00:00 2001 From: Christian Suter Date: Fri, 22 May 2015 16:08:22 +0100 Subject: [PATCH] Updated composer lock file --- composer.lock | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/composer.lock b/composer.lock index 9de5a73d576..cfbb56f7077 100644 --- a/composer.lock +++ b/composer.lock @@ -1146,16 +1146,16 @@ }, { "name": "doctrine/phpcr-bundle", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrinePHPCRBundle.git", - "reference": "23a49602c0b80fb7ec44f3b78b475ba703046555" + "reference": "cdc8c50858ceb9fc01f0cbd72ab03ed1fd7f6b4c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/23a49602c0b80fb7ec44f3b78b475ba703046555", - "reference": "23a49602c0b80fb7ec44f3b78b475ba703046555", + "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/cdc8c50858ceb9fc01f0cbd72ab03ed1fd7f6b4c", + "reference": "cdc8c50858ceb9fc01f0cbd72ab03ed1fd7f6b4c", "shasum": "" }, "require": { @@ -1163,7 +1163,7 @@ "phpcr/phpcr-implementation": "2.1.*", "phpcr/phpcr-utils": "~1.2.0", "symfony/doctrine-bridge": "~2.3", - "symfony/framework-bundle": "~2.3" + "symfony/framework-bundle": "~2.3.27 || ~2.4 || ~2.5.11 || ~2.6.6 || ~2.7" }, "conflict": { "phpcr/phpcr-shell": "<1.0.0-beta1" @@ -1217,7 +1217,7 @@ "persistence", "phpcr" ], - "time": "2015-02-04 17:33:05" + "time": "2015-05-22 10:02:46" }, { "name": "doctrine/phpcr-odm", @@ -2466,9 +2466,9 @@ ], "authors": [ { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -2607,9 +2607,9 @@ ], "authors": [ { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -2905,7 +2905,7 @@ "email": "stof@notk.org" }, { - "name": "KnpLabs", + "name": "Knplabs", "homepage": "http://knplabs.com" }, { @@ -5626,9 +5626,9 @@ ], "authors": [ { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -5793,9 +5793,9 @@ ], "authors": [ { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -7061,16 +7061,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.25", + "version": "v2.3.28", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "959733dc4b1da99b9e93a1762f4217eee20fc933" + "reference": "56bc4057e3849d38aeb5e9742bc800b0518fe1f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/959733dc4b1da99b9e93a1762f4217eee20fc933", - "reference": "959733dc4b1da99b9e93a1762f4217eee20fc933", + "url": "https://api.github.com/repos/symfony/symfony/zipball/56bc4057e3849d38aeb5e9742bc800b0518fe1f0", + "reference": "56bc4057e3849d38aeb5e9742bc800b0518fe1f0", "shasum": "" }, "require": { @@ -7525,7 +7525,7 @@ ], "authors": [ { - "name": "William Durand", + "name": "William DURAND", "email": "william.durand1@gmail.com", "homepage": "http://www.willdurand.fr" } @@ -8404,8 +8404,7 @@ "authors": [ { "name": "Chris Boulton", - "homepage": "http://github.com/chrisboulton", - "role": "Original developer" + "homepage": "http://github.com/chrisboulton" } ], "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",