Merge branch '5.1' into 5.2

fabpot · fabpot · commit b1a42fa74569 · 2021-01-11T10:51:46.000+01:00
* 5.1:
  Use ::class keyword when possible
diff --git a/Request.php b/Request.php
@@ -2000,7 +2000,7 @@ private function setPhpDefaultLocale(string $locale): void
         // setting the default locale, the intl module is not installed, and
         // the call can be ignored:
         try {
-            if (class_exists('Locale', false)) {
+            if (class_exists(\Locale::class, false)) {
                 \Locale::setDefault($locale);
             }
         } catch (\Exception $e) {
diff --git a/Tests/BinaryFileResponseTest.php b/Tests/BinaryFileResponseTest.php
@@ -71,7 +71,7 @@ public function testConstructWithNonAsciiFilename()
 
     public function testSetContent()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $response = new BinaryFileResponse(__FILE__);
         $response->setContent('foo');
     }
diff --git a/Tests/CookieTest.php b/Tests/CookieTest.php
@@ -43,7 +43,7 @@ public function namesWithSpecialCharacters()
      */
     public function testInstantiationThrowsExceptionIfRawCookieNameContainsSpecialCharacters($name)
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         Cookie::create($name, null, 0, null, null, null, false, true);
     }
 
@@ -66,13 +66,13 @@ public function testInstantiationSucceedNonRawCookieNameContainsSpecialCharacter
 
     public function testInstantiationThrowsExceptionIfCookieNameIsEmpty()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         Cookie::create('');
     }
 
     public function testInvalidExpiration()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         Cookie::create('MyCookie', 'foo', 'bar');
     }
 
diff --git a/Tests/ExpressionRequestMatcherTest.php b/Tests/ExpressionRequestMatcherTest.php
@@ -20,7 +20,7 @@ class ExpressionRequestMatcherTest extends TestCase
 {
     public function testWhenNoExpressionIsSet()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $expressionRequestMatcher = new ExpressionRequestMatcher();
         $expressionRequestMatcher->matches(new Request());
     }
diff --git a/Tests/File/FileTest.php b/Tests/File/FileTest.php
@@ -41,7 +41,7 @@ public function testGuessExtensionIsBasedOnMimeType()
 
     public function testConstructWhenFileNotExists()
     {
-        $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+        $this->expectException(\Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException::class);
 
         new File(__DIR__.'/Fixtures/not_here');
     }
@@ -57,7 +57,7 @@ public function testMove()
 
         $file = new File($path);
         $movedFile = $file->move($targetDir);
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
+        $this->assertInstanceOf(File::class, $movedFile);
 
         $this->assertFileExists($targetPath);
         $this->assertFileDoesNotExist($path);
@@ -118,7 +118,7 @@ public function testMoveWithNonLatinName($filename, $sanitizedFilename)
 
         $file = new File($path);
         $movedFile = $file->move($targetDir, $filename);
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
+        $this->assertInstanceOf(File::class, $movedFile);
 
         $this->assertFileExists($targetPath);
         $this->assertFileDoesNotExist($path);
