Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 2fdfd4259397 · 2023-02-14T10:04:20.000+01:00
* 6.2:
  Fix merge
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/OptionsResolverTest.php b/Tests/OptionsResolverTest.php
@@ -531,7 +531,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) {
@@ -821,7 +821,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
`@@ -531,7 +531,7 @@ public function testDeprecationMessages(\Closure $configureOptions, array $optio`
`531`	`531`	`$this->assertSame($expectedCount, $count);`
`532`	`532`	`}`
`533`	`533`
`534`		`- public function provideDeprecationData()`
	`534`	`+ public static function provideDeprecationData()`
`535`	`535`	`{`
`536`	`536`	`yield 'It deprecates an option with default message' => [`
`537`	`537`	`function (OptionsResolver $resolver) {`
`@@ -821,7 +821,7 @@ public function testResolveFailsIfInvalidType($actualType, $allowedType, $except`
`821`	`821`	`$this->resolver->resolve(['option' => $actualType]);`
`822`	`822`	`}`
`823`	`823`
`824`		`- public function provideInvalidTypes()`
	`824`	`+ public static function provideInvalidTypes()`
`825`	`825`	`{`
`826`	`826`	`return [`
`827`	`827`	`[true, 'string', 'The option "option" with value true is expected to be of type "string", but is of type "bool".'],`