8000 Adds PHP 7.4 builds, updted Travis CI configuration · zendframework/zend-code@cf397ad · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit cf397ad

Browse files
michalbundyramichalbundyra
committed
Adds PHP 7.4 builds, updted Travis CI configuration
Set conflict with prophecy version prior to 1.9.0 as it is not compatible with PHP 7.4.
1 parent 10a742a commit cf397ad

File tree

3 files changed

+170
-111
lines changed

3 files changed

+170
-111
lines changed

‎.travis.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
sudo: false
2-
31
language: php
42

53
cache:
@@ -13,6 +11,7 @@ env:
1311
- TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT=true
1412

1513
matrix:
14+
fast_finish: true
1615
include:
1716
- php: 7.1
1817
env:
@@ -44,6 +43,15 @@ matrix:
4443
- php: 7.3
4544
env:
4645
- DEPS=latest
46+
- php: 7.4
47+
env:
48+
- DEPS=lowest
49+
- php: 7.4
50+
env:
51+
- DEPS=locked
52+
- php: 7.4
53+
env:
54+
- DEPS=latest
4755

4856
before_install:
4957
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

‎composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
"zendframework/zend-coding-standard": "^1.0",
2727
"zendframework/zend-stdlib": "^2.7 || ^3.0"
2828
},
29+
"conflict": {
30+
"phpspec/prophecy": "<1.9.0"
31+
},
2932
"suggest": {
3033
"doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
3134
"zendframework/zend-stdlib": "Zend\\Stdlib component"

0 commit comments

Comments
 (0)
0