diff --git a/composer.lock b/composer.lock index cbf21199c6..7ccaa3ac8c 100644 --- a/composer.lock +++ b/composer.lock @@ -387,22 +387,30 @@ }, { "name": "doctrine/cache", - "version": "v1.0", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "914abe4a49f2eae2b268073cca147b530da0308a" + "reference": "d0e4447707a064a5814b18cb0dcc2f24185f6179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/914abe4a49f2eae2b268073cca147b530da0308a", - "reference": "914abe4a49f2eae2b268073cca147b530da0308a", + "url": "https://api.github.com/repos/doctrine/cache/zipball/d0e4447707a064a5814b18cb0dcc2f24185f6179", + "reference": "d0e4447707a064a5814b18cb0dcc2f24185f6179", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "conflict": { + "doctrine/common": ">2.2,<2.4" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-0": { "Doctrine\\Common\\Cache\\": "lib/" @@ -444,7 +452,7 @@ "cache", "caching" ], - "time": "2013-01-10 22:43:46" + "time": "2013-09-26 19:23:25" }, { "name": "doctrine/collections", @@ -515,30 +523,35 @@ }, { "name": "doctrine/common", - "version": "2.3.0", + "version": "v2.4.1", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "d1c7d4334e38cad603a5c863d4c7b91bb04ec6b2" + "reference": "ceb18cf9b0230f3ea208b6238130fd415abda0a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/d1c7d4334e38cad603a5c863d4c7b91bb04ec6b2", - "reference": "d1c7d4334e38cad603a5c863d4c7b91bb04ec6b2", + "url": "https://api.github.com/repos/doctrine/common/zipball/ceb18cf9b0230f3ea208b6238130fd415abda0a7", + "reference": "ceb18cf9b0230f3ea208b6238130fd415abda0a7", "shasum": "" }, "require": { + "doctrine/annotations": "1.*", + "doctrine/cache": "1.*", + "doctrine/collections": "1.*", + "doctrine/inflector": "1.*", + "doctrine/lexer": "1.*", "php": ">=5.3.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "2.4.x-dev" } }, "autoload": { "psr-0": { - "Doctrine\\Common": "lib/" + "Doctrine\\Common\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -580,7 +593,7 @@ "persistence", "spl" ], - "time": "2012-09-20 05:55:18" + "time": "2013-09-07 10:20:34" }, { "name": "doctrine/dbal", @@ -645,6 +658,69 @@ ], "time": "2013-05-11 07:45:37" }, + { + "name": "doctrine/inflector", + "version": "v1.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "54b8333d2a5682afdc690060c1cf384ba9f47f08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/54b8333d2a5682afdc690060c1cf384ba9f47f08", + "reference": "54b8333d2a5682afdc690060c1cf384ba9f47f08", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "autoload": { + "psr-0": { + "Doctrine\\Common\\Inflector\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common String Manipulations with regard to casing and singular/plural rules.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "inflection", + "pluarlize", + "singuarlize", + "string" + ], + "time": "2013-01-10 21:49:15" + }, { "name": "doctrine/lexer", "version": "v1.0", @@ -932,21 +1008,21 @@ }, { "name": "guzzle/guzzle", - "version": "v3.7.2", + "version": "v3.7.4", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "eaef90d27bb1d682e1f6ab2d77606dc0159049e6" + "reference": "b170b028c6bb5799640e46c8803015b0f9a45ed9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/eaef90d27bb1d682e1f6ab2d77606dc0159049e6", - "reference": "eaef90d27bb1d682e1f6ab2d77606dc0159049e6", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b170b028c6bb5799640e46c8803015b0f9a45ed9", + "reference": "b170b028c6bb5799640e46c8803015b0f9a45ed9", "shasum": "" }, "require": { "ext-curl": "*", - "php": ">=5.3.2", + "php": ">=5.3.3", "symfony/event-dispatcher": ">=2.1" }, "replace": { @@ -1020,7 +1096,7 @@ "rest", "web service" ], - "time": "2013-08-02 18:31:05" + "time": "2013-10-02 20:47:00" }, { "name": "imagine/imagine", @@ -1028,12 +1104,12 @@ "source": { "type": "git", "url": "https://github.com/avalanche123/Imagine.git", - "reference": "64ed228095ec1f99e1124debf87b4b8ebd83070b" + "reference": "d345ea78e813d32c0e54ec73ec75e2d783461766" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/64ed228095ec1f99e1124debf87b4b8ebd83070b", - "reference": "64ed228095ec1f99e1124debf87b4b8ebd83070b", + "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/d345ea78e813d32c0e54ec73ec75e2d783461766", + "reference": "d345ea78e813d32c0e54ec73ec75e2d783461766", "shasum": "" }, "require": { @@ -1077,20 +1153,20 @@ "image manipulation", "image processing" ], - "time": "2013-09-02 21:53:44" + "time": "2013-10-03 13:30:07" }, { "name": "jms/metadata", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "0af8423dc23dfeed1592426106d2ffbc69f68057" + "reference": "246d7096801ce29b5aea30a1abf0277ccfb9f055" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/0af8423dc23dfeed1592426106d2ffbc69f68057", - "reference": "0af8423dc23dfeed1592426106d2ffbc69f68057", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/246d7096801ce29b5aea30a1abf0277ccfb9f055", + "reference": "246d7096801ce29b5aea30a1abf0277ccfb9f055", "shasum": "" }, "require": { @@ -1129,7 +1205,7 @@ "xml", "yaml" ], - "time": "2013-08-27 18:10:33" + "time": "2013-09-13 09:05:44" }, { "name": "jms/parser-lib", @@ -2538,16 +2614,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.4", + "version": "v2.3.5", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "4fb225f4e315c11aa6d8935b1c0ceaf48ba39f1f" + "reference": "aa5626cd2a359567c948ebdeeca68d948640302f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/4fb225f4e315c11aa6d8935b1c0ceaf48ba39f1f", - "reference": "4fb225f4e315c11aa6d8935b1c0ceaf48ba39f1f", + "url": "https://api.github.com/repos/symfony/symfony/zipball/aa5626cd2a359567c948ebdeeca68d948640302f", + "reference": "aa5626cd2a359567c948ebdeeca68d948640302f", "shasum": "" }, "require": { @@ -2642,15 +2718,15 @@ "keywords": [ "framework" ], - "time": "2013-08-27 08:58:24" + "time": "2013-09-27 07:31:40" }, { "name": "tecnick.com/tcpdf", - "version": "6.0.025", + "version": "6.0.037", "source": { "type": "git", "url": "http://git.code.sf.net/p/tcpdf/code", - "reference": "a8ec5fe7efc5a18d64ad95a760e2626a52674d43" + "reference": "df410b084d63a23acf694365bf8ff0c8ccb2fc2b" }, "require": { "php": ">=5.3.0" @@ -2699,7 +2775,7 @@ "pdf417", "qrcode" ], - "time": "2013-09-04 18:32:13" + "time": "2013-09-30 20:58:11" }, { "name": "themattharris/tmhoauth", @@ -2792,16 +2868,16 @@ }, { "name": "twig/twig", - "version": "v1.13.2", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "6d6a1009427d1f398c9d40904147bf9f723d5755" + "reference": "224fc55635d544a2ec8edb3592be18db5a093f59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/6d6a1009427d1f398c9d40904147bf9f723d5755", - "reference": "6d6a1009427d1f398c9d40904147bf9f723d5755", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/224fc55635d544a2ec8edb3592be18db5a093f59", + "reference": "224fc55635d544a2ec8edb3592be18db5a093f59", "shasum": "" }, "require": { @@ -2810,7 +2886,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -2837,7 +2913,7 @@ "keywords": [ "templating" ], - "time": "2013-08-03 15:35:31" + "time": "2013-10-03 06:41:20" }, { "name": "zend/gdata", @@ -3289,12 +3365,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "b4a135c7db56ecc4602b54a2184368f440cac33e" + "reference": "b1e7d5a991ca891cd66c143a618f5ce1e679ba9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/b4a135c7db56ecc4602b54a2184368f440cac33e", - "reference": "b4a135c7db56ecc4602b54a2184368f440cac33e", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/b1e7d5a991ca891cd66c143a618f5ce1e679ba9f", + "reference": "b1e7d5a991ca891cd66c143a618f5ce1e679ba9f", "shasum": "" }, "require": { @@ -3336,7 +3412,7 @@ "keywords": [ "database" ], - "time": "2013-07-10 17:04:07" + "time": "2013-09-16 23:31:59" }, { "name": "fabpot/goutte", @@ -3454,16 +3530,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "1.2.12", + "version": "1.2.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "0e9958c459d675fb497d8dc5001c91d335734e48" + "reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e9958c459d675fb497d8dc5001c91d335734e48", - "reference": "0e9958c459d675fb497d8dc5001c91d335734e48", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/466e7cd2554b4e264c9e3f31216d25ac0e5f3d94", + "reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94", "shasum": "" }, "require": { @@ -3511,7 +3587,7 @@ "testing", "xunit" ], - "time": "2013-07-06 06:26:16" + "time": "2013-09-10 08:14:32" }, { "name": "phpunit/php-file-iterator", @@ -3648,16 +3724,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "31babf400e5b5868573bf49a000a3519d3978233" + "reference": "5220af2a7929aa35cf663d97c89ad3d50cf5fa3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/31babf400e5b5868573bf49a000a3519d3978233", - "reference": "31babf400e5b5868573bf49a000a3519d3978233", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/5220af2a7929aa35cf663d97c89ad3d50cf5fa3e", + "reference": "5220af2a7929aa35cf663d97c89ad3d50cf5fa3e", "shasum": "" }, "require": { @@ -3694,20 +3770,20 @@ "keywords": [ "tokenizer" ], - "time": "2013-08-04 05:57:48" + "time": "2013-09-13 04:58:23" }, { "name": "phpunit/phpunit", - "version": "3.7.24", + "version": "3.7.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "af7b77ccb5c64458bdfca95665d29558d1df7d08" + "reference": "4b024e753e3421837afbcca962c8724c58b39376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/af7b77ccb5c64458bdfca95665d29558d1df7d08", - "reference": "af7b77ccb5c64458bdfca95665d29558d1df7d08", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b024e753e3421837afbcca962c8724c58b39376", + "reference": "4b024e753e3421837afbcca962c8724c58b39376", "shasum": "" }, "require": { @@ -3768,7 +3844,7 @@ "testing", "xunit" ], - "time": "2013-08-09 06:58:24" + "time": "2013-09-16 03:09:52" }, { "name": "phpunit/phpunit-mock-objects",