Skip to content

Commit 06202c8

Browse files
authored
Merge pull request #562 from kokspflanze/feature/phpunit7
update to phpunit7
2 parents dcca991 + af554db commit 06202c8

File tree

3 files changed

+568
-490
lines changed

3 files changed

+568
-490
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ matrix:
2222
- php: 7.1
2323
env:
2424
- DEPS=locked
25-
- CS_CHECK=true
25+
- TEST_COVERAGE=true
2626
- php: 7.1
2727
env:
2828
- DEPS=latest
@@ -52,7 +52,6 @@ matrix:
5252
env:
5353
- DEPS=latest
5454
allow_failures:
55-
- php: 7.2
5655
- php: nightly
5756

5857
before_install:

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
"symfony/console": "^2.3 || ^3.0 || ^4.0",
4545
"zendframework/zend-stdlib": "^2.7.7 || ^3.0.1",
4646
"zendframework/zend-hydrator": "^1.1 || ^2.2.1",
47-
"zendframework/zend-mvc": "^2.7.10 || ^3.0.1",
47+
"zendframework/zend-mvc": "^2.7.13 || ^3.0.1",
4848
"zendframework/zend-servicemanager": "^2.7.6 || ^3.1"
4949
},
5050
"require-dev": {
51-
"phpunit/phpunit": "^6.5",
51+
"phpunit/phpunit": "^7.0.3",
5252
"squizlabs/php_codesniffer": "^2.7",
5353
"doctrine/data-fixtures": "^1.2.1",
5454
"doctrine/migrations": "^1.4.1",

0 commit comments

Comments
 (0)