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

Commit d8001f4

Browse files
authored
Merge pull request #301 from Xerkus/feature/bump-php
Bump minimum php to 7.2 for next major
2 parents af5926e + 0611022 commit d8001f4

40 files changed

+473
-416
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.phpunit.result.cache
2+
/.phpcs-cache
13
/clover.xml
24
/coveralls-upload.json
35
/docs/html/

.travis.yml

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,9 @@ env:
1111

1212
matrix:
1313
include:
14-
- php: 5.6
15-
env:
16-
- DEPS=lowest
17-
- php: 5.6
18-
env:
19-
- DEPS=locked
20-
- LEGACY_DEPS="phpunit/phpunit"
21-
- php: 5.6
22-
env:
23-
- DEPS=latest
24-
- php: 7
25-
env:
26-
- DEPS=lowest
27-
- php: 7
28-
env:
29-
- DEPS=locked
30-
- LEGACY_DEPS="phpunit/phpunit"
31-
- php: 7
32-
env:
33-
- DEPS=latest
34-
- php: 7.1
35-
env:
36-
- DEPS=lowest
37-
- php: 7.1
38-
env:
39-
- DEPS=locked
40-
- CS_CHECK=true
41-
- TEST_COVERAGE=true
42-
- php: 7.1
43-
env:
44-
- DEPS=latest
4514
- php: 7.2
4615
env:
4716
- DEPS=lowest
48-
- php: 7.2
49-
env:
50-
- DEPS=locked
5117
- php: 7.2
5218
env:
5319
- DEPS=latest
@@ -57,6 +23,8 @@ matrix:
5723
- php: 7.3
5824
env:
5925
- DEPS=locked
26+
- CS_CHECK=true
27+
- TEST_COVERAGE=true
6028
- php: 7.3
6129
env:
6230
- DEPS=latest
@@ -65,8 +33,7 @@ before_install:
6533
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
6634

6735
install:
68-
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
69-
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
36+
- travis_retry composer install $COMPOSER_ARGS
7037
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
7138
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
7239
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
@@ -77,7 +44,7 @@ script:
7744
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
7845

7946
after_script:
80-
- if [[ $TEST_COVERAGE == 'true' ]]; then vendor/bin/php-coveralls -v ; fi
47+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
8148

8249
notifications:
8350
email: false

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse
1818

1919
### Removed
2020

21-
- Nothing.
21+
- [#301](https://github.com/zendframework/zend-mvc/pull/301) removes support for PHP versions below 7.2
2222

2323
### Fixed
2424

composer.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"forum": "https://discourse.zendframework.com/c/questions/components"
1717
},
1818
"require": {
19+
"php": "^7.2",
1920
"container-interop/container-interop": "^1.2",
20-
"php": "^5.6 || ^7.0",
2121
"zendframework/zend-eventmanager": "^3.2",
2222
"zendframework/zend-http": "^2.7",
2323
"zendframework/zend-modulemanager": "^2.8",
@@ -28,7 +28,7 @@
2828
},
2929
"require-dev": {
3030
"http-interop/http-middleware": "^0.4.1",
31-
"phpunit/phpunit": "^6.4.4 || ^5.7.14",
31+
"phpunit/phpunit": "^8.0",
3232
"zendframework/zend-coding-standard": "~1.0.0",
3333
"zendframework/zend-json": "^2.6.1 || ^3.0",
3434
"zendframework/zend-psr7bridge": "^1.0",
@@ -57,10 +57,7 @@
5757
"autoload-dev": {
5858
"psr-4": {
5959
"ZendTest\\Mvc\\": "test/"
60-
},
61-
"files": [
62-
"test/_autoload.php"
63-
]
60+
}
6461
},
6562
"config": {
6663
"sort-packages": true

0 commit comments

Comments
 (0)