From 6cafac4e19f3cf72c10052afb4fe3f31ba78f012 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Tue, 21 Dec 2021 14:56:28 -0500
Subject: [PATCH] fix test to actually use data provider

---
 .../Fixtures/php/cache_app_redis_tag_aware_pool.php       | 5 +----
 .../Fixtures/xml/cache_app_redis_tag_aware_pool.xml       | 3 +--
 .../Fixtures/yml/cache_app_redis_tag_aware_pool.yml       | 4 +---
 .../Tests/DependencyInjection/FrameworkExtensionTest.php  | 8 ++++----
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_app_redis_tag_aware_pool.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_app_redis_tag_aware_pool.php
index 89beceb5748a4..bf3ee2de2b357 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_app_redis_tag_aware_pool.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache_app_redis_tag_aware_pool.php
@@ -2,14 +2,11 @@
 
 $container->loadFromExtension('framework', [
     'cache' => [
-        'app' => 'cache.redis_tag_aware.bar',
+        'app' => 'cache.redis_tag_aware.foo',
         'pools' => [
             'cache.redis_tag_aware.foo' => [
                 'adapter' => 'cache.adapter.redis_tag_aware',
             ],
-            'cache.redis_tag_aware.bar' => [
-                'adapter' => 'cache.redis_tag_aware.foo',
-            ],
         ],
     ],
 ]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_app_redis_tag_aware_pool.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_app_redis_tag_aware_pool.xml
index 063e51810ef07..65c06a1da6df7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_app_redis_tag_aware_pool.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache_app_redis_tag_aware_pool.xml
@@ -7,9 +7,8 @@
 
     <framework:config>
         <framework:cache>
-            <framework:app>cache.redis_tag_aware.bar</framework:app>
+            <framework:app>cache.redis_tag_aware.foo</framework:app>
             <framework:pool name="cache.redis_tag_aware.foo" adapter="cache.adapter.redis_tag_aware" />
-            <framework:pool name="cache.redis_tag_aware.bar" adapter="cache.redis_tag_aware.foo" />
         </framework:cache>
     </framework:config>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache_app_redis_tag_aware_pool.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache_app_redis_tag_aware_pool.yml
index 042ffd01392e2..9eb8b83c775c5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache_app_redis_tag_aware_pool.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache_app_redis_tag_aware_pool.yml
@@ -1,8 +1,6 @@
 framework:
     cache:
-        app: cache.redis_tag_aware.bar
+        app: cache.redis_tag_aware.foo
         pools:
             cache.redis_tag_aware.foo:
                 adapter: cache.adapter.redis_tag_aware
-            cache.redis_tag_aware.bar:
-                adapter: cache.redis_tag_aware.foo
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 4542e7d9d762f..b13e6a5c3c0e8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1588,11 +1588,11 @@ public function testRedisTagAwareAdapter()
     }
 
     /**
-     * @dataProvider testAppRedisTagAwareConfigProvider
+     * @dataProvider appRedisTagAwareConfigProvider
      */
-    public function testAppRedisTagAwareAdapter()
+    public function testAppRedisTagAwareAdapter(string $configFile)
     {
-        $container = $this->createContainerFromFile('cache_app_redis_tag_aware');
+        $container = $this->createContainerFromFile($configFile);
 
         foreach ([TagAwareCacheInterface::class, CacheInterface::class, CacheItemPoolInterface::class] as $alias) {
             $def = $container->findDefinition($alias);
@@ -1605,7 +1605,7 @@ public function testAppRedisTagAwareAdapter()
         }
     }
 
-    public function testAppRedisTagAwareConfigProvider(): array
+    public function appRedisTagAwareConfigProvider(): array
     {
         return [
             ['cache_app_redis_tag_aware'],