From 2c2dfb82a2769f18aeef2621355835ebd95286b3 Mon Sep 17 00:00:00 2001 From: Vinicius Fagundes Date: Mon, 28 Dec 2015 16:45:58 -0200 Subject: [PATCH] update dependencies to php 5.5+ --- .travis.yml | 4 +++- composer.json | 25 ++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f1bb0c..17783a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,15 @@ language: php php: - - 5.4 - 5.5 - 5.6 - hhvm matrix: include: + - php: 5.5 + env: + - EXECUTE_TEST_COVERALLS=true - php: 5.6 env: - EXECUTE_TEST_COVERALLS=true diff --git a/composer.json b/composer.json index 298e7f9..7f34676 100644 --- a/composer.json +++ b/composer.json @@ -15,20 +15,19 @@ ], "require": { - "php": ">=5.3.23", - "zendframework/zend-view":"2.5.1", - "zendframework/zend-http":"2.5.1", + "php": ">=5.5", + "zendframework/zend-view":"~2.5", + "zendframework/zend-http":"~2.5", "spipu/html2pdf":"~4.4" }, "require-dev": { - "zendframework/zend-modulemanager":"2.5.1", - "zendframework/zend-mvc":"2.5.1", - "zendframework/zend-filter":"2.5.1", - "zendframework/zend-inputfilter":"2.5.1", - "zendframework/zend-serializer":"2.5.1", - "zendframework/zend-log":"2.5.1", - "zendframework/zend-i18n":"2.5.1", - "zendframework/zend-console":"2.5.1", + "zendframework/zend-modulemanager":"~2.5", + "zendframework/zend-mvc":"~2.5", + "zendframework/zend-filter":"~2.5", + "zendframework/zend-serializer":"~2.5", + "zendframework/zend-log":"~2.5", + "zendframework/zend-i18n":"~2.5", + "zendframework/zend-console":"~2.5", "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "~2", "thomasbachem/php-short-array-syntax-converter": "dev-master" @@ -48,8 +47,8 @@ "extra": { "branch-alias": { - "dev-master": "0.2.x-dev", - "dev-develop": "0.3.x-dev" + "dev-master": "0.3.x-dev", + "dev-develop": "0.4.x-dev" } } }