Merge branch '4.4' into 5.1

fabpot · fabpot · commit d4368259f3f3 · 2021-01-11T10:50:50.000+01:00
* 4.4:
  Use ::class keyword when possible
diff --git a/Tests/AbstractBrowserTest.php b/Tests/AbstractBrowserTest.php
@@ -77,7 +77,7 @@ public function testGetResponse()
         $client->request('GET', 'http://example.com/');
 
         $this->assertSame('foo', $client->getResponse()->getContent(), '->getCrawler() returns the Response of the last request');
-        $this->assertInstanceOf('Symfony\Component\BrowserKit\Response', $client->getResponse(), '->getCrawler() returns the Response of the last request');
+        $this->assertInstanceOf(Response::class, $client->getResponse(), '->getCrawler() returns the Response of the last request');
     }
 
     public function testGetResponseNull()
@@ -285,7 +285,7 @@ public function testClickLinkNotFound()
             $client->clickLink('foo');
             $this->fail('->clickLink() throws a \InvalidArgumentException if the link could not be found');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('InvalidArgumentException', $e, '->clickLink() throws a \InvalidArgumentException if the link could not be found');
+            $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->clickLink() throws a \InvalidArgumentException if the link could not be found');
         }
     }
 
@@ -344,7 +344,7 @@ public function testSubmitFormNotFound()
             ], 'POST');
             $this->fail('->submitForm() throws a \InvalidArgumentException if the form could not be found');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('InvalidArgumentException', $e, '->submitForm() throws a \InvalidArgumentException if the form could not be found');
+            $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->submitForm() throws a \InvalidArgumentException if the form could not be found');
         }
     }
 
@@ -395,7 +395,7 @@ public function testFollowRedirect()
             $client->followRedirect();
             $this->fail('->followRedirect() throws a \LogicException if the request was not redirected');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request was not redirected');
+            $this->assertInstanceOf(\LogicException::class, $e, '->followRedirect() throws a \LogicException if the request was not redirected');
         }
 
         $client->setNextResponse(new Response('', 302, ['Location' => 'http://www.example.com/redirected']));
@@ -425,7 +425,7 @@ public function testFollowRedirect()
             $client->followRedirect();
             $this->fail('->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');
+            $this->assertInstanceOf(\LogicException::class, $e, '->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');
         }
     }
 
@@ -455,7 +455,7 @@ public function testFollowRedirectWithMaxRedirects()
             $client->followRedirect();
             $this->fail('->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
+            $this->assertInstanceOf(\LogicException::class, $e, '->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
         }
 
         $client->setNextResponse(new Response('', 302, ['Location' => 'http://www.example.com/redirected']));
@@ -738,7 +738,7 @@ public function testInsulatedRequests()
             $client->request('GET', 'http://www.example.com/foo/foobar');
             $this->fail('->request() throws a \RuntimeException if the script has an error');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('RuntimeException', $e, '->request() throws a \RuntimeException if the script has an error');
+            $this->assertInstanceOf(\RuntimeException::class, $e, '->request() throws a \RuntimeException if the script has an error');
         }
     }
 
@@ -826,7 +826,7 @@ public function testInternalRequest()
             'NEW_SERVER_KEY' => 'new-server-key-value',
         ]);
 
-        $this->assertInstanceOf('Symfony\Component\BrowserKit\Request', $client->getInternalRequest());
+        $this->assertInstanceOf(\Symfony\Component\BrowserKit\Request::class, $client->getInternalRequest());
     }
 
     public function testInternalRequestNull()
diff --git a/Tests/CookieJarTest.php b/Tests/CookieJarTest.php
@@ -77,8 +77,8 @@ public function testUpdateFromSetCookie()
         $cookieJar->set(new Cookie('bar', 'bar'));
         $cookieJar->updateFromSetCookie($setCookies);
 
-        $this->assertInstanceOf('Symfony\Component\BrowserKit\Cookie', $cookieJar->get('foo'));
-        $this->assertInstanceOf('Symfony\Component\BrowserKit\Cookie', $cookieJar->get('bar'));
+        $this->assertInstanceOf(Cookie::class, $cookieJar->get('foo'));
+        $this->assertInstanceOf(Cookie::class, $cookieJar->get('bar'));
         $this->assertEquals('foo', $cookieJar->get('foo')->getValue(), '->updateFromSetCookie() updates cookies from a Set-Cookie header');
         $this->assertEquals('bar', $cookieJar->get('bar')->getValue(), '->updateFromSetCookie() keeps existing cookies');
     }
@@ -103,9 +103,9 @@ public function testUpdateFromSetCookieWithMultipleCookies()
         $barCookie = $cookieJar->get('bar', '/', '.blog.symfony.com');
         $phpCookie = $cookieJar->get('PHPSESSID');
 
