Merge branch '5.4' into 6.2

* 5.4: Migrate to `static` data providers using `rector/rector`
symfony · Feb 14, 2023 · 87bd432 · 87bd432
2 parents 0844575 + a866ca7
commit 87bd432
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
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'];