diff --git a/Tests/File/UploadedFileTest.php b/Tests/File/UploadedFileTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
 
     public function testConstructWhenFileNotExists()
     {
-        $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
+        $this->expectException(\Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException::class);
 
         new UploadedFile(
             __DIR__.'/Fixtures/not_here',
@@ -144,7 +144,7 @@ public function testGetClientOriginalExtension()
 
     public function testMoveLocalFileIsNotAllowed()
     {
-        $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileException');
+        $this->expectException(FileException::class);
         $file = new UploadedFile(
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
diff --git a/Tests/FileBagTest.php b/Tests/FileBagTest.php
@@ -25,7 +25,7 @@ class FileBagTest extends TestCase
 {
     public function testFileMustBeAnArrayOrUploadedFile()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         new FileBag(['file' => 'foo']);
     }
 
diff --git a/Tests/HeaderBagTest.php b/Tests/HeaderBagTest.php
@@ -45,7 +45,7 @@ public function testGetDate()
     {
         $bag = new HeaderBag(['foo' => 'Tue, 4 Sep 2012 20:00:00 +0200']);
         $headerDate = $bag->getDate('foo');
-        $this->assertInstanceOf('DateTime', $headerDate);
+        $this->assertInstanceOf(\DateTime::class, $headerDate);
     }
 
     public function testGetDateNull()
@@ -57,7 +57,7 @@ public function testGetDateNull()
 
     public function testGetDateException()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $bag = new HeaderBag(['foo' => 'Tue']);
         $bag->getDate('foo');
     }
diff --git a/Tests/HeaderUtilsTest.php b/Tests/HeaderUtilsTest.php
@@ -99,7 +99,7 @@ public function testUnquote()
 
     public function testMakeDispositionInvalidDisposition()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         HeaderUtils::makeDisposition('invalid', 'foo.html');
     }
 
@@ -128,7 +128,7 @@ public function provideMakeDisposition()
      */
     public function testMakeDispositionFail($disposition, $filename)
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         HeaderUtils::makeDisposition($disposition, $filename);
     }
 
diff --git a/Tests/IpUtilsTest.php b/Tests/IpUtilsTest.php
@@ -77,7 +77,7 @@ public function getIpv6Data()
      */
     public function testAnIpv6WithOptionDisabledIpv6()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         if (\defined('AF_INET6')) {
             $this->markTestSkipped('Only works when PHP is compiled with the option "disable-ipv6".');
         }
diff --git a/Tests/RequestTest.php b/Tests/RequestTest.php
@@ -917,7 +917,7 @@ public function testGetPort()
 
     public function testGetHostWithFakeHttpHostValue()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $request = new Request();
         $request->initialize([], [], [], [], [], ['HTTP_HOST' => 'www.host.com?query=string']);
         $request->getHost();
@@ -1086,7 +1086,7 @@ public function getClientIpsProvider()
      */
     public function testGetClientIpsWithConflictingHeaders($httpForwarded, $httpXForwardedFor)
     {
-        $this->expectException('Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException');
+        $this->expectException(\Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException::class);
         $request = new Request();
 
         $server = [
@@ -1848,7 +1848,7 @@ public function urlencodedStringPrefixData()
 
     private function disableHttpMethodParameterOverride()
     {
-        $class = new \ReflectionClass('Symfony\\Component\\HttpFoundation\\Request');
+        $class = new \ReflectionClass(Request::class);
         $property = $class->getProperty('httpMethodParameterOverride');
         $property->setAccessible(true);
         $property->setValue(false);
diff --git a/Tests/ResponseHeaderBagTest.php b/Tests/ResponseHeaderBagTest.php
@@ -250,7 +250,7 @@ public function testSetCookieHeader()
 
     public function testGetCookiesWithInvalidArgument()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $bag = new ResponseHeaderBag();
 
         $bag->getCookies('invalid_argument');
diff --git a/Tests/Session/SessionTest.php b/Tests/Session/SessionTest.php
@@ -212,7 +212,7 @@ public function testGetId()
 
     public function testGetFlashBag()
     {
-        $this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface', $this->session->getFlashBag());
+        $this->assertInstanceOf(\Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface::class, $this->session->getFlashBag());
     }
 
     public function testGetIterator()
@@ -241,7 +241,7 @@ public function testGetCount()
 
     public function testGetMeta()
     {
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\MetadataBag', $this->session->getMetadataBag());
+        $this->assertInstanceOf(\Symfony\Component\HttpFoundation\Session\Storage\MetadataBag::class, $this->session->getMetadataBag());
     }
 
     public function testIsEmpty()
diff --git a/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -38,7 +38,7 @@ protected function setUp(): void
             $this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower, or 3.0.0b1 or higher');
         }
 
-        $this->memcached = $this->getMockBuilder('Memcached')->getMock();
+        $this->memcached = $this->getMockBuilder(\Memcached::class)->getMock();
         $this->storage = new MemcachedSessionHandler(
             $this->memcached,
             ['prefix' => self::PREFIX, 'expiretime' => self::TTL]
diff --git a/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -55,7 +55,7 @@ protected function setUp(): void
 
     public function testConstructorShouldThrowExceptionForMissingOptions()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         new MongoDbSessionHandler($this->mongo, []);
     }
 
diff --git a/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
@@ -60,7 +60,7 @@ public function savePathDataProvider()
 
     public function testConstructException()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         new NativeFileSessionHandler('something;invalid;with;too-many-args');
     }
 
diff --git a/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -50,7 +50,7 @@ protected function getMemorySqlitePdo()
 
     public function testWrongPdoErrMode()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $pdo = $this->getMemorySqlitePdo();
         $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_SILENT);
 
@@ -59,7 +59,7 @@ public function testWrongPdoErrMode()
 
     public function testInexistentTable()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $storage = new PdoSessionHandler($this->getMemorySqlitePdo(), ['db_table' => 'inexistent_table']);
         $storage->open('', 'sid');
         $storage->read('id');
@@ -69,7 +69,7 @@ public function testInexistentTable()
 
     public function testCreateTableTwice()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $storage = new PdoSessionHandler($this->getMemorySqlitePdo());
         $storage->createTable();
     }
