Merge branch '6.4' into 7.1

derrabus · derrabus · commit 0fa539d12b3c · 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/Formatter/OutputFormatterTest.php b/Tests/Formatter/OutputFormatterTest.php
@@ -199,7 +199,7 @@ public static function provideInlineStyleOptionsCases()
         ];
     }
 
-    public function provideInlineStyleTagsWithUnknownOptions()
+    public static function provideInlineStyleTagsWithUnknownOptions()
     {
         return [
             ['<options=abc;>', 'abc'],

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public static function provideInlineStyleOptionsCases()`
`199`	`199`	`];`
`200`	`200`	`}`
`201`	`201`
`202`		`- public function provideInlineStyleTagsWithUnknownOptions()`
	`202`	`+ public static function provideInlineStyleTagsWithUnknownOptions()`
`203`	`203`	`{`
`204`	`204`	`return [`
`205`	`205`	`['<options=abc;>', 'abc'],`