Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 87bd43240e6c · 2023-02-14T09:44:56.000+01:00
* 5.4:
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/AbstractBrowserTest.php b/Tests/AbstractBrowserTest.php
@@ -623,7 +623,7 @@ public function testFollowMetaRefresh(string $content, string $expectedEndingUrl
         $this->assertSame($expectedEndingUrl, $client->getRequest()->getUri());
     }
 
-    public function getTestsForMetaRefresh()
+    public static function getTestsForMetaRefresh()
     {
         return [
             ['<html><head><meta http-equiv="Refresh" content="4" /><meta http-equiv="refresh" content="0; URL=http://www.example.com/redirected"/></head></html>', 'http://www.example.com/redirected'],
diff --git a/Tests/CookieJarTest.php b/Tests/CookieJarTest.php
@@ -130,7 +130,7 @@ public function testAllValues($uri, $values)
         $this->assertEquals($values, array_keys($cookieJar->allValues($uri)), '->allValues() returns the cookie for a given URI');
     }
 
-    public function provideAllValuesValues()
+    public static function provideAllValuesValues()
     {
         return [
             ['http://www.example.com', ['foo_nothing', 'foo_domain']],
diff --git a/Tests/CookieTest.php b/Tests/CookieTest.php
@@ -42,7 +42,7 @@ public function testToFromString($cookie, $url = null)
         $this->assertEquals($cookie, (string) Cookie::fromString($cookie, $url));
     }
 
-    public function getTestsForToFromString()
+    public static function getTestsForToFromString()
     {
         return [
             ['foo=bar; path=/'],
@@ -71,7 +71,7 @@ public function testFromStringAcceptsSeveralExpiresDateFormats($cookie)
         $this->assertEquals(1596185377, Cookie::fromString($cookie)->getExpiresTime());
     }
 
-    public function getExpireCookieStrings()
+    public static function getExpireCookieStrings()
     {
         return [
             ['foo=bar; expires=Fri, 31-Jul-2020 08:49:37 GMT'],
diff --git a/Tests/HttpBrowserTest.php b/Tests/HttpBrowserTest.php
@@ -40,7 +40,7 @@ public function testRequestHeaders(array $requestArguments, array $expectedArgum
         $browser->request(...$requestArguments);
     }
 
-    public function validContentTypes()
+    public static function validContentTypes()
     {
         $defaultHeaders = ['user-agent' => 'Symfony BrowserKit', 'host' => 'example.com'];
         yield 'GET/HEAD' => [
@@ -199,7 +199,7 @@ public function testMultipleForwardSlashesRequestPath(string $requestPath)
         $browser->request('GET', $requestPath);
     }
 
-    public function forwardSlashesRequestPathProvider()
+    public static function forwardSlashesRequestPathProvider()
     {
         return [
             'one slash' => ['/'],
diff --git a/Tests/ResponseTest.php b/Tests/ResponseTest.php
@@ -103,7 +103,7 @@ public function testToArrayThrowsErrorOnInvalidJson(string $data)
         $response->toArray();
     }
 
-    public function provideInvalidJson(): iterable
+    public static function provideInvalidJson(): iterable
     {
         yield 'Empty string' => [''];
         yield 'Not json' => ['freferfrefer'];

Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ public function testFollowMetaRefresh(string $content, string $expectedEndingUrl`
`623`	`623`	`$this->assertSame($expectedEndingUrl, $client->getRequest()->getUri());`
`624`	`624`	`}`
`625`	`625`
`626`		`- public function getTestsForMetaRefresh()`
	`626`	`+ public static function getTestsForMetaRefresh()`
`627`	`627`	`{`
`628`	`628`	`return [`
`629`	`629`	`['<html><head><meta http-equiv="Refresh" content="4" /><meta http-equiv="refresh" content="0; URL=http://www.example.com/redirected"/></head></html>', 'http://www.example.com/redirected'],`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public function testAllValues($uri, $values)`
`130`	`130`	`$this->assertEquals($values, array_keys($cookieJar->allValues($uri)), '->allValues() returns the cookie for a given URI');`
`131`	`131`	`}`
`132`	`132`
`133`		`- public function provideAllValuesValues()`
	`133`	`+ public static function provideAllValuesValues()`
`134`	`134`	`{`
`135`	`135`	`return [`
`136`	`136`	`['http://www.example.com', ['foo_nothing', 'foo_domain']],`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function testToFromString($cookie, $url = null)`
`42`	`42`	`$this->assertEquals($cookie, (string) Cookie::fromString($cookie, $url));`
`43`	`43`	`}`
`44`	`44`
`45`		`- public function getTestsForToFromString()`
	`45`	`+ public static function getTestsForToFromString()`
`46`	`46`	`{`
`47`	`47`	`return [`
`48`	`48`	`['foo=bar; path=/'],`
`@@ -71,7 +71,7 @@ public function testFromStringAcceptsSeveralExpiresDateFormats($cookie)`
`71`	`71`	`$this->assertEquals(1596185377, Cookie::fromString($cookie)->getExpiresTime());`
`72`	`72`	`}`
`73`	`73`
`74`		`- public function getExpireCookieStrings()`
	`74`	`+ public static function getExpireCookieStrings()`
`75`	`75`	`{`
`76`	`76`	`return [`
`77`	`77`	`['foo=bar; expires=Fri, 31-Jul-2020 08:49:37 GMT'],`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function testRequestHeaders(array $requestArguments, array $expectedArgum`
`40`	`40`	`$browser->request(...$requestArguments);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public function validContentTypes()`
	`43`	`+ public static function validContentTypes()`
`44`	`44`	`{`
`45`	`45`	`$defaultHeaders = ['user-agent' => 'Symfony BrowserKit', 'host' => 'example.com'];`
`46`	`46`	`yield 'GET/HEAD' => [`
`@@ -199,7 +199,7 @@ public function testMultipleForwardSlashesRequestPath(string $requestPath)`
`199`	`199`	`$browser->request('GET', $requestPath);`
`200`	`200`	`}`
`201`	`201`
`202`		`- public function forwardSlashesRequestPathProvider()`
	`202`	`+ public static function forwardSlashesRequestPathProvider()`
`203`	`203`	`{`
`204`	`204`	`return [`
`205`	`205`	`'one slash' => ['/'],`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function testToArrayThrowsErrorOnInvalidJson(string $data)`
`103`	`103`	`$response->toArray();`
`104`	`104`	`}`
`105`	`105`
`106`		`- public function provideInvalidJson(): iterable`
	`106`	`+ public static function provideInvalidJson(): iterable`
`107`	`107`	`{`
`108`	`108`	`yield 'Empty string' => [''];`
`109`	`109`	`yield 'Not json' => ['freferfrefer'];`