Merge branch '6.4' into 7.1

derrabus · derrabus · commit 6b8b53ad6d42 · 2024-09-20T10:28:38.000+02:00
* 6.4:
  Make more data providers static
  fix merge
  Mutate remaining data providers to static ones
diff --git a/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php b/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
@@ -577,7 +577,7 @@ public static function provideDistinguishedChoices()
         ];
     }
 
-    public function provideSameKeyChoices()
+    public static function provideSameKeyChoices()
     {
         // Only test types here that can be used as array keys
         return [
@@ -588,7 +588,7 @@ public function provideSameKeyChoices()
         ];
     }
 
-    public function provideDistinguishedKeyChoices()
+    public static function provideDistinguishedKeyChoices()
     {
         // Only test types here that can be used as array keys
         return [

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ public static function provideDistinguishedChoices()`
`577`	`577`	`];`
`578`	`578`	`}`
`579`	`579`
`580`		`- public function provideSameKeyChoices()`
	`580`	`+ public static function provideSameKeyChoices()`
`581`	`581`	`{`
`582`	`582`	`// Only test types here that can be used as array keys`
`583`	`583`	`return [`
`@@ -588,7 +588,7 @@ public function provideSameKeyChoices()`
`588`	`588`	`];`
`589`	`589`	`}`
`590`	`590`
`591`		`- public function provideDistinguishedKeyChoices()`
	`591`	`+ public static function provideDistinguishedKeyChoices()`
`592`	`592`	`{`
`593`	`593`	`// Only test types here that can be used as array keys`
`594`	`594`	`return [`