From 3666f2a476ba319eb97323577e9e1d0380b99d94 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 5 Sep 2012 22:39:26 +0200 Subject: [PATCH] Bumping required ZF2 version --- .travis/composer.json | 3 +-- composer.json | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis/composer.json b/.travis/composer.json index a42f3fe3..555263ff 100644 --- a/.travis/composer.json +++ b/.travis/composer.json @@ -1,8 +1,7 @@ { "minimum-stability": "dev", "require": { - "doctrine/doctrine-orm-module": "dev-master", - "zendframework/zendframework": "dev-master" + "doctrine/doctrine-orm-module": "dev-master" }, "require-dev": { "zendframework/zend-developer-tools": "dev-master" diff --git a/composer.json b/composer.json index bab21527..647a21f0 100644 --- a/composer.json +++ b/composer.json @@ -34,10 +34,10 @@ "require": { "php": ">=5.3.3", "doctrine/doctrine-module": "dev-master", - "doctrine/orm": ">2.2,<2.4-dev", - "doctrine/dbal": ">2.2,<2.4-dev", + "doctrine/orm": ">=2.3-dev,<2.5-dev", + "doctrine/dbal": ">=2.3-dev,<2.5-dev", "doctrine/migrations": "dev-master", - "zendframework/zendframework": "dev-master" + "zendframework/zendframework": "2.*" }, "require-dev": { "zendframework/zend-developer-tools": "dev-master"