From 7261d53d770d980c107b761e9837183c56905c81 Mon Sep 17 00:00:00 2001
From: llaakkkk <lenakirichok@gmail.com>
Date: Sat, 18 Nov 2017 12:45:12 +0200
Subject: [PATCH 1/3] add changes to composer.json for Symfony4 support

---
 .travis.yml   |  1 +
 composer.json | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a2769bfbc..f954b0a8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ matrix:
   include:
     - env: SYMFONY_VERSION=3.3.x-dev
     - env: SYMFONY_VERSION=3.4.x-dev
+    - env: SYMFONY_VERSION=4.0.x-dev
   allow_failures:
     - php: nightly
   fast_finish: true
diff --git a/composer.json b/composer.json
index 655519dc6..a74ee1480 100644
--- a/composer.json
+++ b/composer.json
@@ -20,14 +20,14 @@
     "require": {
         "php": "~7.1",
         "imagine/Imagine": "^0.6.3,<0.7",
-        "symfony/asset": "~3.0",
-        "symfony/filesystem": "~3.0",
-        "symfony/finder": "~3.0",
-        "symfony/framework-bundle": "~3.0",
-        "symfony/options-resolver": "~3.0",
-        "symfony/process": "~3.0",
-        "symfony/templating": "~3.0",
-        "symfony/translation": "~3.0"
+        "symfony/asset": "~3.0|^4.0",
+        "symfony/filesystem": "~3.0|^4.0",
+        "symfony/finder": "~3.0|^4.0",
+        "symfony/framework-bundle": "~3.0|^4.0",
+        "symfony/options-resolver": "~3.0|^4.0",
+        "symfony/process": "~3.0|^4.0",
+        "symfony/templating": "~3.0|^4.0",
+        "symfony/translation": "~3.0|^4.0"
     },
     "require-dev": {
         "ext-gd": "*",
@@ -42,13 +42,13 @@
         "psr/log": "~1.0",
         "satooshi/php-coveralls": "~1.0",
         "sllh/php-cs-fixer-styleci-bridge": "~2.1",
-        "symfony/browser-kit": "~3.0",
-        "symfony/console": "~3.0",
-        "symfony/dependency-injection": "~3.0",
-        "symfony/form": "~3.0",
-        "symfony/phpunit-bridge": "~3.0",
-        "symfony/validator": "~3.0",
-        "symfony/yaml": "~3.0",
+        "symfony/browser-kit": "~3.0|^4.0",
+        "symfony/console": "~3.0|^4.0",
+        "symfony/dependency-injection": "~3.0|^4.0",
+        "symfony/form": "~3.0|^4.0",
+        "symfony/phpunit-bridge": "~3.0|^4.0",
+        "symfony/validator": "~3.0|^4.0",
+        "symfony/yaml": "~3.0|^4.0",
         "twig/twig": "~1.12|~2.0"
     },
     "suggest": {

From a55dc7b1f7176ad65874927860658fe5ade96e11 Mon Sep 17 00:00:00 2001
From: llaakkkk <lenakirichok@gmail.com>
Date: Sat, 18 Nov 2017 13:06:05 +0200
Subject: [PATCH 2/3] remove sllh/php-cs-fixer-styleci-bridge because it
 doesn"t support Symfony4

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index a74ee1480..f6714933f 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,6 @@
         "phpunit/phpunit": "~5.0",
         "psr/log": "~1.0",
         "satooshi/php-coveralls": "~1.0",
-        "sllh/php-cs-fixer-styleci-bridge": "~2.1",
         "symfony/browser-kit": "~3.0|^4.0",
         "symfony/console": "~3.0|^4.0",
         "symfony/dependency-injection": "~3.0|^4.0",

From d4a4c6b44c6eb403e5eb19a67abc60f670dda8c6 Mon Sep 17 00:00:00 2001
From: llaakkkk <lenakirichok@gmail.com>
Date: Sat, 18 Nov 2017 14:29:54 +0200
Subject: [PATCH 3/3] add new version to friendsofphp/php-cs-fixer for Symfony
 4 support

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f6714933f..d36876220 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
         "doctrine/cache": "~1.1",
         "doctrine/orm": "~2.3",
         "enqueue/enqueue-bundle": "^0.7",
-        "friendsofphp/php-cs-fixer": "~1.0",
+        "friendsofphp/php-cs-fixer": "~1.0|~2.0",
         "league/flysystem": "~1.0",
         "phpunit/phpunit": "~5.0",
         "psr/log": "~1.0",