From 2d1a936fa49e80123446987fa341404f7abeac7c Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Tue, 11 Feb 2025 14:47:29 +0000
Subject: [PATCH] Issue #3500238 by alexpott, smustgrave: Rename data provider
\Drupal\Tests\system\Kernel\MenuAccessControlHandlerTest::testAccessProvider
---
core/.phpstan-baseline.php | 12 ------------
.../Kernel/DateFormatAccessControlHandlerTest.php | 4 ++--
.../src/Kernel/MenuAccessControlHandlerTest.php | 4 ++--
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php
index 58798dae0f81..b0dcca81105a 100644
--- a/core/.phpstan-baseline.php
+++ b/core/.phpstan-baseline.php
@@ -39831,12 +39831,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/src/Kernel/Common/AddFeedTest.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\Tests\\\\system\\\\Kernel\\\\DateFormatAccessControlHandlerTest\\:\\:testAccessProvider\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/src/Kernel/DateFormatAccessControlHandlerTest.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\Tests\\\\system\\\\Kernel\\\\Entity\\\\EntityReferenceSelection\\\\EntityReferenceSelectionAccessTest\\:\\:addDefaultCommentField\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
@@ -39873,12 +39867,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/system/tests/src/Kernel/Form/FormElementMaxlengthTest.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Method Drupal\\\\Tests\\\\system\\\\Kernel\\\\MenuAccessControlHandlerTest\\:\\:testAccessProvider\\(\\) has no return type specified\\.$#',
- 'identifier' => 'missingType.return',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/system/tests/src/Kernel/MenuAccessControlHandlerTest.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\Tests\\\\system\\\\Kernel\\\\Migrate\\\\d6\\\\MigrateActionConfigsTest\\:\\:assertConfigSchema\\(\\) has no return type specified\\.$#',
'identifier' => 'missingType.return',
diff --git a/core/modules/system/tests/src/Kernel/DateFormatAccessControlHandlerTest.php b/core/modules/system/tests/src/Kernel/DateFormatAccessControlHandlerTest.php
index 3b0f0e3dea08..0d5483370be8 100644
--- a/core/modules/system/tests/src/Kernel/DateFormatAccessControlHandlerTest.php
+++ b/core/modules/system/tests/src/Kernel/DateFormatAccessControlHandlerTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void {
/**
* @covers ::checkAccess
* @covers ::checkCreateAccess
- * @dataProvider testAccessProvider
+ * @dataProvider providerTestAccess
*/
public function testAccess($permissions, $which_entity, $view_label_access_result, $view_access_result, $update_access_result, $delete_access_result, $create_access_result): void {
@@ -70,7 +70,7 @@ public function testAccess($permissions, $which_entity, $view_label_access_resul
static::assertEquals($create_access_result, $this->accessControlHandler->createAccess(NULL, $user, [], TRUE));
}
- public static function testAccessProvider() {
+ public static function providerTestAccess(): array {
$c = new ContainerBuilder();
$cache_contexts_manager = (new Prophet())->prophesize(CacheContextsManager::class);
$cache_contexts_manager->assertValidTokens()->willReturn(TRUE);
diff --git a/core/modules/system/tests/src/Kernel/MenuAccessControlHandlerTest.php b/core/modules/system/tests/src/Kernel/MenuAccessControlHandlerTest.php
index d9431356d0ed..57e1758cb8f8 100644
--- a/core/modules/system/tests/src/Kernel/MenuAccessControlHandlerTest.php
+++ b/core/modules/system/tests/src/Kernel/MenuAccessControlHandlerTest.php
@@ -46,7 +46,7 @@ protected function setUp(): void {
/**
* @covers ::checkAccess
* @covers ::checkCreateAccess
- * @dataProvider testAccessProvider
+ * @dataProvider providerTestAccess
*/
public function testAccess($permissions, $which_entity, $view_label_access_result, $view_access_result, $update_access_result, $delete_access_result, $create_access_result): void {
$user = $this->drupalCreateUser($permissions);
@@ -65,7 +65,7 @@ public function testAccess($permissions, $which_entity, $view_label_access_resul
static::assertEquals($create_access_result, $this->accessControlHandler->createAccess(NULL, $user, [], TRUE));
}
- public static function testAccessProvider() {
+ public static function providerTestAccess(): array {
// RefinableCacheableDependencyTrait::addCacheContexts() only needs the
// container to perform an assertion, but we can't use the container here,
// so disable assertions for the purposes of this test.
--
GitLab