Migrate to newer versions of Symfony and Twig dependencies

(come on, it's 2019, just migrate)
Orbitale · Aug 17, 2019 · 753ba2d · 753ba2d
1 parent f7a7ddd
commit 753ba2d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,30 +9,21 @@ cache:
 
 env:
   global:
-    - deps="no"
     - COMPOSER_FLAGS=""
-    - TWIG_VERSION=""
     - ENABLE_CODE_COVERAGE="false"
 
 matrix:
   fast_finish: true
   include:
-    - { php: '7.0' }
     - { php: '7.1' }
     - { php: '7.2' }
-    - { php: '7.0', env: 'COMPOSER_FLAGS="--prefer-lowest"' }
+    - { php: '7.3' }
     - { php: '7.1', env: 'COMPOSER_FLAGS="--prefer-lowest"' }
     - { php: '7.2', env: 'COMPOSER_FLAGS="--prefer-lowest"' }
-    - { php: '7.0', env: 'TWIG_VERSION="^1.38" COMPOSER_FLAGS="--prefer-lowest"' }
-    - { php: '7.1', env: 'TWIG_VERSION="^1.38" COMPOSER_FLAGS="--prefer-lowest"' }
-    - { php: '7.2', env: 'TWIG_VERSION="^1.38" COMPOSER_FLAGS="--prefer-lowest"' }
-    - { php: '7.0', env: 'TWIG_VERSION="^1.38"' }
-    - { php: '7.1', env: 'TWIG_VERSION="^1.38"' }
-    - { php: '7.2', env: 'TWIG_VERSION="^1.38"' }
-    - { php: '7.2', env: 'ENABLE_CODE_COVERAGE="true"' }
+    - { php: '7.3', env: 'COMPOSER_FLAGS="--prefer-lowest"' }
+    - { php: '7.3', env: 'ENABLE_CODE_COVERAGE="true"' }
 
 before_install:
-  - if [[ "$TWIG_VERSION" != "" ]]; then composer require "twig/twig:${TWIG_VERSION}" --no-update; fi;
   - if [[ "$ENABLE_CODE_COVERAGE" != "true" ]]; then phpenv config-rm xdebug.ini; fi;
 
 install:

diff --git a/composer.json b/composer.json
@@ -6,24 +6,24 @@
     "homepage": "https://github.com/Orbitale/CmsBundle",
     "license": "MIT",
     "require": {
-        "php": "^7.0",
-        "behat/transliterator": "^1.0",
-        "doctrine/doctrine-bundle": "^1.5",
-        "doctrine/orm": "^2.4.6",
-        "symfony/asset": "^3.2|^4.0",
-        "symfony/config": "^3.2|^4.0",
-        "symfony/framework-bundle": "^3.2.5|^4.0",
-        "symfony/finder": "^3.2|^4.0",
-        "symfony/translation": "^3.2|^4.0",
-        "symfony/twig-bundle": "^3.2|^4.0",
-        "symfony/validator": "^3.2|^4.0",
-        "twig/twig": "^1.38|^2.7"
+        "php": "^7.1",
+        "behat/transliterator": "^1.2",
+        "doctrine/doctrine-bundle": "^1.8",
+        "doctrine/orm": "^2.5",
+        "symfony/asset": "^4.2",
+        "symfony/config": "^4.2",
+        "symfony/framework-bundle": "^4.2",
+        "symfony/finder": "^4.2",
+        "symfony/translation": "^4.2",
+        "symfony/twig-bundle": "^4.2",
+        "symfony/validator": "^4.2",
+        "twig/twig": "^2.7"
     },
     "require-dev": {
-        "symfony/browser-kit": "^3.2|^4.0",
-        "symfony/css-selector": "^3.2|^4.0",
-        "symfony/phpunit-bridge": "^3.2|^4.0",
-        "symfony/yaml": "^3.4"
+        "symfony/browser-kit": "^4.2",
+        "symfony/css-selector": "^4.2",
+        "symfony/phpunit-bridge": "^4.2",
+        "symfony/yaml": "^4.2"
     },
     "suggest": {
         "javiereguiluz/easyadmin-bundle": "To manage your pages directly inside your CMS (view documentation)"