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

Commit 497c34e

Browse files
weierophinneyweierophinney
committed
Provide PHP 7.2 support for zend-mvc 2.7 series
- Updates dependencies to versions known to work with 2.7 when possible. - Fixes a signature within the PluginManager - Fixes a test asset signature - Adds 7.1 and 7.2 jobs - Drops PHP 5.5 from the matrix Most dependencies _require_ 5.6 as a minimum supported version, and thus we cannot install dependencies as a result. It may still _work_ on 5.5, but if you're on 5.5, you don't care about 7.2 support. - Use latest possible version of PHPUnit in the v4 series.
1 parent 9dcaaad commit 497c34e

File tree

5 files changed

+630
-493
lines changed

5 files changed

+630
-493
lines changed

‎.travis.yml‎

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,21 @@ branches:
1010
cache:
1111
directories:
1212
- $HOME/.composer/cache
13-
- $HOME/.local
14-
- zf-mkdoc-theme
1513

1614
env:
1715
global:
18-
- SITE_URL: https://zendframework.github.io/zend-mvc
19-
- GH_USER_NAME: "Matthew Weier O'Phinney"
20-
- GH_USER_EMAIL: matthew@weierophinney.net
21-
- GH_REF: github.com/zendframework/zend-mvc.git
22-
- secure: "naVln9sqGUKWRbe3qlbtcw9Ink0qXmP6iU8A0IAScpuYOeGkDF9ripkCWytjJb+sZFOpjbwwV5spoaWRied1A10P6f8GRMAPJ1xEa0Pm7JE5iCoijUdiC2FJlv0Xd79ir5xAKb4mvyAGxRDgCYXVGYnszGLQYyfaTJ9hVlRQw6N3hcWWUADXxV4Z7Akp5XN6mo52ZRwAXJNmJliyDC4INC1AE2Y8hMbD4SjIetsO7VYBBiOYJhd/9ir7ETlbvt7npEil7KKZP0Y8lanTU2coKESut4b0vE9Vxq6znoK6jrV3xULuZOU6xe3Di8roIAFaR/neeX/blfuvgYCP4lM/ed+CaSD56aFIGizyP0gLB7xrNooBttFh0JV69/8Iu5G7dbZ3nw6gc0cXDvnl9aHpsInAlGbJShlJR9JY1OqxhewgNVA9cWTs2IekdY5Zz/be+elXjYIWkM+3ig6Lw41uaE4AwKp+MdQeyhp4snUIJZeXpdRYsmPDbYI3xTPFDc3bbYgypasox+jLQB0QXY5HKUrlaKdZiY6s1rMHTRnFLLybUlxbPIM1J/rMHPjs0YRgABtVPUsXpNKkY08pkk0cfvxAKTMGP7SmN3P/cSUeWvNNInCUjCnYWSqcqcp25QoIy9BTF4gKjwoCRPfIgzj3jd0qOoRkYx2HuWZVA5+q8SM="
16+
- COMPOSER_ARGS="--no-interaction"
2317

2418
matrix:
2519
fast_finish: true
2620
include:
27-
- php: 5.5
28-
env:
29-
- DEPS=lowest
30-
- php: 5.5
31-
env:
32-
- DEPS=locked
33-
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
34-
- PATH="$HOME/.local/bin:$PATH"
35-
- php: 5.5
36-
env:
37-
- DEPS=latest
3821
- php: 5.6
3922
env:
4023
- DEPS=lowest
4124
- php: 5.6
4225
env:
4326
- DEPS=locked
27+
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
4428
- TEST_COVERAGE=true
4529
- php: 5.6
4630
env:
@@ -51,10 +35,29 @@ matrix:
5135
- php: 7
5236
env:
5337
- DEPS=locked
38+
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
5439
- CHECK_CS=true
5540
- php: 7
5641
env:
5742
- DEPS=latest
43+
- php: 7.1
44+
env:
45+
- DEPS=lowest
46+
- php: 7.1
47+
env:
48+
- DEPS=locked
49+
- php: 7.1
50+
env:
51+
- DEPS=latest
52+
- php: 7.2
53+
env:
54+
- DEPS=lowest
55+
- php: 7.2
56+
env:
57+
- DEPS=locked
58+
- php: 7.2
59+
env:
60+
- DEPS=latest
5861
- php: hhvm
5962
env:
6063
- DEPS=lowest
@@ -67,32 +70,24 @@ matrix:
6770
allow_failures:
6871
- php: hhvm
6972

