diff --git a/composer.json b/composer.json index eb1e61f394..d25966ae92 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "phpexiftool/phpexiftool": "dev-master", "silex/silex": "1.0.*", "swiftmailer/swiftmailer": "4.1.*", - "symfony/symfony": "2.1.*@dev", + "symfony/symfony": "2.1.*", "tecnick.com/tcpdf": "dev-master", "twig/twig": ">=1.9", "twig/extensions": "master", diff --git a/composer.lock b/composer.lock index 1fe0bc8fc5..93520eb7f3 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "c508da190daa1fe68dd5e8b6756143f9", + "hash": "b4d5f31d1d76a04dc89ce17d82aa3161", "packages": [ { "name": "alchemy/Phlickr", @@ -15,14 +15,13 @@ "reference": "89993abd6a02b42e0b765114c34c26c4056762fa", "shasum": "" }, - "time": "2012-04-13 17:43:31", "type": "library", - "installation-source": "source", "autoload": { "psr-0": { "Phlickr_": "./" } - } + }, + "time": "2012-04-13 17:43:31" }, { "name": "alchemy/ghostscript", @@ -96,14 +95,13 @@ "reference": "5f949209461e8f4c31e8476155188923aafa2ae5", "shasum": "" }, - "time": "2012-03-30 15:47:07", "type": "library", - "installation-source": "source", "autoload": { "classmap": [ "lib/" ] - } + }, + "time": "2012-03-30 15:47:07" }, { "name": "alchemy/phpmailer", @@ -113,14 +111,13 @@ "url": "https://github.com/alchemy-fr/PHPMailer_v5.1", "reference": "baabbdc1e68947f19c86e0e9e02d40d6fb1283e4" }, - "time": "2012-11-09 10:51:15", "type": "library", - "installation-source": "source", "autoload": { "classmap": [ "./" ] - } + }, + "time": "2012-11-09 10:51:15" }, { "name": "dailymotion/sdk", @@ -1189,62 +1186,61 @@ "version": "2.1.x-dev", "source": { "type": "git", - "url": "git://github.com/symfony/symfony.git", - "reference": "e0637fa9b75e9a74e6a23dd0167cf74ee9518403" + "url": "https://github.com/symfony/symfony.git", + "reference": "0e7b5fb3bb928cd99efbc7ac0d41f209a7f1c6e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/e0637fa9b75e9a74e6a23dd0167cf74ee9518403", - "reference": "e0637fa9b75e9a74e6a23dd0167cf74ee9518403", + "url": "https://api.github.com/repos/symfony/symfony/zipball/0e7b5fb3bb928cd99efbc7ac0d41f209a7f1c6e8", + "reference": "0e7b5fb3bb928cd99efbc7ac0d41f209a7f1c6e8", "shasum": "" }, "require": { + "doctrine/common": ">=2.2,<3.0", "php": ">=5.3.3", - "doctrine/common": ">2.2,<2.4-dev", "twig/twig": ">=1.9.1,<2.0-dev" }, "replace": { - "symfony/doctrine-bridge": "self.version", - "symfony/monolog-bridge": "self.version", - "symfony/propel1-bridge": "self.version", - "symfony/swiftmailer-bridge": "self.version", - "symfony/twig-bridge": "self.version", - "symfony/framework-bundle": "self.version", - "symfony/security-bundle": "self.version", - "symfony/twig-bundle": "self.version", - "symfony/web-profiler-bundle": "self.version", "symfony/browser-kit": "self.version", "symfony/class-loader": "self.version", "symfony/config": "self.version", "symfony/console": "self.version", "symfony/css-selector": "self.version", "symfony/dependency-injection": "self.version", + "symfony/doctrine-bridge": "self.version", "symfony/dom-crawler": "self.version", "symfony/event-dispatcher": "self.version", "symfony/filesystem": "self.version", "symfony/finder": "self.version", "symfony/form": "self.version", + "symfony/framework-bundle": "self.version", "symfony/http-foundation": "self.version", "symfony/http-kernel": "self.version", "symfony/locale": "self.version", + "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", + "symfony/propel1-bridge": "self.version", "symfony/routing": "self.version", "symfony/security": "self.version", + "symfony/security-bundle": "self.version", "symfony/serializer": "self.version", + "symfony/swiftmailer-bridge": "self.version", "symfony/templating": "self.version", "symfony/translation": "self.version", + "symfony/twig-bridge": "self.version", + "symfony/twig-bundle": "self.version", "symfony/validator": "self.version", + "symfony/web-profiler-bundle": "self.version", "symfony/yaml": "self.version" }, "require-dev": { + "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": ">=2.2,<2.4-dev", "doctrine/orm": ">=2.2.3,<2.4-dev", - "doctrine/data-fixtures": "1.0.*", - "propel/propel1": "dev-master", - "monolog/monolog": ">=1.0,<1.3-dev" + "monolog/monolog": ">=1.0,<1.3-dev", + "propel/propel1": "dev-master" }, - "time": "2013-02-07 22:54:50", "type": "library", "autoload": { "psr-0": { @@ -1270,7 +1266,8 @@ "homepage": "http://symfony.com", "keywords": [ "framework" - ] + ], + "time": "2013-03-01 10:39:52" }, { "name": "tecnick.com/tcpdf",