Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 61e90f94eb01 · 2023-02-14T09:44:56.000+01:00
* 5.4:
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/DebugClassLoaderTest.php b/Tests/DebugClassLoaderTest.php
@@ -140,7 +140,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
         $this->assertSame($xError, $lastError);
     }
 
-    public function provideDeprecatedSuper(): array
+    public static function provideDeprecatedSuper(): array
     {
         return [
             ['DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'],
diff --git a/Tests/ErrorEnhancer/ClassNotFoundErrorEnhancerTest.php b/Tests/ErrorEnhancer/ClassNotFoundErrorEnhancerTest.php
@@ -72,7 +72,7 @@ public function testEnhance(string $originalMessage, string $enhancedMessage, $a
         $this->assertSame($expectedLine, $error->getLine());
     }
 
-    public function provideClassNotFoundData()
+    public static function provideClassNotFoundData()
     {
         $autoloader = new ComposerClassLoader();
         $autoloader->add('Symfony\Component\ErrorHandler\Error\\', realpath(__DIR__.'/../../Error'));
diff --git a/Tests/ErrorEnhancer/UndefinedFunctionErrorEnhancerTest.php b/Tests/ErrorEnhancer/UndefinedFunctionErrorEnhancerTest.php
@@ -34,7 +34,7 @@ public function testEnhance(string $originalMessage, string $enhancedMessage)
         $this->assertSame($expectedLine, $error->getLine());
     }
 
-    public function provideUndefinedFunctionData()
+    public static function provideUndefinedFunctionData()
     {
         return [
             [
diff --git a/Tests/ErrorEnhancer/UndefinedMethodErrorEnhancerTest.php b/Tests/ErrorEnhancer/UndefinedMethodErrorEnhancerTest.php
@@ -33,7 +33,7 @@ public function testEnhance(string $originalMessage, string $enhancedMessage)
         $this->assertSame($expectedLine, $error->getLine());
     }
 
-    public function provideUndefinedMethodData()
+    public static function provideUndefinedMethodData()
     {
         return [
             [
diff --git a/Tests/ErrorHandlerTest.php b/Tests/ErrorHandlerTest.php
@@ -402,7 +402,7 @@ public function testHandleException(string $expectedMessage, \Throwable $excepti
         }
     }
 
-    public function handleExceptionProvider(): array
+    public static function handleExceptionProvider(): array
     {
         return [
             ['Uncaught Exception: foo', new \Exception('foo')],
@@ -602,7 +602,7 @@ public function testErrorHandlerWhenLogging(bool $previousHandlerWasDefined, boo
         }
     }
 
-    public function errorHandlerWhenLoggingProvider(): iterable
+    public static function errorHandlerWhenLoggingProvider(): iterable
     {
         foreach ([false, true] as $previousHandlerWasDefined) {
             foreach ([false, true] as $loggerSetsAnotherHandler) {
diff --git a/Tests/ErrorRenderer/HtmlErrorRendererTest.php b/Tests/ErrorRenderer/HtmlErrorRendererTest.php
@@ -24,7 +24,7 @@ public function testRender(\Throwable $exception, HtmlErrorRenderer $errorRender
         $this->assertStringMatchesFormat($expected, $errorRenderer->render($exception)->getAsString());
     }
 
-    public function getRenderData(): iterable
+    public static function getRenderData(): iterable
     {
         $expectedDebug = <<<HTML
 <!-- Foo (500 Internal Server Error) -->
diff --git a/Tests/Exception/FlattenExceptionTest.php b/Tests/Exception/FlattenExceptionTest.php
@@ -226,15 +226,15 @@ public function testCreate()
         );
     }
 
-    public function flattenDataProvider(): array
+    public static function flattenDataProvider(): array
     {
         return [
             [new \Exception('test', 123), 'Exception'],
             [new \Error('test', 123), 'Error'],
         ];
     }
 
-    public function stringAndIntDataProvider(): array
+    public static function stringAndIntDataProvider(): array
     {
         return [
             [new \Exception('test1', 123)],

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);`
`140`	`140`	`$this->assertSame($xError, $lastError);`
`141`	`141`	`}`
`142`	`142`
`143`		`- public function provideDeprecatedSuper(): array`
	`143`	`+ public static function provideDeprecatedSuper(): array`
`144`	`144`	`{`
`145`	`145`	`return [`
`146`	`146`	`['DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'],`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function testEnhance(string $originalMessage, string $enhancedMessage, $a`
`72`	`72`	`$this->assertSame($expectedLine, $error->getLine());`
`73`	`73`	`}`
`74`	`74`
`75`		`- public function provideClassNotFoundData()`
	`75`	`+ public static function provideClassNotFoundData()`
`76`	`76`	`{`
`77`	`77`	`$autoloader = new ComposerClassLoader();`
`78`	`78`	`$autoloader->add('Symfony\Component\ErrorHandler\Error\\', realpath(__DIR__.'/../../Error'));`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function testEnhance(string $originalMessage, string $enhancedMessage)`
`34`	`34`	`$this->assertSame($expectedLine, $error->getLine());`
`35`	`35`	`}`
`36`	`36`
`37`		`- public function provideUndefinedFunctionData()`
	`37`	`+ public static function provideUndefinedFunctionData()`
`38`	`38`	`{`
`39`	`39`	`return [`
`40`	`40`	`[`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function testEnhance(string $originalMessage, string $enhancedMessage)`
`33`	`33`	`$this->assertSame($expectedLine, $error->getLine());`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function provideUndefinedMethodData()`
	`36`	`+ public static function provideUndefinedMethodData()`
`37`	`37`	`{`
`38`	`38`	`return [`
`39`	`39`	`[`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ public function testHandleException(string $expectedMessage, \Throwable $excepti`
`402`	`402`	`}`
`403`	`403`	`}`
`404`	`404`
`405`		`- public function handleExceptionProvider(): array`
	`405`	`+ public static function handleExceptionProvider(): array`
`406`	`406`	`{`
`407`	`407`	`return [`
`408`	`408`	`['Uncaught Exception: foo', new \Exception('foo')],`
`@@ -602,7 +602,7 @@ public function testErrorHandlerWhenLogging(bool $previousHandlerWasDefined, boo`
`602`	`602`	`}`
`603`	`603`	`}`
`604`	`604`
`605`		`- public function errorHandlerWhenLoggingProvider(): iterable`
	`605`	`+ public static function errorHandlerWhenLoggingProvider(): iterable`
`606`	`606`	`{`
`607`	`607`	`foreach ([false, true] as $previousHandlerWasDefined) {`
`608`	`608`	`foreach ([false, true] as $loggerSetsAnotherHandler) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function testRender(\Throwable $exception, HtmlErrorRenderer $errorRender`
`24`	`24`	`$this->assertStringMatchesFormat($expected, $errorRenderer->render($exception)->getAsString());`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function getRenderData(): iterable`
	`27`	`+ public static function getRenderData(): iterable`
`28`	`28`	`{`
`29`	`29`	`$expectedDebug = <<<HTML`
`30`	`30`	`<!-- Foo (500 Internal Server Error) -->`
Original file line number	Diff line number	Diff line change
`@@ -226,15 +226,15 @@ public function testCreate()`
`226`	`226`	`);`
`227`	`227`	`}`
`228`	`228`
`229`		`- public function flattenDataProvider(): array`
	`229`	`+ public static function flattenDataProvider(): array`
`230`	`230`	`{`
`231`	`231`	`return [`
`232`	`232`	`[new \Exception('test', 123), 'Exception'],`
`233`	`233`	`[new \Error('test', 123), 'Error'],`
`234`	`234`	`];`
`235`	`235`	`}`
`236`	`236`
`237`		`- public function stringAndIntDataProvider(): array`
	`237`	`+ public static function stringAndIntDataProvider(): array`
`238`	`238`	`{`
`239`	`239`	`return [`
`240`	`240`	`[new \Exception('test1', 123)],`