Skip to content

Commit 0a974ba

Browse files
committed
update version contraints
- add php 7.4 to travis - restrict symfony/yaml to <4.4 temporarily (dev-master only) - update php-cs-fixer - remove php platform config from composer.json
1 parent 7457351 commit 0a974ba

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

.travis.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,27 @@ matrix:
44
include:
55
# linux tests
66
- php: '7.1'
7-
env: YAML=3.0
7+
env: YAML=^3.0
88
- php: '7.1'
9-
env: YAML=4.0
9+
env: YAML=~4.3.0
1010
- php: '7.2'
11-
env: YAML=3.0
11+
env: YAML=^3.0
1212
- php: '7.2'
13-
env: YAML=4.0
13+
env: YAML=~4.3.0
1414
- php: '7.3'
15-
env: YAML=3.0
15+
env: YAML=^3.0
1616
- php: '7.3'
17-
env: YAML=4.0
17+
env: YAML=~4.3.0
18+
# - php: '7.3'
19+
# env: YAML=^5.0
20+
- php: '7.4'
21+
env: YAML=^3.0
22+
- php: '7.4'
23+
env: YAML=~4.3.0
24+
# - php: '7.4'
25+
# env: YAML=^5.0
1826
- php: nightly
19-
env: YAML=4.0
27+
env: YAML=~4.3.0
2028
# windows tests
2129
# https://travis-ci.community/t/where-to-contribute-php-support-for-windows/304
2230
- os: windows
@@ -43,7 +51,7 @@ matrix:
4351

4452
install:
4553
- make install
46-
- composer require symfony/yaml:"^${YAML}" --prefer-dist --no-interaction
54+
- composer require symfony/yaml:"${YAML}" --prefer-dist --no-interaction
4755
script:
4856
- make lint
4957
- make test

composer.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"require": {
2121
"php": ">=7.1.0",
2222
"ext-json": "*",
23-
"symfony/yaml": "^3.0 | ^4.0",
23+
"symfony/yaml": "^3.0 | ~4.0.0 | ~4.1.0 | ~4.2.0 | ~4.3.0",
2424
"justinrainbow/json-schema": "^5.0"
2525
},
2626
"require-dev": {
2727
"cebe/indent": "*",
28-
"friendsofphp/php-cs-fixer": "~2.13.1",
28+
"friendsofphp/php-cs-fixer": "~2.16.1",
2929
"phpunit/phpunit": "^6.5",
3030

3131
"oai/openapi-specification": "3.0.2",
@@ -38,11 +38,6 @@
3838
"cebe\\openapi\\": "src/"
3939
}
4040
},
41-
"config": {
42-
"platform": {
43-
"php": "7.1.3"
44-
}
45-
},
4641
"extra": {
4742
"branch-alias": {
4843
"dev-master": "1.0.x-dev"

0 commit comments

Comments
 (0)