Merge ea4005c into 0aaf2e6

gpslab · Mar 4, 2020 · ce39e44 · ce39e44
2 parents 0aaf2e6 + ea4005c
commit ce39e44
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -60,13 +60,18 @@ jobs:
           dist: trusty
 
         - stage: Test Symfony
-          env: SYMFONY_VERSION=4.2.* PHPUNIT_VERSION=5.7.*
+          env: SYMFONY_VERSION=4.4.* PHPUNIT_VERSION=6.5.*
           php: 7.1
 
-        - stage: Test Doctrine
-          env: DOCTRINE_VERSION=2.4.*
-          php: 5.5
-          dist: trusty
+        - stage: Test Symfony
+          env: SYMFONY_VERSION=5.0.* PHPUNIT_VERSION=6.5.*
+          php: 7.2
+
+# Temporary not test Doctrine 2.4 because composer time out of execution
+#        - stage: Test Doctrine
+#          env: DOCTRINE_VERSION=2.4.*
+#          php: 5.5
+#          dist: trusty
 
         - stage: Test Doctrine
           env: DOCTRINE_VERSION=2.5.*

diff --git a/composer.json b/composer.json
@@ -17,8 +17,11 @@
   },
   "require": {
     "php": ">=5.4.0",
-    "symfony/framework-bundle": "~2.3|~3.0|~4.0",
-    "symfony/expression-language": "~2.3|~3.0|~4.0",
+    "symfony/http-kernel": "~2.3|~3.0|~4.0|~5.0",
+    "symfony/dependency-injection": "~2.3|~3.0|~4.0|~5.0",
+    "symfony/expression-language": "~2.3|~3.0|~4.0|~5.0",
+    "symfony/config": "~2.3|~3.0|~4.0|~5.0",
+    "symfony/routing": "~2.3|~3.0|~4.0|~5.0",
     "sensio/framework-extra-bundle": "~3.0|~4.0|~5.0",
     "doctrine/orm": "~2.4|~2.5|~2.6",
     "twig/twig": "^1.34|^2.0"