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

Commit 0facac6

Browse files
committed
Update dependencies
- Drops support for PHP versions prior to 7.1. - Updates to zend-expressive-template v2 series. - Updates to zend-expressive-router v3 series. - Updates to zend-expressive-helpers v5 series. - Updates to PHPUnit 6.5 series.
1 parent 4ae738c commit 0facac6

File tree

3 files changed

+122
-204
lines changed

3 files changed

+122
-204
lines changed

.travis.yml

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,6 @@ 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=locked
26-
- LEGACY_DEPS="phpunit/phpunit"
27-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
28-
- php: 5.6
29-
env:
30-
- DEPS=locked
31-
- LEGACY_DEPS="phpunit/phpunit"
32-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
33-
- php: 5.6
34-
env:
35-
- DEPS=latest
36-
- php: 7
37-
env:
38-
- DEPS=lowest
39-
- php: 7
40-
env:
41-
- DEPS=locked
42-
- LEGACY_DEPS="phpunit/phpunit"
43-
- php: 7
44-
env:
45-
- DEPS=locked
46-
- LEGACY_DEPS="phpunit/phpunit"
47-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
48-
- php: 7
49-
env:
50-
- DEPS=locked
51-
- LEGACY_DEPS="phpunit/phpunit"
52-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
53-
- php: 7
54-
env:
55-
- DEPS=latest
5616
- php: 7.1
5717
env:
5818
- DEPS=lowest
@@ -61,14 +21,6 @@ matrix:
6121
- DEPS=locked
6222
- CS_CHECK=true
6323
- TEST_COVERAGE=true
64-
- php: 7.1
65-
env:
66-
- DEPS=locked
67-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
68-
- php: 7.1
69-
env:
70-
- DEPS=locked
71-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
7224
- php: 7.1
7325
env:
7426
- DEPS=latest
@@ -78,14 +30,6 @@ matrix:
7830
- php: 7.2
7931
env:
8032
- DEPS=locked
81-
- php: 7.2
82-
env:
83-
- DEPS=locked
84-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
85-
- php: 7.2
86-
env:
87-
- DEPS=locked
88-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
8933
- php: 7.2
9034
env:
9135
- DEPS=latest
@@ -95,10 +39,8 @@ before_install:
9539

9640
install:
9741
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
98-
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
9942
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
10043
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
101-
- if [[ $HELPER_DEPS != '' ]]; then travis_retry composer require $COMPOSER_ARGS --update-with-dependencies $HELPER_DEPS ; fi
10244
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
10345
- stty cols 120 && composer show
10446

composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,18 @@
2020
"forum": "https://discourse.zendframework.com/c/questions/expressive"
2121
},
2222
"require": {
23-
"php": "^5.6 || ^7.0",
24-
"container-interop/container-interop": "^1.2.0",
23+
"php": "^7.1",
2524
"psr/container": "^1.0",
2625
"psr/http-message": "^1.0.1",
27-
"zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1 || ^4.0",
28-
"zendframework/zend-expressive-router": "^1.3.2 || ^2.1",
29-
"zendframework/zend-expressive-template": "^1.0.4",
26+
"zendframework/zend-expressive-helpers": "^5.0.0-dev",
27+
"zendframework/zend-expressive-router": "^3.0.0-dev",
28+
"zendframework/zend-expressive-template": "^2.0.0-dev",
3029
"zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
3130
"zendframework/zend-view": "^2.8.1"
3231
},
3332
"require-dev": {
3433
"malukenho/docheader": "^0.1.5",
35-
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
34+
"phpunit/phpunit": "^6.5.3",
3635
"zendframework/zend-coding-standard": "~1.0.0"
3736
},
3837
"conflict": {

0 commit comments

Comments
 (0)