Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit c714c356266f · 2023-02-14T09:44:56.000+01:00
* 5.4:
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
@@ -300,7 +300,7 @@ public function testInvalidInput($value)
         $process->setInput($value);
     }
 
-    public function provideInvalidInputValues()
+    public static function provideInvalidInputValues()
     {
         return [
             [[]],
@@ -318,7 +318,7 @@ public function testValidInput($expected, $value)
         $this->assertSame($expected, $process->getInput());
     }
 
-    public function provideInputValues()
+    public static function provideInputValues()
     {
         return [
             [null, null],
@@ -327,7 +327,7 @@ public function provideInputValues()
         ];
     }
 
-    public function chainedCommandsOutputProvider()
+    public static function chainedCommandsOutputProvider()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
             return [
@@ -421,7 +421,7 @@ public function testIncrementalOutput($getOutput, $getIncrementalOutput, $uri)
         fclose($h);
     }
 
-    public function provideIncrementalOutput()
+    public static function provideIncrementalOutput()
     {
         return [
             ['getOutput', 'getIncrementalOutput', 'php://stdout'],
@@ -955,7 +955,7 @@ public function testMethodsThatNeedARunningProcess($method)
         $process->{$method}();
     }
 
-    public function provideMethodsThatNeedARunningProcess()
+    public static function provideMethodsThatNeedARunningProcess()
     {
         return [
             ['getOutput'],
@@ -986,7 +986,7 @@ public function testMethodsThatNeedATerminatedProcess($method)
         throw $e;
     }
 
-    public function provideMethodsThatNeedATerminatedProcess()
+    public static function provideMethodsThatNeedATerminatedProcess()
     {
         return [
             ['hasBeenSignaled'],
@@ -1091,7 +1091,7 @@ public function testGetOutputWhileDisabled($fetchMethod)
         $p->{$fetchMethod}();
     }
 
-    public function provideOutputFetchingMethods()
+    public static function provideOutputFetchingMethods()
     {
         return [
             ['getOutput'],
@@ -1128,7 +1128,7 @@ public function testTermSignalTerminatesProcessCleanly()
         $this->assertTrue(true, 'A call to signal() is not expected to cause wait() to throw a RuntimeException');
     }
 
-    public function responsesCodeProvider()
+    public static function responsesCodeProvider()
     {
         return [
             // expected output / getter / code to execute
@@ -1138,7 +1138,7 @@ public function responsesCodeProvider()
         ];
     }
 
-    public function pipesCodeProvider()
+    public static function pipesCodeProvider()
     {
         $variations = [
             'fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);',
@@ -1181,7 +1181,7 @@ public function testIncrementalOutputDoesNotRequireAnotherCall($stream, $method)
         $process->stop();
     }
 
-    public function provideVariousIncrementals()
+    public static function provideVariousIncrementals()
     {
         return [
             ['php://stdout', 'getIncrementalOutput'],
@@ -1447,7 +1447,7 @@ public function testRawCommandLine()
         $this->assertSame($expected, str_replace('Standard input code', '-', $p->getOutput()));
     }
 
-    public function provideEscapeArgument()
+    public static function provideEscapeArgument()
     {
         yield ['a"b%c%'];
         yield ['a"b^c^'];

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ public function testInvalidInput($value)`
`300`	`300`	`$process->setInput($value);`
`301`	`301`	`}`
`302`	`302`
`303`		`- public function provideInvalidInputValues()`
	`303`	`+ public static function provideInvalidInputValues()`
`304`	`304`	`{`
`305`	`305`	`return [`
`306`	`306`	`[[]],`
`@@ -318,7 +318,7 @@ public function testValidInput($expected, $value)`
`318`	`318`	`$this->assertSame($expected, $process->getInput());`
`319`	`319`	`}`
`320`	`320`
`321`		`- public function provideInputValues()`
	`321`	`+ public static function provideInputValues()`
`322`	`322`	`{`
`323`	`323`	`return [`
`324`	`324`	`[null, null],`
`@@ -327,7 +327,7 @@ public function provideInputValues()`
`327`	`327`	`];`
`328`	`328`	`}`
`329`	`329`
`330`		`- public function chainedCommandsOutputProvider()`
	`330`	`+ public static function chainedCommandsOutputProvider()`
`331`	`331`	`{`
`332`	`332`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`333`	`333`	`return [`
`@@ -421,7 +421,7 @@ public function testIncrementalOutput($getOutput, $getIncrementalOutput, $uri)`
`421`	`421`	`fclose($h);`
`422`	`422`	`}`
`423`	`423`
`424`		`- public function provideIncrementalOutput()`
	`424`	`+ public static function provideIncrementalOutput()`
`425`	`425`	`{`
`426`	`426`	`return [`
`427`	`427`	`['getOutput', 'getIncrementalOutput', 'php://stdout'],`
`@@ -955,7 +955,7 @@ public function testMethodsThatNeedARunningProcess($method)`
`955`	`955`	`$process->{$method}();`
`956`	`956`	`}`
`957`	`957`
`958`		`- public function provideMethodsThatNeedARunningProcess()`
	`958`	`+ public static function provideMethodsThatNeedARunningProcess()`
`959`	`959`	`{`
`960`	`960`	`return [`
`961`	`961`	`['getOutput'],`
`@@ -986,7 +986,7 @@ public function testMethodsThatNeedATerminatedProcess($method)`
`986`	`986`	`throw $e;`
`987`	`987`	`}`
`988`	`988`
`989`		`- public function provideMethodsThatNeedATerminatedProcess()`
	`989`	`+ public static function provideMethodsThatNeedATerminatedProcess()`
`990`	`990`	`{`
`991`	`991`	`return [`
`992`	`992`	`['hasBeenSignaled'],`
`@@ -1091,7 +1091,7 @@ public function testGetOutputWhileDisabled($fetchMethod)`
`1091`	`1091`	`$p->{$fetchMethod}();`
`1092`	`1092`	`}`
`1093`	`1093`
`1094`		`- public function provideOutputFetchingMethods()`
	`1094`	`+ public static function provideOutputFetchingMethods()`
`1095`	`1095`	`{`
`1096`	`1096`	`return [`
`1097`	`1097`	`['getOutput'],`
`@@ -1128,7 +1128,7 @@ public function testTermSignalTerminatesProcessCleanly()`
`1128`	`1128`	`$this->assertTrue(true, 'A call to signal() is not expected to cause wait() to throw a RuntimeException');`
`1129`	`1129`	`}`
`1130`	`1130`
`1131`		`- public function responsesCodeProvider()`
	`1131`	`+ public static function responsesCodeProvider()`
`1132`	`1132`	`{`
`1133`	`1133`	`return [`
`1134`	`1134`	`// expected output / getter / code to execute`
`@@ -1138,7 +1138,7 @@ public function responsesCodeProvider()`
`1138`	`1138`	`];`
`1139`	`1139`	`}`
`1140`	`1140`
`1141`		`- public function pipesCodeProvider()`
	`1141`	`+ public static function pipesCodeProvider()`
`1142`	`1142`	`{`
`1143`	`1143`	`$variations = [`
`1144`	`1144`	`'fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);',`
`@@ -1181,7 +1181,7 @@ public function testIncrementalOutputDoesNotRequireAnotherCall($stream, $method)`
`1181`	`1181`	`$process->stop();`
`1182`	`1182`	`}`
`1183`	`1183`
`1184`		`- public function provideVariousIncrementals()`
	`1184`	`+ public static function provideVariousIncrementals()`
`1185`	`1185`	`{`
`1186`	`1186`	`return [`
`1187`	`1187`	`['php://stdout', 'getIncrementalOutput'],`
`@@ -1447,7 +1447,7 @@ public function testRawCommandLine()`
`1447`	`1447`	`$this->assertSame($expected, str_replace('Standard input code', '-', $p->getOutput()));`
`1448`	`1448`	`}`
`1449`	`1449`
`1450`		`- public function provideEscapeArgument()`
	`1450`	`+ public static function provideEscapeArgument()`
`1451`	`1451`	`{`
`1452`	`1452`	`yield ['a"b%c%'];`
`1453`	`1453`	`yield ['a"b^c^'];`