70-
env:
71-
global:
72-
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
73-
7473
notifications:
75-
irc: "irc.freenode.org#zftalk.dev"
7674
email: false
7775

7876
before_install:
79-
- travis_retry composer self-update
8077
- if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
8178

8279
install:
80+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
81+
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
8382
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
8483
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
85-
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
84+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS php-coveralls/php-coveralls:^1.0 ; fi
8685
- travis_retry composer install $COMPOSER_ARGS
87-
- composer show --installed
86+
- stty cols 120 && composer show
8887

8988
script:
9089
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
9190
- if [[ $CHECK_CS == 'true' ]]; then composer cs-check ; fi
92-
- if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then travis_retry curl -sSL https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh | bash ; fi
9391

9492
after_script:
95-
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer upload-coverage ; fi
96-
97-
after_success:
98-
- if [[ $DEPLOY_DOCS == "true" ]]; then ./zf-mkdoc-theme/deploy.sh ; fi
93+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi

‎composer.json‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,35 @@
1414
},
1515
"require": {
1616
"php": "^5.5 || ^7.0",
17-
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
18-
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
19-
"zendframework/zend-hydrator": "^1.1 || ^2.1",
20-
"zendframework/zend-form": "^2.8.2",
17+
"zendframework/zend-eventmanager": "^2.6.4 || ^3.0",
18+
"zendframework/zend-servicemanager": "^2.7.9 || ^3.0.3",
19+
"zendframework/zend-hydrator": "^1.1 || ^2.4",
20+
"zendframework/zend-form": "^2.11",
2121
"zendframework/zend-stdlib": "^2.7.5 || ^3.0",
2222
"zendframework/zend-psr7bridge": "^0.2",
2323
"container-interop/container-interop": "^1.1"
2424
},
2525
"require-dev": {
26-
"zendframework/zend-authentication": "^2.5.3",
27-
"zendframework/zend-cache": "^2.6.1",
28-
"zendframework/zend-console": "^2.6",
26+
"zendframework/zend-authentication": "^2.6",
27+
"zendframework/zend-cache": "^2.8",
28+
"zendframework/zend-console": "^2.7",
2929
"zendframework/zend-di": "^2.6",
30-
"zendframework/zend-filter": "^2.6.1",
31-
"zendframework/zend-http": "^2.5.4",
32-
"zendframework/zend-i18n": "^2.6",
33-
"zendframework/zend-inputfilter": "^2.6",
30+
"zendframework/zend-filter": "^2.8",
31+
"zendframework/zend-http": "^2.8",
32+
"zendframework/zend-i18n": "^2.8",
33+
"zendframework/zend-inputfilter": "^2.8",
3434
"zendframework/zend-json": "^2.6.1",
35-
"zendframework/zend-log": "^2.7.1",
36-
"zendframework/zend-modulemanager": "^2.7.1",
37-
"zendframework/zend-session": "^2.6.2",
38-
"zendframework/zend-serializer": "^2.6.1",
39-
"zendframework/zend-text": "^2.6",
40-
"zendframework/zend-uri": "^2.5",
41-
"zendframework/zend-validator": "^2.6",
42-
"zendframework/zend-view": "^2.6.3",
35+
"zendframework/zend-log": "^2.9.3",
36+
"zendframework/zend-modulemanager": "^2.8",
37+
"zendframework/zend-session": "^2.8.1",
38+
"zendframework/zend-serializer": "^2.8",
39+
"zendframework/zend-text": "^2.7",
40+
"zendframework/zend-uri": "^2.6",
41+
"zendframework/zend-validator": "^2.10",
42+
"zendframework/zend-view": "^2.9",
4343
"friendsofphp/php-cs-fixer": "1.7.*",
44-
"phpunit/PHPUnit": "^4.5",
44+
"phpunit/phpunit": "^4.8.36",
45+
"sebastian/comparator": "^1.2.4",
4546
"sebastian/version": "^1.0.4"
4647
},
4748
"replace": {

0 commit comments

Comments
 (0)