From 5b7f3fa2ecef0b96b7769e26dba6010be3f6a1be Mon Sep 17 00:00:00 2001
From: Tom Anderson <tom.h.anderson@gmail.com>
Date: Sun, 20 Sep 2015 18:04:23 -0600
Subject: [PATCH] Update to ZF2.5, Apigility 1.1

---
 .travis.yml   |  1 -
 composer.json | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e6ca2ea4..e6ca74f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ services:
 matrix:
   fast_finish: true
   include:
-    - php: 5.4
     - php: 5.5
       env:
         - EXECUTE_CS_CHECK=true
diff --git a/composer.json b/composer.json
index 4bf0bd28..05cadd8c 100644
--- a/composer.json
+++ b/composer.json
@@ -22,22 +22,22 @@
         }
     },
     "require-dev": {
-        "doctrine/doctrine-mongo-odm-module": "^0.8.0",
-        "doctrine/doctrine-orm-module": "^0.8.0",
-        "doctrine/mongodb-odm": "~1.0.0@beta",
-        "phpunit/phpunit": "~4.7",
+        "doctrine/doctrine-mongo-odm-module": "^0.9.0",
+        "doctrine/doctrine-orm-module": "^0.9.0",
+        "doctrine/mongodb-odm": "^1",
+        "phpunit/phpunit": "^4.7",
         "squizlabs/php_codesniffer": "^2.3.0",
-        "zendframework/zend-form": "~2.4.0",
-        "zendframework/zend-log": "~2.4.0",
-        "zendframework/zend-serializer": "~2.4.0",
-        "zendframework/zend-test": "~2.4.0",
-        "zfcampus/zf-apigility-admin": "~1.1",
-        "zendframework/zend-i18n": "~2.4.0"
+        "zendframework/zend-form": "^2.5.0",
+        "zendframework/zend-log": "^2.5.0",
+        "zendframework/zend-serializer": "^2.5.0",
+        "zendframework/zend-test": "^2.5.0",
+        "zfcampus/zf-apigility-admin": "^1.1",
+        "zendframework/zend-i18n": "^2.5.0"
     },
     "require": {
         "php": ">=5.4",
         "phpro/zf-doctrine-hydration-module": "^0.1.5",
-        "zfcampus/zf-apigility": "~1.0"
+        "zfcampus/zf-apigility": "^1.0"
     },
     "prefer-stable": true,
     "autoload": {