-        $this->assertInstanceOf('Symfony\Component\BrowserKit\Cookie', $fooCookie);
-        $this->assertInstanceOf('Symfony\Component\BrowserKit\Cookie', $barCookie);
-        $this->assertInstanceOf('Symfony\Component\BrowserKit\Cookie', $phpCookie);
+        $this->assertInstanceOf(Cookie::class, $fooCookie);
+        $this->assertInstanceOf(Cookie::class, $barCookie);
+        $this->assertInstanceOf(Cookie::class, $phpCookie);
         $this->assertEquals('foo', $fooCookie->getValue());
         $this->assertEquals('bar', $barCookie->getValue());
         $this->assertEquals('id', $phpCookie->getValue());
diff --git a/Tests/CookieTest.php b/Tests/CookieTest.php
@@ -104,7 +104,7 @@ public function testFromStringWithUrl()
 
     public function testFromStringThrowsAnExceptionIfCookieIsNotValid()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         Cookie::fromString('foo');
     }
 
@@ -117,7 +117,7 @@ public function testFromStringIgnoresInvalidExpiresDate()
 
     public function testFromStringThrowsAnExceptionIfUrlIsNotValid()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         Cookie::fromString('foo=bar', 'foobar');
     }
 
@@ -200,7 +200,7 @@ public function testIsExpired()
 
     public function testConstructException()
     {
-        $this->expectException('UnexpectedValueException');
+        $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionMessage('The cookie expiration time "string" is not valid.');
         new Cookie('foo', 'bar', 'string');
     }
diff --git a/Tests/HistoryTest.php b/Tests/HistoryTest.php
@@ -55,7 +55,7 @@ public function testCurrent()
             $history->current();
             $this->fail('->current() throws a \LogicException if the history is empty');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('LogicException', $e, '->current() throws a \LogicException if the history is empty');
+            $this->assertInstanceOf(\LogicException::class, $e, '->current() throws a \LogicException if the history is empty');
         }
 
         $history->add(new Request('http://www.example.com/', 'get'));
@@ -72,7 +72,7 @@ public function testBack()
             $history->back();
             $this->fail('->back() throws a \LogicException if the history is already on the first page');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('LogicException', $e, '->current() throws a \LogicException if the history is already on the first page');
+            $this->assertInstanceOf(\LogicException::class, $e, '->current() throws a \LogicException if the history is already on the first page');
         }
 
         $history->add(new Request('http://www.example1.com/', 'get'));
@@ -91,7 +91,7 @@ public function testForward()
             $history->forward();
             $this->fail('->forward() throws a \LogicException if the history is already on the last page');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('LogicException', $e, '->forward() throws a \LogicException if the history is already on the last page');
+            $this->assertInstanceOf(\LogicException::class, $e, '->forward() throws a \LogicException if the history is already on the last page');
         }
 
         $history->back();
