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

Commit 0ee8519

Browse files
committed
Allow PHP 5.6 and 7.0
We're not supposed to bump to a new major version of PHP in a minor release, which is what happened in 2.9.0. This patch reverts that, while keeping compatibility with PHP 7.2.
1 parent 91d147d commit 0ee8519

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

.travis.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,26 @@ env:
1313

1414
matrix:
1515
include:
16+
- php: 5.6
17+
env:
18+
- DEPS=lowest
19+
- php: 5.6
20+
env:
21+
- DEPS=locked
22+
- LEGACY_DEPS="phpunit/phpunit"
23+
- php: 5.6
24+
env:
25+
- DEPS=latest
26+
- php: 7.0
27+
env:
28+
- DEPS=lowest
29+
- php: 7.0
30+
env:
31+
- DEPS=locked
32+
- LEGACY_DEPS="phpunit/phpunit"
33+
- php: 7.0
34+
env:
35+
- DEPS=latest
1636
- php: 7.1
1737
env:
1838
- DEPS=lowest
@@ -38,7 +58,8 @@ before_install:
3858
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
3959

4060
install:
41-
- travis_retry composer install $COMPOSER_ARGS
61+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
62+
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update --with-dependencies $COMPOSER_ARGS $LEGACY_DEPS ; fi
4263
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
4364
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
4465
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
"forum": "https://discourse.zendframework.com/c/questions/components"
1717
},
1818
"require": {
19-
"php": "^7.1",
19+
"php": "^5.6 || ^7.0",
2020
"ext-iconv": "*",
2121
"zendframework/zend-loader": "^2.5",
2222
"zendframework/zend-mime": "^2.5",
2323
"zendframework/zend-stdlib": "^2.7 || ^3.0",
2424
"zendframework/zend-validator": "^2.10.2"
2525
},
2626
"require-dev": {
27-
"phpunit/phpunit": "^7.1.4",
27+
"phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4",
2828
"zendframework/zend-coding-standard": "~1.0.0",
2929
"zendframework/zend-config": "^2.6",
3030
"zendframework/zend-crypt": "^2.6 || ^3.0",
31-
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
31+
"zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
3232
},
3333
"suggest": {
3434
"ext-intl": "Handle IDN in AddressList hostnames",

composer.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)