Skip to content

Commit

Permalink
Merge 52de661 into 2aaaeb3
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Nov 5, 2019
2 parents 2aaaeb3 + 52de661 commit 3504106
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
1 change: 1 addition & 0 deletions .php_cs.dist
Expand Up @@ -37,6 +37,7 @@ $rules = [
'@PHP56Migration' => true,
'@PHP56Migration:risky' => true,
'@PHPUnit57Migration:risky' => true,
'single_line_throw' => false,
'@PHP70Migration' => true,
'@PHP70Migration:risky' => true,
'@PHPUnit60Migration:risky' => true,
Expand Down
16 changes: 9 additions & 7 deletions .travis.yml
Expand Up @@ -13,6 +13,7 @@ php:
- '7.1'
- '7.2'
- '7.3'
- '7.4snapshot'
- nightly

dist: xenial
Expand All @@ -38,23 +39,24 @@ env:
matrix:
fast_finish: true
include:
- php: '7.3'
- php: '7.4snapshot'
env: TARGET=docs
- php: '7.3'
- php: '7.4snapshot'
env: TARGET=lint
- php: '7.1'
env: COMPOSER_FLAGS="--prefer-lowest"
- php: '7.3'
- php: '7.4snapshot'
env: SYMFONY=3.4.*
- php: '7.3'
- php: '7.4snapshot'
env: SYMFONY='dev-master as 3.4.x-dev'
- php: '7.3'
- php: '7.4snapshot'
env: SONATA_CORE=3.*
- php: '7.3'
- php: '7.4snapshot'
env: SONATA_CORE='dev-master as 3.x-dev'
- php: '7.3'
- php: '7.4snapshot'
env: SYMFONY_DEPRECATIONS_HELPER=0
allow_failures:
- php: 7.4snapshot
- php: nightly
- env: SYMFONY_DEPRECATIONS_HELPER=0
- env: SYMFONY='dev-master as 3.4.x-dev'
Expand Down
6 changes: 0 additions & 6 deletions .travis/install_test.sh
Expand Up @@ -10,10 +10,4 @@ chmod u+x "${HOME}/bin/phpunit"
wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
chmod u+x "${HOME}/bin/coveralls"

# To be removed when these issues are resolved:
# https://github.com/composer/composer/issues/5355
if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
composer update --prefer-dist --no-interaction --prefer-stable --quiet
fi

composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}

0 comments on commit 3504106

Please sign in to comment.