diff --git a/Tests/TestClient.php b/Tests/TestClient.php
@@ -43,7 +43,7 @@ protected function doRequest($request): Response
 
     protected function getScript($request)
     {
-        $r = new \ReflectionClass('Symfony\Component\BrowserKit\Response');
+        $r = new \ReflectionClass(Response::class);
         $path = $r->getFileName();
 
         return <<<EOF
diff --git a/Tests/TestHttpClient.php b/Tests/TestHttpClient.php
@@ -66,7 +66,7 @@ protected function doRequest($request): Response
 
     protected function getScript($request)
     {
-        $r = new \ReflectionClass('Symfony\Component\BrowserKit\Response');
+        $r = new \ReflectionClass(Response::class);
         $path = $r->getFileName();
 
         return <<<EOF

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function testGetResponse()`
`77`	`77`	`$client->request('GET', 'http://example.com/');`
`78`	`78`
`79`	`79`	`$this->assertSame('foo', $client->getResponse()->getContent(), '->getCrawler() returns the Response of the last request');`
`80`		`- $this->assertInstanceOf('Symfony\Component\BrowserKit\Response', $client->getResponse(), '->getCrawler() returns the Response of the last request');`
	`80`	`+ $this->assertInstanceOf(Response::class, $client->getResponse(), '->getCrawler() returns the Response of the last request');`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public function testGetResponseNull()`
`@@ -285,7 +285,7 @@ public function testClickLinkNotFound()`
`285`	`285`	`$client->clickLink('foo');`
`286`	`286`	`$this->fail('->clickLink() throws a \InvalidArgumentException if the link could not be found');`
`287`	`287`	`} catch (\Exception $e) {`
`288`		`- $this->assertInstanceOf('InvalidArgumentException', $e, '->clickLink() throws a \InvalidArgumentException if the link could not be found');`
	`288`	`+ $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->clickLink() throws a \InvalidArgumentException if the link could not be found');`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`
`@@ -344,7 +344,7 @@ public function testSubmitFormNotFound()`
`344`	`344`	`], 'POST');`
`345`	`345`	`$this->fail('->submitForm() throws a \InvalidArgumentException if the form could not be found');`
`346`	`346`	`} catch (\Exception $e) {`
`347`		`- $this->assertInstanceOf('InvalidArgumentException', $e, '->submitForm() throws a \InvalidArgumentException if the form could not be found');`
	`347`	`+ $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->submitForm() throws a \InvalidArgumentException if the form could not be found');`
`348`	`348`	`}`
`349`	`349`	`}`
`350`	`350`
`@@ -395,7 +395,7 @@ public function testFollowRedirect()`
`395`	`395`	`$client->followRedirect();`
`396`	`396`	`$this->fail('->followRedirect() throws a \LogicException if the request was not redirected');`
`397`	`397`	`} catch (\Exception $e) {`
`398`		`- $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request was not redirected');`
	`398`	`+ $this->assertInstanceOf(\LogicException::class, $e, '->followRedirect() throws a \LogicException if the request was not redirected');`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`$client->setNextResponse(new Response('', 302, ['Location' => 'http://www.example.com/redirected']));`
`@@ -425,7 +425,7 @@ public function testFollowRedirect()`
`425`	`425`	`$client->followRedirect();`
`426`	`426`	`$this->fail('->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');`
`427`	`427`	`} catch (\Exception $e) {`
`428`		`- $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');`
	`428`	`+ $this->assertInstanceOf(\LogicException::class, $e, '->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');`
`429`	`429`	`}`
`430`	`430`	`}`
`431`	`431`
`@@ -455,7 +455,7 @@ public function testFollowRedirectWithMaxRedirects()`
`455`	`455`	`$client->followRedirect();`
`456`	`456`	`$this->fail('->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');`
`457`	`457`	`} catch (\Exception $e) {`
`458`		`- $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');`
	`458`	`+ $this->assertInstanceOf(\LogicException::class, $e, '->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`$client->setNextResponse(new Response('', 302, ['Location' => 'http://www.example.com/redirected']));`
`@@ -738,7 +738,7 @@ public function testInsulatedRequests()`
`738`	`738`	`$client->request('GET', 'http://www.example.com/foo/foobar');`
`739`	`739`	`$this->fail('->request() throws a \RuntimeException if the script has an error');`
`740`	`740`	`} catch (\Exception $e) {`
`741`		`- $this->assertInstanceOf('RuntimeException', $e, '->request() throws a \RuntimeException if the script has an error');`
	`741`	`+ $this->assertInstanceOf(\RuntimeException::class, $e, '->request() throws a \RuntimeException if the script has an error');`
`742`	`742`	`}`
`743`	`743`	`}`
`744`	`744`
`@@ -826,7 +826,7 @@ public function testInternalRequest()`
`826`	`826`	`'NEW_SERVER_KEY' => 'new-server-key-value',`
`827`	`827`	`]);`
`828`	`828`
`829`		`- $this->assertInstanceOf('Symfony\Component\BrowserKit\Request', $client->getInternalRequest());`
	`829`	`+ $this->assertInstanceOf(\Symfony\Component\BrowserKit\Request::class, $client->getInternalRequest());`
`830`	`830`	`}`
`831`	`831`
`832`	`832`	`public function testInternalRequestNull()`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function testFromStringWithUrl()`
`104`	`104`
`105`	`105`	`public function testFromStringThrowsAnExceptionIfCookieIsNotValid()`
`106`	`106`	`{`
`107`		`- $this->expectException('InvalidArgumentException');`
	`107`	`+ $this->expectException(\InvalidArgumentException::class);`
`108`	`108`	`Cookie::fromString('foo');`
`109`	`109`	`}`
`110`	`110`
`@@ -117,7 +117,7 @@ public function testFromStringIgnoresInvalidExpiresDate()`
`117`	`117`
`118`	`118`	`public function testFromStringThrowsAnExceptionIfUrlIsNotValid()`
`119`	`119`	`{`
`120`		`- $this->expectException('InvalidArgumentException');`
	`120`	`+ $this->expectException(\InvalidArgumentException::class);`
`121`	`121`	`Cookie::fromString('foo=bar', 'foobar');`
`122`	`122`	`}`
`123`	`123`
`@@ -200,7 +200,7 @@ public function testIsExpired()`
`200`	`200`
`201`	`201`	`public function testConstructException()`
`202`	`202`	`{`
`203`		`- $this->expectException('UnexpectedValueException');`
	`203`	`+ $this->expectException(\UnexpectedValueException::class);`
`204`	`204`	`$this->expectExceptionMessage('The cookie expiration time "string" is not valid.');`
`205`	`205`	`new Cookie('foo', 'bar', 'string');`
`206`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected function doRequest($request): Response`
`43`	`43`
`44`	`44`	`protected function getScript($request)`
`45`	`45`	`{`
`46`		`- $r = new \ReflectionClass('Symfony\Component\BrowserKit\Response');`
	`46`	`+ $r = new \ReflectionClass(Response::class);`
`47`	`47`	`$path = $r->getFileName();`
`48`	`48`
`49`	`49`	`return <<<EOF`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ protected function doRequest($request): Response`
`66`	`66`
`67`	`67`	`protected function getScript($request)`
`68`	`68`	`{`
`69`		`- $r = new \ReflectionClass('Symfony\Component\BrowserKit\Response');`
	`69`	`+ $r = new \ReflectionClass(Response::class);`
`70`	`70`	`$path = $r->getFileName();`
`71`	`71`
`72`	`72`	`return <<<EOF`