Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit aa0e85b53bbb · 2023-02-14T09:44:56.000+01:00
* 5.4:
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/OptionsResolverTest.php b/Tests/OptionsResolverTest.php
@@ -539,7 +539,7 @@ public function testDeprecationMessages(\Closure $configureOptions, array $optio
         $this->assertSame($expectedCount, $count);
     }
 
-    public function provideDeprecationData()
+    public static function provideDeprecationData()
     {
         yield 'It deprecates an option with default message' => [
             function (OptionsResolver $resolver) {
@@ -837,7 +837,7 @@ public function testResolveFailsIfInvalidType($actualType, $allowedType, $except
         $this->resolver->resolve(['option' => $actualType]);
     }
 
-    public function provideInvalidTypes()
+    public static function provideInvalidTypes()
     {
         return [
             [true, 'string', 'The option "option" with value true is expected to be of type "string", but is of type "bool".'],

Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ public function testDeprecationMessages(\Closure $configureOptions, array $optio`
`539`	`539`	`$this->assertSame($expectedCount, $count);`
`540`	`540`	`}`
`541`	`541`
`542`		`- public function provideDeprecationData()`
	`542`	`+ public static function provideDeprecationData()`
`543`	`543`	`{`
`544`	`544`	`yield 'It deprecates an option with default message' => [`
`545`	`545`	`function (OptionsResolver $resolver) {`
`@@ -837,7 +837,7 @@ public function testResolveFailsIfInvalidType($actualType, $allowedType, $except`
`837`	`837`	`$this->resolver->resolve(['option' => $actualType]);`
`838`	`838`	`}`
`839`	`839`
`840`		`- public function provideInvalidTypes()`
	`840`	`+ public static function provideInvalidTypes()`
`841`	`841`	`{`
`842`	`842`	`return [`
`843`	`843`	`[true, 'string', 'The option "option" with value true is expected to be of type "string", but is of type "bool".'],`