Skip to content
This repository was archived by the owner on Jan 21, 2020. It is now read-only.

Commit fbc0bad

Browse files
committed
Updated dependencies and travis configuration to work with legacy dependencies
1 parent a3ee2ca commit fbc0bad

File tree

3 files changed

+153
-91
lines changed

3 files changed

+153
-91
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
global:
1313
- COMPOSER_ARGS="--no-interaction"
1414
- COVERAGE_DEPS="satooshi/php-coveralls"
15+
- LEGACY_DEPS="phpunit/phpunit"
1516

1617
matrix:
1718
include:
@@ -61,10 +62,11 @@ before_install:
6162
- travis_retry composer self-update
6263

6364
install:
64-
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
65+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
66+
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
6567
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
6668
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
67-
- travis_retry composer install $COMPOSER_ARGS
69+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
6870
- composer show
6971

7072
script:

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"middleware",
1010
"psr",
1111
"psr-7",
12-
"zf2"
12+
"zf"
1313
],
1414
"extra": {
1515
"branch-alias": {
@@ -19,18 +19,18 @@
1919
},
2020
"require": {
2121
"php": "^5.6 || ^7.0",
22-
"container-interop/container-interop": "^1.1",
23-
"psr/http-message": "^1.0",
24-
"zendframework/zend-expressive-helpers": "^1.1 || ^2.2 || ^3.0",
25-
"zendframework/zend-expressive-router": "^1.3.2 || ^2.0",
22+
"container-interop/container-interop": "^1.2",
23+
"psr/http-message": "^1.0.1",
24+
"zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1",
25+
"zendframework/zend-expressive-router": "^1.3.2 || ^2.1",
2626
"zendframework/zend-expressive-template": "^1.0.4",
27-
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
27+
"zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
2828
"zendframework/zend-view": "^2.8.1"
2929
},
3030
"require-dev": {
31-
"phpunit/phpunit": "^5.7 || ^6.0",
32-
"zendframework/zend-coding-standard": "~1.0.0",
33-
"malukenho/docheader": "^0.1.5"
31+
"malukenho/docheader": "^0.1.5",
32+
"phpunit/phpunit": "^6.0.8 || ^5.7.15",
33+
"zendframework/zend-coding-standard": "~1.0.0"
3434
},
3535
"autoload": {
3636
"psr-4": {

0 commit comments

Comments
 (0)