From 2f523d8f84f4acc55f1022018a9ec99365db1de4 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 17 Apr 2015 14:50:28 +0200 Subject: [PATCH 1/3] Update ORM requirements to allow DBAL 2.5 again --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c534808e04..b1caf0f94f 100644 --- a/composer.json +++ b/composer.json @@ -9,8 +9,7 @@ "require": { "php": ">=5.3.3", "symfony/symfony": "2.3.*", - "doctrine/orm": "~2.2,>=2.2.3,<2.5", - "doctrine/dbal": "<2.5", + "doctrine/orm": "~2.2.3||~2.3.0||~2.4.8||~2.5", "doctrine/doctrine-bundle": "~1.2", "twig/extensions": "1.0.*", "symfony/assetic-bundle": "~2.3", From 49b862091c6a5510268c73100e859f8eb00e2dc8 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 17 Apr 2015 15:56:14 +0200 Subject: [PATCH 2/3] orm 2.2 and 2.3 are end of life --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b1caf0f94f..a5fe5243f6 100644 --- a/composer.json +++ b/composer.json @@ -9,14 +9,14 @@ "require": { "php": ">=5.3.3", "symfony/symfony": "2.3.*", - "doctrine/orm": "~2.2.3||~2.3.0||~2.4.8||~2.5", + "doctrine/orm": "^2.4.8", "doctrine/doctrine-bundle": "~1.2", "twig/extensions": "1.0.*", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", "sensio/distribution-bundle": "~2.3", - "sensio/framework-extra-bundle": "~3.0,>=3.0.2", + "sensio/framework-extra-bundle": "^3.0.2", "sensio/generator-bundle": "~2.3", "incenteev/composer-parameter-handler": "~2.0" }, From f92af02090ca1fecde19ef1fe8fdb0602e18a975 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 17 Apr 2015 16:22:24 +0200 Subject: [PATCH 3/3] allow semantic twig extension versions --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a5fe5243f6..6334cdbee5 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "symfony/symfony": "2.3.*", "doctrine/orm": "^2.4.8", "doctrine/doctrine-bundle": "~1.2", - "twig/extensions": "1.0.*", + "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4",