Merge 8c08fc4 into 9a5023c

ingalabs · Dec 25, 2019 · 933543c · 933543c
2 parents 9a5023c + 8c08fc4
commit 933543c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,41 +5,30 @@ sudo: false
 dist: trusty
 
 php:
-    - 5.5
-    - 7.0
     - 7.1
     - 7.2
+    - 7.3
+    - 7.4
     - nightly
 
 env:
-    - SYMFONY_VERSION="2.7.*"
-    - SYMFONY_VERSION="2.8.*"
-    - SYMFONY_VERSION="3.4.*"
-    - SYMFONY_VERSION="4.0.*"
+    - SYMFONY_VERSION="4.4.*"
+    - SYMFONY_VERSION="5.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.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;
+    - if [ "${TRAVIS_PHP_VERSION}" == '7.1' ] && [ "${SYMFONY_VERSION}" == '4.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.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;
+    - if [ "${TRAVIS_PHP_VERSION}" != '7.1' ] || [ "${SYMFONY_VERSION}" != '4.4.*' ]; then vendor/bin/phpunit -v; fi;
+    - if [ "${TRAVIS_PHP_VERSION}" == '7.1' ] && [ "${SYMFONY_VERSION}" == '4.4.*' ]; then vendor/bin/phpunit -v --coverage-clover build/logs/clover.xml; fi;
+    - if [ "${TRAVIS_PHP_VERSION}" == '7.1' ] && [ "${SYMFONY_VERSION}" == '4.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:

diff --git a/composer.json b/composer.json
@@ -19,9 +19,11 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "symfony/symfony": "~2.7|~3.0|~4.0",
+        "ext-gd": "*",
+        "ext-exif": "*",
+        "symfony/symfony": "4.4.*|5.0.*",
         "intervention/image": "^2.3",
-        "twig/twig": "^1.28|^2.0",
+        "twig/twig": "^2.0",
         "sybio/gif-frame-extractor": "^1.0",
         "sybio/gif-creator": "^1.0"
     },