From 972a68e847cd9433b61abb14a924c56f40840ffd Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 10 Oct 2013 11:44:05 +0200 Subject: [PATCH] Update dependencies, fix travis build --- composer.json | 2 +- composer.lock | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 46a5082a0e..6ad283b7e3 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "silex/silex" : "~1.0.0", "silex/web-profiler" : "~1.0.0", "swiftmailer/swiftmailer" : "~4.3.0", - "symfony/symfony" : "~2.3", + "symfony/symfony" : "2.3.x-dev@dev", "tecnick.com/tcpdf" : "~6.0", "themattharris/tmhoauth" : "~0.7", "twig/twig" : "~1.12", diff --git a/composer.lock b/composer.lock index 7ccaa3ac8c..b22a8edaa1 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": "8f2b9cc38d641ce5a30b779388b27465", + "hash": "124ab6242ad1fcd84b9f3c991bc8b079", "packages": [ { "name": "alchemy/binary-driver", @@ -2614,16 +2614,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.5", + "version": "2.3.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "aa5626cd2a359567c948ebdeeca68d948640302f" + "reference": "e01461df62d4abdb0a44859e91e98ee7416420a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/aa5626cd2a359567c948ebdeeca68d948640302f", - "reference": "aa5626cd2a359567c948ebdeeca68d948640302f", + "url": "https://api.github.com/repos/symfony/symfony/zipball/e01461df62d4abdb0a44859e91e98ee7416420a2", + "reference": "e01461df62d4abdb0a44859e91e98ee7416420a2", "shasum": "" }, "require": { @@ -2718,7 +2718,7 @@ "keywords": [ "framework" ], - "time": "2013-09-27 07:31:40" + "time": "2013-10-10 06:15:46" }, { "name": "tecnick.com/tcpdf", @@ -3902,6 +3902,7 @@ "minimum-stability": "stable", "stability-flags": { "imagine/imagine": 20, + "symfony/symfony": 20, "doctrine/data-fixtures": 20 }, "platform": {