Skip to content

Commit 02c4275

Browse files
committed
Merge branch 'hotfix/1.1.1'
2 parents d37d0bc + 513ca0d commit 02c4275

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.travis.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,33 @@ matrix:
55
- php: 5.6
66
- php: 5.6
77
env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
8+
- php: 7.0
89
- php: 7.0
910
env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
1011
- php: 7.1
1112
- php: 7.1
1213
env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
13-
env: COVERAGE='--coverage-clover build/logs/clover.xml'
1414
- php: 7.2
15+
env: COVERAGE='--coverage-clover build/logs/clover.xml'
1516
- php: 7.2
1617
env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
18+
- php: nightly
19+
- php: nightly
20+
env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
1721
fast_finish: true
1822

1923
sudo: false
2024

2125
before_script:
26+
- |
27+
if [ "$TRAVIS_PHP_VERSION" = "nightly" ]; then
28+
COMPOSER_FLAGS="$COMPOSER_FLAGS --ignore-platform-reqs"
29+
fi;
2230
- travis_wait composer update --no-interaction $COMPOSER_FLAGS
2331

2432
script:
2533
- if [[ $COVERAGE ]]; then mkdir -p build/logs; fi
2634
- php vendor/bin/phpunit $COVERAGE
2735

2836
after_script:
29-
- if [[ $COVERAGE ]]; then php vendor/bin/coveralls; fi
37+
- if [[ $COVERAGE ]]; then php vendor/bin/php-coveralls; fi

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
"symfony/lock": "^3.4|^4.0",
1515
"symfony/cache": "^3.4|^4.0",
1616
"symfony/http-foundation": "^3.0|^4.0",
17-
"symfony/http-kernel": "^3.0|^4.0"
17+
"symfony/http-kernel": "^3.0|^4.0",
18+
"symfony/options-resolver": "^3.0|^4.0"
1819
},
1920
"require-dev": {
2021
"friendsofphp/php-cs-fixer": "^2.6",
2122
"phpunit/phpunit": "^5.7.27",
22-
"satooshi/php-coveralls": "2.0.x-dev"
23+
"php-coveralls/php-coveralls": "^2.1"
2324
},
2425
"autoload": {
2526
"psr-4": {

0 commit comments

Comments
 (0)