From f7ce16ef70a8045265978ccd8af25c34775b6b91 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 20 Dec 2013 17:55:52 +0100 Subject: [PATCH] Update dependencies --- composer.json | 2 +- composer.lock | 53 ++++++++++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 1278e3b80a..a9818599b4 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "php-xpdf/php-xpdf" : "~0.2.1", "phpexiftool/phpexiftool" : "~0.3", "silex/silex" : "1.1.x-dev@dev", - "silex/web-profiler" : "~1.0.0", + "silex/web-profiler" : "~1.0.0@dev", "swiftmailer/swiftmailer" : "~4.3.0", "symfony/symfony" : "~2.4", "alchemy-fr/tcpdf-clone" : "~6.0", diff --git a/composer.lock b/composer.lock index 4c392fa9a4..8b781712ad 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "2c0ef0f8f4568b105cf63028188d6b82", + "hash": "33fb601111277362faca0ff80185d4ab", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -1481,16 +1481,16 @@ }, { "name": "jms/serializer", - "version": "0.13.0", + "version": "0.14.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "9e0fcd00a374e9ad484687628c6c25ab1083ea5a" + "reference": "22daa254e54f4b69292bd8679d7a6f3a78dc85d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/9e0fcd00a374e9ad484687628c6c25ab1083ea5a", - "reference": "9e0fcd00a374e9ad484687628c6c25ab1083ea5a", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/22daa254e54f4b69292bd8679d7a6f3a78dc85d4", + "reference": "22daa254e54f4b69292bd8679d7a6f3a78dc85d4", "shasum": "" }, "require": { @@ -1502,6 +1502,9 @@ }, "require-dev": { "doctrine/orm": ">=2.1,<2.4-dev", + "doctrine/phpcr-odm": "~1.0.1", + "jackalope/jackalope-doctrine-dbal": "1.0.*", + "propel/propel1": "~1.7", "symfony/filesystem": "2.*", "symfony/form": ">=2.1,<2.2-dev", "symfony/translation": ">=2.0,<2.2-dev", @@ -1515,7 +1518,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.13-dev" + "dev-master": "0.14-dev" } }, "autoload": { @@ -1544,20 +1547,20 @@ "serialization", "xml" ], - "time": "2013-07-29 13:39:49" + "time": "2013-12-04 16:46:05" }, { "name": "justinrainbow/json-schema", - "version": "1.3.3", + "version": "1.3.5", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "56fe099669ff3ec3be859ec02e3da965a720184d" + "reference": "01949f6d2130e9737ffae5d3952909a8de70d114" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/56fe099669ff3ec3be859ec02e3da965a720184d", - "reference": "56fe099669ff3ec3be859ec02e3da965a720184d", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/01949f6d2130e9737ffae5d3952909a8de70d114", + "reference": "01949f6d2130e9737ffae5d3952909a8de70d114", "shasum": "" }, "require": { @@ -1565,7 +1568,8 @@ }, "require-dev": { "json-schema/json-schema-test-suite": "1.1.0", - "phpunit/phpunit": "~3.7.0" + "phpdocumentor/phpdocumentor": "~2", + "phpunit/phpunit": "~3.7" }, "bin": [ "bin/validate-json" @@ -1611,7 +1615,7 @@ "json", "schema" ], - "time": "2013-07-22 15:15:25" + "time": "2013-12-13 15:21:04" }, { "name": "media-alchemyst/media-alchemyst", @@ -2740,17 +2744,17 @@ }, { "name": "silex/web-profiler", - "version": "v1.0.1", + "version": "dev-master", "target-dir": "Silex/Provider", "source": { "type": "git", "url": "https://github.com/silexphp/Silex-WebProfiler.git", - "reference": "3d875ac4f583e893a076ec51478e38eeaf0cb562" + "reference": "06bd4fcd563d1e114e5c1768dd87da771846fee6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Silex-WebProfiler/zipball/3d875ac4f583e893a076ec51478e38eeaf0cb562", - "reference": "3d875ac4f583e893a076ec51478e38eeaf0cb562", + "url": "https://api.github.com/repos/silexphp/Silex-WebProfiler/zipball/06bd4fcd563d1e114e5c1768dd87da771846fee6", + "reference": "06bd4fcd563d1e114e5c1768dd87da771846fee6", "shasum": "" }, "require": { @@ -2781,7 +2785,7 @@ ], "description": "A WebProfiler for Silex", "homepage": "http://silex.sensiolabs.org/", - "time": "2013-05-03 17:04:41" + "time": "2013-12-05 21:22:21" }, { "name": "swftools/swftools", @@ -3138,16 +3142,16 @@ }, { "name": "twig/twig", - "version": "v1.14.2", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "ca445842fcea4f844d68203ffa2d00f5e3cdea64" + "reference": "85e4ff98000157ff753d934b9f13659a953f5666" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/ca445842fcea4f844d68203ffa2d00f5e3cdea64", - "reference": "ca445842fcea4f844d68203ffa2d00f5e3cdea64", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/85e4ff98000157ff753d934b9f13659a953f5666", + "reference": "85e4ff98000157ff753d934b9f13659a953f5666", "shasum": "" }, "require": { @@ -3156,7 +3160,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -3183,7 +3187,7 @@ "keywords": [ "templating" ], - "time": "2013-10-30 08:20:53" + "time": "2013-12-06 07:47:10" }, { "name": "vierbergenlars/php-semver", @@ -4275,6 +4279,7 @@ "igorw/get-in": 20, "imagine/imagine": 20, "silex/silex": 20, + "silex/web-profiler": 20, "doctrine/migrations": 20, "behat/behat": 20, "behat/gherkin": 20