From c9eb754d5ede90aa98c0feea7fc2bbff89aa8622 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Thu, 25 Apr 2024 20:44:48 +0100
Subject: [PATCH] Issue #3443517 by longwave: Change @dataprovider to static in
FileCacheFactoryTest
---
.../FileCache/FileCacheFactoryTest.php | 30 ++++++++-----------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
index 7e6d9c2a61b5..5d87abef9711 100644
--- a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
+++ b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
@@ -98,15 +98,9 @@ public function testGetConfigurationOverrides($configuration, $arguments, $class
/**
* Data provider for testGetConfigurationOverrides().
*/
- public function configurationDataProvider() {
+ public static function configurationDataProvider() {
$data = [];
- // Get a unique FileCache class.
- $file_cache = $this->getMockBuilder(FileCache::class)
- ->disableOriginalConstructor()
- ->getMock();
- $class = get_class($file_cache);
-
// Test fallback configuration.
$data['fallback-configuration'] = [
[],
@@ -116,33 +110,33 @@ public function configurationDataProvider() {
// Test default configuration.
$data['default-configuration'] = [
- ['default' => ['class' => $class]],
+ ['default' => ['class' => CustomFileCache::class]],
[],
- $class,
+ CustomFileCache::class,
];
// Test specific per collection setting.
$data['collection-setting'] = [
- ['test_foo_settings' => ['class' => $class]],
+ ['test_foo_settings' => ['class' => CustomFileCache::class]],
[],
- $class,
+ CustomFileCache::class,
];
// Test default configuration plus specific per collection setting.
$data['default-plus-collection-setting'] = [
[
'default' => ['class' => '\stdClass'],
- 'test_foo_settings' => ['class' => $class],
+ 'test_foo_settings' => ['class' => CustomFileCache::class],
],
[],
- $class,
+ CustomFileCache::class,
];
// Test default configuration plus class specific override.
$data['default-plus-class-override'] = [
['default' => ['class' => '\stdClass']],
- ['class' => $class],
- $class,
+ ['class' => CustomFileCache::class],
+ CustomFileCache::class,
];
// Test default configuration plus class specific override plus specific
@@ -150,10 +144,10 @@ public function configurationDataProvider() {
$data['default-plus-class-plus-collection-setting'] = [
[
'default' => ['class' => '\stdClass'],
- 'test_foo_settings' => ['class' => $class],
+ 'test_foo_settings' => ['class' => CustomFileCache::class],
],
['class' => '\stdClass'],
- $class,
+ CustomFileCache::class,
];
return $data;
@@ -185,3 +179,5 @@ public function testGetSetPrefix() {
}
}
+
+class CustomFileCache extends FileCache {}
--
GitLab