From ec8fa02a424ddc8cc6c3e0f58fc7e9cbce916561 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Sun, 18 Feb 2024 10:53:06 +0000
Subject: [PATCH] Issue #3420583 by mondrake: Change
ConfigEntityValidationTestBase::providerInvalidMachineNameCharacters and
family to static
---
core/modules/block/tests/src/Kernel/BlockValidationTest.php | 4 ++--
.../shortcut/tests/src/Kernel/ShortcutSetValidationTest.php | 6 +++---
.../system/tests/src/Kernel/Entity/ActionValidationTest.php | 4 ++--
.../system/tests/src/Kernel/Entity/MenuValidationTest.php | 6 +++---
core/modules/tour/tests/src/Kernel/TourValidationTest.php | 4 ++--
.../Core/Config/ConfigEntityValidationTestBase.php | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/core/modules/block/tests/src/Kernel/BlockValidationTest.php b/core/modules/block/tests/src/Kernel/BlockValidationTest.php
index 81a792d89917..9503231ea0a9 100644
--- a/core/modules/block/tests/src/Kernel/BlockValidationTest.php
+++ b/core/modules/block/tests/src/Kernel/BlockValidationTest.php
@@ -55,11 +55,11 @@ public function testInvalidPluginId(): void {
/**
* Block names are atypical in that they allow periods in the machine name.
*/
- public function providerInvalidMachineNameCharacters(): array {
+ public static function providerInvalidMachineNameCharacters(): array {
$cases = parent::providerInvalidMachineNameCharacters();
// Remove the existing test case that verifies a machine name containing
// periods is invalid.
- $this->assertSame(['period.separated', FALSE], $cases['INVALID: period separated']);
+ self::assertSame(['period.separated', FALSE], $cases['INVALID: period separated']);
unset($cases['INVALID: period separated']);
// And instead add a test case that verifies it is allowed for blocks.
$cases['VALID: period separated'] = ['period.separated', TRUE];
diff --git a/core/modules/shortcut/tests/src/Kernel/ShortcutSetValidationTest.php b/core/modules/shortcut/tests/src/Kernel/ShortcutSetValidationTest.php
index dd9dbc1bc0d1..20c66b1009a6 100644
--- a/core/modules/shortcut/tests/src/Kernel/ShortcutSetValidationTest.php
+++ b/core/modules/shortcut/tests/src/Kernel/ShortcutSetValidationTest.php
@@ -35,12 +35,12 @@ protected function setUp(): void {
/**
* Shortcut set IDs are atypical: they allow dashes and disallow underscores.
*/
- public function providerInvalidMachineNameCharacters(): array {
+ public static function providerInvalidMachineNameCharacters(): array {
$cases = parent::providerInvalidMachineNameCharacters();
// Remove the existing test case that verifies a machine name containing
// dashes is invalid.
- $this->assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);
+ self::assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);
unset($cases['INVALID: dash separated']);
// And instead add a test case that verifies it is allowed for shortcut
// sets.
@@ -48,7 +48,7 @@ public function providerInvalidMachineNameCharacters(): array {
// Remove the existing test case that verifies a machine name containing
// underscores is valid.
- $this->assertSame(['underscore_separated', TRUE], $cases['VALID: underscore separated']);
+ self::assertSame(['underscore_separated', TRUE], $cases['VALID: underscore separated']);
unset($cases['VALID: underscore separated']);
// And instead add a test case that verifies it is disallowed for shortcut
// sets.
diff --git a/core/modules/system/tests/src/Kernel/Entity/ActionValidationTest.php b/core/modules/system/tests/src/Kernel/Entity/ActionValidationTest.php
index 4b034c82306a..eb2d28b6208c 100644
--- a/core/modules/system/tests/src/Kernel/Entity/ActionValidationTest.php
+++ b/core/modules/system/tests/src/Kernel/Entity/ActionValidationTest.php
@@ -30,11 +30,11 @@ protected function setUp(): void {
/**
* Action IDs are atypical in that they allow periods in the machine name.
*/
- public function providerInvalidMachineNameCharacters(): array {
+ public static function providerInvalidMachineNameCharacters(): array {
$cases = parent::providerInvalidMachineNameCharacters();
// Remove the existing test case that verifies a machine name containing
// periods is invalid.
- $this->assertSame(['period.separated', FALSE], $cases['INVALID: period separated']);
+ self::assertSame(['period.separated', FALSE], $cases['INVALID: period separated']);
unset($cases['INVALID: period separated']);
// And instead add a test case that verifies it is allowed for blocks.
$cases['VALID: period separated'] = ['period.separated', TRUE];
diff --git a/core/modules/system/tests/src/Kernel/Entity/MenuValidationTest.php b/core/modules/system/tests/src/Kernel/Entity/MenuValidationTest.php
index c05a78f096da..d5a6d751ce0f 100644
--- a/core/modules/system/tests/src/Kernel/Entity/MenuValidationTest.php
+++ b/core/modules/system/tests/src/Kernel/Entity/MenuValidationTest.php
@@ -35,19 +35,19 @@ protected function setUp(): void {
/**
* Menu IDs are atypical: they allow dashes and disallow underscores.
*/
- public function providerInvalidMachineNameCharacters(): array {
+ public static function providerInvalidMachineNameCharacters(): array {
$cases = parent::providerInvalidMachineNameCharacters();
// Remove the existing test case that verifies a machine name containing
// dashes is invalid.
- $this->assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);
+ self::assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);
unset($cases['INVALID: dash separated']);
// And instead add a test case that verifies it is allowed for menus.
$cases['VALID: dash separated'] = ['dash-separated', TRUE];
// Remove the existing test case that verifies a machine name containing
// underscores is valid.
- $this->assertSame(['underscore_separated', TRUE], $cases['VALID: underscore separated']);
+ self::assertSame(['underscore_separated', TRUE], $cases['VALID: underscore separated']);
unset($cases['VALID: underscore separated']);
// And instead add a test case that verifies it is disallowed for menus.
$cases['INVALID: underscore separated'] = ['underscore_separated', FALSE];
diff --git a/core/modules/tour/tests/src/Kernel/TourValidationTest.php b/core/modules/tour/tests/src/Kernel/TourValidationTest.php
index 9513177d779c..0fa1b5129606 100644
--- a/core/modules/tour/tests/src/Kernel/TourValidationTest.php
+++ b/core/modules/tour/tests/src/Kernel/TourValidationTest.php
@@ -34,11 +34,11 @@ protected function setUp(): void {
/**
* Tour IDs are atypical in that they allow dashes in the machine name.
*/
- public function providerInvalidMachineNameCharacters(): array {
+ public static function providerInvalidMachineNameCharacters(): array {
$cases = parent::providerInvalidMachineNameCharacters();
// Remove the existing test case that verifies a machine name containing
// periods is invalid.
- $this->assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);
+ self::assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);
unset($cases['INVALID: dash separated']);
// And instead add a test case that verifies it is allowed for tours.
$cases['VALID: dash separated'] = ['dash-separated', TRUE];
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityValidationTestBase.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityValidationTestBase.php
index 30ed78fd7e17..179daf97b2cd 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityValidationTestBase.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityValidationTestBase.php
@@ -130,7 +130,7 @@ protected function getMachineNameConstraints(): array {
* @return array[]
* The test cases.
*/
- public function providerInvalidMachineNameCharacters(): array {
+ public static function providerInvalidMachineNameCharacters(): array {
return [
'INVALID: space separated' => ['space separated', FALSE],
'INVALID: dash separated' => ['dash-separated', FALSE],
--
GitLab