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

Commit 20eb387

Browse files
committed
phpunit 4 droped
added phpunit 5.7.14 and phpunit 6.0.7 added ::class syntax in tests
1 parent 3d19867 commit 20eb387

File tree

61 files changed

+1199
-490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1199
-490
lines changed

.travis.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ cache:
1515

1616
env:
1717
global:
18+
- COMPOSER_ARGS="--no-interaction"
19+
- LEGACY_DEPS="phpunit/phpunit"
1820
- SITE_URL: https://zendframework.github.io/zend-mvc
1921
- GH_USER_NAME: "Matthew Weier O'Phinney"
2022
- GH_USER_EMAIL: [email protected]
@@ -58,10 +60,6 @@ matrix:
5860
allow_failures:
5961
- php: hhvm
6062

61-
env:
62-
global:
63-
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
64-
6563
notifications:
6664
irc: "irc.freenode.org#zftalk.dev"
6765
email: false
@@ -72,9 +70,14 @@ before_install:
7270

7371
install:
7472
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
75-
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
76-
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
77-
- travis_retry composer install $COMPOSER_ARGS
73+
- 'if [[ $DEPS == 'lowest' ]]; then
74+
travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS
75+
if [[ $DEPS == 'lowest' ]]; then
76+
--with-dependencies $LEGACY_DEPS
77+
fi;
78+
fi'
79+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 --with-dependencies $LEGACY_DEPS ; fi
80+
- if [[ $DEPS == 'locked' ]]; then travis_retry composer install $COMPOSER_ARGS ; fi
7881
- composer show --installed
7982

8083
script:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"zendframework/zend-json": "^2.6.1 || ^3.0",
2828
"zendframework/zend-psr7bridge": "^0.2",
2929
"fabpot/php-cs-fixer": "1.7.*",
30-
"phpunit/phpunit": "^4.5"
30+
"phpunit/phpunit": "^6.0.7 || ^5.7.14"
3131
},
3232
"suggest": {
3333
"zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",

0 commit comments

Comments
 (0)