@@ -131,7 +131,7 @@ public function testReadWriteReadWithNullByte()
     public function testReadConvertsStreamToString()
     {
         $pdo = new MockPdo('pgsql');
-        $pdo->prepareResult = $this->getMockBuilder('PDOStatement')->getMock();
+        $pdo->prepareResult = $this->getMockBuilder(\PDOStatement::class)->getMock();
 
         $content = 'foobar';
         $stream = $this->createStream($content);
@@ -152,8 +152,8 @@ public function testReadLockedConvertsStreamToString()
         }
 
         $pdo = new MockPdo('pgsql');
-        $selectStmt = $this->getMockBuilder('PDOStatement')->getMock();
-        $insertStmt = $this->getMockBuilder('PDOStatement')->getMock();
+        $selectStmt = $this->getMockBuilder(\PDOStatement::class)->getMock();
+        $insertStmt = $this->getMockBuilder(\PDOStatement::class)->getMock();
 
         $pdo->prepareResult = function ($statement) use ($selectStmt, $insertStmt) {
             return 0 === strpos($statement, 'INSERT') ? $insertStmt : $selectStmt;
diff --git a/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php b/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php
@@ -18,7 +18,7 @@ class RedisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
     public static function setUpBeforeClass(): void
     {
-        if (!class_exists('RedisCluster')) {
+        if (!class_exists(\RedisCluster::class)) {
             self::markTestSkipped('The RedisCluster class is required.');
         }
 
diff --git a/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php b/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
diff --git a/Tests/Session/Storage/MockArraySessionStorageTest.php b/Tests/Session/Storage/MockArraySessionStorageTest.php
diff --git a/Tests/Session/Storage/MockFileSessionStorageTest.php b/Tests/Session/Storage/MockFileSessionStorageTest.php
diff --git a/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/Tests/Session/Storage/Proxy/AbstractProxyTest.php
diff --git a/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
diff --git a/Tests/StreamedResponseTest.php b/Tests/StreamedResponseTest.php
diff --git a/Tests/UrlHelperTest.php b/Tests/UrlHelperTest.php

Original file line number	Diff line number	Diff line change
`@@ -2000,7 +2000,7 @@ private function setPhpDefaultLocale(string $locale): void`
`2000`	`2000`	`// setting the default locale, the intl module is not installed, and`
`2001`	`2001`	`// the call can be ignored:`
`2002`	`2002`	`try {`
`2003`		`- if (class_exists('Locale', false)) {`
	`2003`	`+ if (class_exists(\Locale::class, false)) {`
`2004`	`2004`	`\Locale::setDefault($locale);`
`2005`	`2005`	`}`
`2006`	`2006`	`} catch (\Exception $e) {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function testConstructWithNonAsciiFilename()`
`71`	`71`
`72`	`72`	`public function testSetContent()`
`73`	`73`	`{`
`74`		`- $this->expectException('LogicException');`
	`74`	`+ $this->expectException(\LogicException::class);`
`75`	`75`	`$response = new BinaryFileResponse(__FILE__);`
`76`	`76`	`$response->setContent('foo');`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function namesWithSpecialCharacters()`
`43`	`43`	`*/`
`44`	`44`	`public function testInstantiationThrowsExceptionIfRawCookieNameContainsSpecialCharacters($name)`
`45`	`45`	`{`
`46`		`- $this->expectException('InvalidArgumentException');`
	`46`	`+ $this->expectException(\InvalidArgumentException::class);`
`47`	`47`	`Cookie::create($name, null, 0, null, null, null, false, true);`
`48`	`48`	`}`
`49`	`49`
`@@ -66,13 +66,13 @@ public function testInstantiationSucceedNonRawCookieNameContainsSpecialCharacter`
`66`	`66`
`67`	`67`	`public function testInstantiationThrowsExceptionIfCookieNameIsEmpty()`
`68`	`68`	`{`
`69`		`- $this->expectException('InvalidArgumentException');`
	`69`	`+ $this->expectException(\InvalidArgumentException::class);`
`70`	`70`	`Cookie::create('');`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public function testInvalidExpiration()`
`74`	`74`	`{`
`75`		`- $this->expectException('InvalidArgumentException');`
	`75`	`+ $this->expectException(\InvalidArgumentException::class);`
`76`	`76`	`Cookie::create('MyCookie', 'foo', 'bar');`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ExpressionRequestMatcherTest extends TestCase`
`20`	`20`	`{`
`21`	`21`	`public function testWhenNoExpressionIsSet()`
`22`	`22`	`{`
`23`		`- $this->expectException('LogicException');`
	`23`	`+ $this->expectException(\LogicException::class);`
`24`	`24`	`$expressionRequestMatcher = new ExpressionRequestMatcher();`
`25`	`25`	`$expressionRequestMatcher->matches(new Request());`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function setUp(): void`
`33`	`33`
`34`	`34`	`public function testConstructWhenFileNotExists()`
`35`	`35`	`{`
`36`		`- $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');`
	`36`	`+ $this->expectException(\Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException::class);`
`37`	`37`
`38`	`38`	`new UploadedFile(`
`39`	`39`	`__DIR__.'/Fixtures/not_here',`
`@@ -144,7 +144,7 @@ public function testGetClientOriginalExtension()`
`144`	`144`
`145`	`145`	`public function testMoveLocalFileIsNotAllowed()`
`146`	`146`	`{`
`147`		`- $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileException');`
	`147`	`+ $this->expectException(FileException::class);`
`148`	`148`	`$file = new UploadedFile(`
`149`	`149`	`__DIR__.'/Fixtures/test.gif',`
`150`	`150`	`'original.gif',`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class FileBagTest extends TestCase`
`25`	`25`	`{`
`26`	`26`	`public function testFileMustBeAnArrayOrUploadedFile()`
`27`	`27`	`{`
`28`		`- $this->expectException('InvalidArgumentException');`
	`28`	`+ $this->expectException(\InvalidArgumentException::class);`
`29`	`29`	`new FileBag(['file' => 'foo']);`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function testGetDate()`
`45`	`45`	`{`
`46`	`46`	`$bag = new HeaderBag(['foo' => 'Tue, 4 Sep 2012 20:00:00 +0200']);`
`47`	`47`	`$headerDate = $bag->getDate('foo');`
`48`		`- $this->assertInstanceOf('DateTime', $headerDate);`
	`48`	`+ $this->assertInstanceOf(\DateTime::class, $headerDate);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function testGetDateNull()`
`@@ -57,7 +57,7 @@ public function testGetDateNull()`
`57`	`57`
`58`	`58`	`public function testGetDateException()`
`59`	`59`	`{`
`60`		`- $this->expectException('RuntimeException');`
	`60`	`+ $this->expectException(\RuntimeException::class);`
`61`	`61`	`$bag = new HeaderBag(['foo' => 'Tue']);`
`62`	`62`	`$bag->getDate('foo');`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function testUnquote()`
`99`	`99`
`100`	`100`	`public function testMakeDispositionInvalidDisposition()`
`101`	`101`	`{`
`102`		`- $this->expectException('InvalidArgumentException');`
	`102`	`+ $this->expectException(\InvalidArgumentException::class);`
`103`	`103`	`HeaderUtils::makeDisposition('invalid', 'foo.html');`
`104`	`104`	`}`
`105`	`105`
`@@ -128,7 +128,7 @@ public function provideMakeDisposition()`
`128`	`128`	`*/`
`129`	`129`	`public function testMakeDispositionFail($disposition, $filename)`
`130`	`130`	`{`
`131`		`- $this->expectException('InvalidArgumentException');`
	`131`	`+ $this->expectException(\InvalidArgumentException::class);`
`132`	`132`	`HeaderUtils::makeDisposition($disposition, $filename);`
`133`	`133`	`}`
`134`	`134`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function getIpv6Data()`
`77`	`77`	`*/`
`78`	`78`	`public function testAnIpv6WithOptionDisabledIpv6()`
`79`	`79`	`{`
`80`		`- $this->expectException('RuntimeException');`
	`80`	`+ $this->expectException(\RuntimeException::class);`
`81`	`81`	`if (\defined('AF_INET6')) {`
`82`	`82`	`$this->markTestSkipped('Only works when PHP is compiled with the option "disable-ipv6".');`
`83`	`83`	`}`