diff --git a/core/tests/Drupal/KernelTests/Core/Cache/CacheCollectorTest.php b/core/tests/Drupal/KernelTests/Core/Cache/CacheCollectorTest.php index 164accb216..45836d3876 100644 --- a/core/tests/Drupal/KernelTests/Core/Cache/CacheCollectorTest.php +++ b/core/tests/Drupal/KernelTests/Core/Cache/CacheCollectorTest.php @@ -22,7 +22,6 @@ public function register(ContainerBuilder $container) { // Change container to database cache backends. $container ->register('cache_factory', 'Drupal\Core\Cache\CacheFactory') - ->addArgument(new Reference('settings')) ->addMethodCall('setContainer', [new Reference('service_container')]); // Change container to use database lock backends. diff --git a/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTagTest.php b/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTagTest.php index f902f2be5e..d1b31261f7 100644 --- a/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTagTest.php +++ b/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTagTest.php @@ -30,7 +30,6 @@ public function register(ContainerBuilder $container) { // Change container to database cache backends. $container ->register('cache_factory', 'Drupal\Core\Cache\CacheFactory') - ->addArgument(new Reference('settings')) ->addMethodCall('setContainer', [new Reference('service_container')]); } diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php index 2876d7177b..a595b10d07 100644 --- a/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php +++ b/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php @@ -20,8 +20,8 @@ class CacheFactoryTest extends UnitTestCase { * @covers ::get */ public function testCacheFactoryWithDefaultSettings() { - $settings = new Settings([]); - $cache_factory = new CacheFactory($settings); + new Settings([]); + $cache_factory = new CacheFactory(); $container = new ContainerBuilder(); $cache_factory->setContainer($container); @@ -46,12 +46,12 @@ public function testCacheFactoryWithDefaultSettings() { * @covers ::get */ public function testCacheFactoryWithCustomizedDefaultBackend() { - $settings = new Settings([ + new Settings([ 'cache' => [ 'default' => 'cache.backend.custom', ], ]); - $cache_factory = new CacheFactory($settings); + $cache_factory = new CacheFactory(); $container = new ContainerBuilder(); $cache_factory->setContainer($container); @@ -77,7 +77,7 @@ public function testCacheFactoryWithCustomizedDefaultBackend() { */ public function testCacheFactoryWithDefaultBinBackend() { // Ensure the default bin backends are used before the configured default. - $settings = new Settings([ + new Settings([ 'cache' => [ 'default' => 'cache.backend.unused', ], @@ -87,7 +87,7 @@ public function testCacheFactoryWithDefaultBinBackend() { 'render' => 'cache.backend.custom', ]; - $cache_factory = new CacheFactory($settings, $default_bin_backends); + $cache_factory = new CacheFactory($default_bin_backends); $container = new ContainerBuilder(); $cache_factory->setContainer($container); @@ -114,7 +114,7 @@ public function testCacheFactoryWithDefaultBinBackend() { public function testCacheFactoryWithSpecifiedPerBinBackend() { // Ensure the per-bin configuration is used before the configured default // and per-bin defaults. - $settings = new Settings([ + new Settings([ 'cache' => [ 'default' => 'cache.backend.unused', 'bins' => [ @@ -127,7 +127,7 @@ public function testCacheFactoryWithSpecifiedPerBinBackend() { 'render' => 'cache.backend.unused', ]; - $cache_factory = new CacheFactory($settings, $default_bin_backends); + $cache_factory = new CacheFactory($default_bin_backends); $container = new ContainerBuilder(); $cache_factory->setContainer($container);