From 4a8d15ea1b70869a8b5eaaf3bf6d68b228322bc4 Mon Sep 17 00:00:00 2001
From: koenreiniers <koenreiniers@msn.com>
Date: Wed, 4 Dec 2019 09:34:42 +0100
Subject: [PATCH] Add Symfony 5 support (#1008)

---
 .travis.yml                                           |  5 ++---
 composer.json                                         | 10 +++++-----
 fixtures/Bridge/Symfony/Application/config.yml        |  2 ++
 fixtures/Bridge/Symfony/Application/config_custom.yml |  2 ++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 781d47ece..627b990fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,12 +23,11 @@ matrix:
     - php: '7.2'
       env: SYMFONY_VERSION='~3.4.0'
     - php: '7.2'
-      env: SYMFONY_VERSION='~4.0.0'
+      env: SYMFONY_VERSION='~4.4.0'
     - php: '7.2'
-      env: SYMFONY_VERSION='~4.1.0@dev'
+      env: SYMFONY_VERSION='~5.0.0'
   allow_failures:
     - php: nightly
-    - env: SYMFONY_VERSION='~4.1.0@dev'
 
 before_install:
   - set -eo pipefail
diff --git a/composer.json b/composer.json
index 3d9454a2f..55d520c20 100644
--- a/composer.json
+++ b/composer.json
@@ -23,17 +23,17 @@
         "php": "^7.1",
         "fzaninotto/faker": "^1.6",
         "myclabs/deep-copy": "^1.5.2",
-        "sebastian/comparator": "^3.0",	
-        "symfony/property-access": "^2.8 || ^3.4 || ^4.0",
-        "symfony/yaml": "^2.8 || ^3.4 || ^4.0"
+        "sebastian/comparator": "^3.0",
+        "symfony/property-access": "^2.8 || ^3.4 || ^4.0 || ^5.0",
+        "symfony/yaml": "^2.8 || ^3.4 || ^4.0 || ^5.0"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.1.0",
         "php-mock/php-mock": "^2.0",
         "phpspec/prophecy": "^1.6",
         "phpunit/phpunit": "^7.0",
-        "symfony/phpunit-bridge": "^3.4.5 || ^4.0.5",
-        "symfony/var-dumper": "^3.4 || ^4.0"
+        "symfony/phpunit-bridge": "^3.4.5 || ^4.0.5 || ^5.0",
+        "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0"
     },
     "conflict": {
         "symfony/framework-bundle": "<3.4"
diff --git a/fixtures/Bridge/Symfony/Application/config.yml b/fixtures/Bridge/Symfony/Application/config.yml
index 7cb1c4a8d..4b7213d18 100644
--- a/fixtures/Bridge/Symfony/Application/config.yml
+++ b/fixtures/Bridge/Symfony/Application/config.yml
@@ -9,6 +9,8 @@
 
 framework:
     secret:                  NelmioAliceBundleSecret
+    serializer:
+        enabled: true
     router:
         resource:            ~
         strict_requirements: '%kernel.debug%'
diff --git a/fixtures/Bridge/Symfony/Application/config_custom.yml b/fixtures/Bridge/Symfony/Application/config_custom.yml
index 2ac49a911..f2d5f24f5 100644
--- a/fixtures/Bridge/Symfony/Application/config_custom.yml
+++ b/fixtures/Bridge/Symfony/Application/config_custom.yml
@@ -9,6 +9,8 @@
 
 framework:
     secret:                  NelmioAliceBundleSecret
+    serializer:
+        enabled: true
     router:
         resource:            ~
         strict_requirements: '%kernel.debug%'