Merge pull request #985 from Jan0707/symfony-4-update

Updated dependencies for symfony 4 #SymfonyConHackday2017
APY · Dec 9, 2017 · 62c78d9 · 62c78d9
2 parents 91b3f7f + 29727df
commit 62c78d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,9 @@ matrix:
     - php: 5.6
       env: |
         SYMFONY_VERSION=2.8.*
+    - php: 7.1
+      env: |
+        SYMFONY_VERSION=^4.0
 
 before_install:
   - sh -c 'if [ "${SYMFONY_VERSION}" != "" ]; then composer require --no-update symfony/symfony=${SYMFONY_VERSION}; fi;';

diff --git a/composer.json b/composer.json
@@ -21,14 +21,14 @@
     ],
     "require": {
         "php": ">=5.6",
-        "symfony/symfony": "~2.8|~3.0",
+        "symfony/symfony": "~2.8|~3.0|^4.0",
         "twig/twig": ">=1.5.0",
         "doctrine/orm": "~2.4,>=2.4.5",
         "doctrine/mongodb-odm": "^1.1.5"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.7",
-        "friendsofphp/php-cs-fixer": "1.11.*",
+        "friendsofphp/php-cs-fixer": "^2.0",
         "satooshi/php-coveralls": "^1.0"
     },
     "suggest": {