From d3ef8ba3bd1ae9fd7f3540963be0c6c1f5521e0c Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@elao.com>
Date: Wed, 12 Aug 2020 14:41:22 +0200
Subject: [PATCH] [FrameworkBundle] Fix 7.4 CachePools integration tests

---
 .../Tests/Functional/app/CachePools/config.yml             | 7 +------
 .../Tests/Functional/app/CachePools/default.yml            | 7 +++++++
 .../Tests/Functional/app/CachePools/redis_config.yml       | 2 +-
 .../Functional/app/CachePools/redis_custom_config.yml      | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/default.yml

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml
index d299f2d9546b0..83c2b38df7248 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml
@@ -1,5 +1,5 @@
 imports:
-    - { resource: ../config/default.yml }
+    - { resource: default.yml }
 
 framework:
     cache:
@@ -24,8 +24,3 @@ framework:
             cache.pool7:
                 adapter: cache.pool4
                 public: true
-
-services:
-    cache_clearer.alias:
-        alias: cache_clearer
-        public: true
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/default.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/default.yml
new file mode 100644
index 0000000000000..c03efedd02bf7
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/default.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: ../config/default.yml }
+
+services:
+    cache_clearer.alias:
+        alias: cache_clearer
+        public: true
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_config.yml
index 30c69163d4f2f..e5ec8c4effbc4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_config.yml
@@ -1,5 +1,5 @@
 imports:
-    - { resource: ../config/default.yml }
+    - { resource: default.yml }
 
 parameters:
     env(REDIS_HOST): 'localhost'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml
index df20c5357f7a4..84f90c8d2cede 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml
@@ -1,5 +1,5 @@
 imports:
-    - { resource: ../config/default.yml }
+    - { resource: default.yml }
 
 parameters:
     env(REDIS_HOST): 'localhost'