Skip to content

Commit

Permalink
Merge pull request #10 from antalaron/symfony4
Browse files Browse the repository at this point in the history
Updated Symfony version
  • Loading branch information
antalaron committed Dec 9, 2017
2 parents d0eeda9 + 39ad532 commit 9a5023c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ return PhpCsFixer\Config::create()
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_imports' => true,
'phpdoc_order' => true,
'psr4' => true,
'simplified_null_return' => true,
'strict_comparison' => true,
'strict_param' => true,
])
Expand Down
31 changes: 23 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,44 @@ language: php

sudo: false

dist: trusty

php:
- 5.5
- 5.6
- 7.0
- 7.1
- hhvm
- 7.2
- nightly

env:
- SYMFONY_VERSION="2.7.*"
- SYMFONY_VERSION="2.8.*"
- SYMFONY_VERSION="3.2.*"
- SYMFONY_VERSION="dev-master"
- SYMFONY_VERSION="3.4.*"
- SYMFONY_VERSION="4.0.*"

matrix:
fast_finish: true
exclude:
- php: 5.5
env: SYMFONY_VERSION="4.0.*"
- php: 5.5
env: SYMFONY_VERSION="dev-master"
- php: 7.0
env: SYMFONY_VERSION="4.0.*"
- php: 7.0
env: SYMFONY_VERSION="dev-master"
allow_failures:
- php: nightly

before_script:
- composer require symfony/symfony:${SYMFONY_VERSION} --prefer-dist --no-interaction --no-progress
- mkdir -p build/logs
- if [ "${TRAVIS_PHP_VERSION}" == '7.1' ] && [ "${SYMFONY_VERSION}" == '3.2.*' ]; then composer require doctrine/orm doctrine/doctrine-bundle doctrine/mongodb-odm-bundle alcaeus/mongo-php-adapter --ignore-platform-reqs --no-interaction --no-progress; fi;
- if [ "${TRAVIS_PHP_VERSION}" == '7.1' ] && [ "${SYMFONY_VERSION}" == '3.4.*' ]; then composer require doctrine/orm doctrine/doctrine-bundle doctrine/mongodb-odm-bundle alcaeus/mongo-php-adapter --ignore-platform-reqs --no-interaction --no-progress; fi;

script:
- if [ "${TRAVIS_PHP_VERSION}" != '7.1' ] || [ "${SYMFONY_VERSION}" != '3.2.*' ]; then vendor/bin/phpunit -v; fi;
- if [ "${TRAVIS_PHP_VERSION}" == '7.1' ] && [ "${SYMFONY_VERSION}" == '3.2.*' ]; then vendor/bin/phpunit -v --coverage-clover build/logs/clover.xml; fi;
- if [ "${TRAVIS_PHP_VERSION}" == '7.1' ] && [ "${SYMFONY_VERSION}" == '3.2.*' ]; then travis_retry wget -q https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar && travis_retry php coveralls.phar -v; fi;
- if [ "${TRAVIS_PHP_VERSION}" != '7.1' ] || [ "${SYMFONY_VERSION}" != '3.4.*' ]; then vendor/bin/phpunit -v; fi;
- if [ "${TRAVIS_PHP_VERSION}" == '7.1' ] && [ "${SYMFONY_VERSION}" == '3.4.*' ]; then vendor/bin/phpunit -v --coverage-clover build/logs/clover.xml; fi;
- if [ "${TRAVIS_PHP_VERSION}" == '7.1' ] && [ "${SYMFONY_VERSION}" == '3.4.*' ]; then travis_retry wget -q https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar && travis_retry php coveralls.phar -v; fi;

notifications:
email:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"require": {
"php": ">=5.5.9",
"symfony/symfony": "~2.7|~3.0",
"symfony/symfony": "~2.7|~3.0|~4.0",
"intervention/image": "^2.3",
"twig/twig": "^1.28|^2.0",
"sybio/gif-frame-extractor": "^1.0",
Expand Down

0 comments on commit 9a5023c

Please sign in to comment.