Use createMock() and use import instead of FQCN

symfony · Jan 27, 2021 · 8888741 · 8888741
1 parent 8248745
commit 8888741
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 30 deletions.
diff --git a/Tests/File/FileTest.php b/Tests/File/FileTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpFoundation\Tests\File;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\File\File;
 
 /**
@@ -41,7 +42,7 @@ public function testGuessExtensionIsBasedOnMimeType()
 
     public function testConstructWhenFileNotExists()
     {
-        $this->expectException(\Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException::class);
+        $this->expectException(FileNotFoundException::class);
 
         new File(__DIR__.'/Fixtures/not_here');
     }

diff --git a/Tests/File/MimeType/MimeTypeTest.php b/Tests/File/MimeType/MimeTypeTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\HttpFoundation\Tests\File\MimeType;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
+use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser;
 use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
 
@@ -39,7 +41,7 @@ public function testGuessImageWithoutExtension()
 
     public function testGuessImageWithDirectory()
     {
-        $this->expectException(\Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException::class);
+        $this->expectException(FileNotFoundException::class);
 
         MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/directory');
     }
@@ -68,7 +70,7 @@ public function testGuessWithDuplicatedFileType()
 
     public function testGuessWithIncorrectPath()
     {
-        $this->expectException(\Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException::class);
+        $this->expectException(FileNotFoundException::class);
         MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/not_here');
     }
 
@@ -87,7 +89,7 @@ public function testGuessWithNonReadablePath()
         @chmod($path, 0333);
 
         if ('0333' == substr(sprintf('%o', fileperms($path)), -4)) {
-            $this->expectException(\Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException::class);
+            $this->expectException(AccessDeniedException::class);
             MimeTypeGuesser::getInstance()->guess($path);
         } else {
             $this->markTestSkipped('Can not verify chmod operations, change of file permissions failed');

diff --git a/Tests/RequestTest.php b/Tests/RequestTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpFoundation\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
@@ -1087,7 +1088,7 @@ public function getClientIpsProvider()
      */
     public function testGetClientIpsWithConflictingHeaders($httpForwarded, $httpXForwardedFor)
     {
-        $this->expectException(\Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException::class);
+        $this->expectException(ConflictingHeadersException::class);
         $request = new Request();
 
         $server = [

diff --git a/Tests/ResponseTest.php b/Tests/ResponseTest.php
@@ -946,7 +946,7 @@ public function testSettersAreChainable()
     public function testNoDeprecationsAreTriggered()
     {
         new DefaultResponse();
-        $this->getMockBuilder(Response::class)->getMock();
+        $this->createMock(Response::class);
 
         // we just need to ensure that subclasses of Response can be created without any deprecations
         // being triggered if the subclass does not override any final methods

diff --git a/Tests/Session/SessionTest.php b/Tests/Session/SessionTest.php
@@ -14,8 +14,10 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionBagProxy;
+use Symfony\Component\HttpFoundation\Session\Storage\MetadataBag;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 
 /**
@@ -212,7 +214,7 @@ public function testGetId()
 
     public function testGetFlashBag()
     {
-        $this->assertInstanceOf(\Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface::class, $this->session->getFlashBag());
+        $this->assertInstanceOf(FlashBagInterface::class, $this->session->getFlashBag());
     }
 
     public function testGetIterator()
@@ -241,7 +243,7 @@ public function testGetCount()
 
     public function testGetMeta()
     {
-        $this->assertInstanceOf(\Symfony\Component\HttpFoundation\Session\Storage\MetadataBag::class, $this->session->getMetadataBag());
+        $this->assertInstanceOf(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::class)->getMock();
+        $this->memcached = $this->createMock(\Memcached::class);
         $this->storage = new MemcachedSessionHandler(
             $this->memcached,
             ['prefix' => self::PREFIX, 'expiretime' => self::TTL]

diff --git a/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -131,7 +131,7 @@ public function testReadWriteReadWithNullByte()
     public function testReadConvertsStreamToString()
     {
         $pdo = new MockPdo('pgsql');
-        $pdo->prepareResult = $this->getMockBuilder(\PDOStatement::class)->getMock();
+        $pdo->prepareResult = $this->createMock(\PDOStatement::class);
 
         $content = 'foobar';
         $stream = $this->createStream($content);
@@ -152,8 +152,8 @@ public function testReadLockedConvertsStreamToString()
         }
 
         $pdo = new MockPdo('pgsql');
-        $selectStmt = $this->getMockBuilder(\PDOStatement::class)->getMock();
-        $insertStmt = $this->getMockBuilder(\PDOStatement::class)->getMock();
+        $selectStmt = $this->createMock(\PDOStatement::class);
+        $insertStmt = $this->createMock(\PDOStatement::class);
 
         $pdo->prepareResult = function ($statement) use ($selectStmt, $insertStmt) {
             return 0 === strpos($statement, 'INSERT') ? $insertStmt : $selectStmt;

diff --git a/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php b/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
@@ -19,7 +19,7 @@ class StrictSessionHandlerTest extends TestCase
 {
     public function testOpen()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('open')
             ->with('path', 'name')->willReturn(true);
         $proxy = new StrictSessionHandler($handler);
@@ -31,7 +31,7 @@ public function testOpen()
 
     public function testCloseSession()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('close')
             ->willReturn(true);
         $proxy = new StrictSessionHandler($handler);
@@ -41,7 +41,7 @@ public function testCloseSession()
 
     public function testValidateIdOK()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('read')
             ->with('id')->willReturn('data');
         $proxy = new StrictSessionHandler($handler);
@@ -51,7 +51,7 @@ public function testValidateIdOK()
 
     public function testValidateIdKO()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('read')
             ->with('id')->willReturn('');
         $proxy = new StrictSessionHandler($handler);
@@ -61,7 +61,7 @@ public function testValidateIdKO()
 
     public function testRead()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('read')
             ->with('id')->willReturn('data');
         $proxy = new StrictSessionHandler($handler);
@@ -71,7 +71,7 @@ public function testRead()
 
     public function testReadWithValidateIdOK()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('read')
             ->with('id')->willReturn('data');
         $proxy = new StrictSessionHandler($handler);
@@ -82,7 +82,7 @@ public function testReadWithValidateIdOK()
 
     public function testReadWithValidateIdMismatch()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->exactly(2))->method('read')
             ->withConsecutive(['id1'], ['id2'])
             ->will($this->onConsecutiveCalls('data1', 'data2'));
@@ -94,7 +94,7 @@ public function testReadWithValidateIdMismatch()
 
     public function testUpdateTimestamp()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('write')
             ->with('id', 'data')->willReturn(true);
         $proxy = new StrictSessionHandler($handler);
@@ -104,7 +104,7 @@ public function testUpdateTimestamp()
 
     public function testWrite()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('write')
             ->with('id', 'data')->willReturn(true);
         $proxy = new StrictSessionHandler($handler);
@@ -114,7 +114,7 @@ public function testWrite()
 
     public function testWriteEmptyNewSession()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('read')
             ->with('id')->willReturn('');
         $handler->expects($this->never())->method('write');
@@ -128,7 +128,7 @@ public function testWriteEmptyNewSession()
 
     public function testWriteEmptyExistingSession()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('read')
             ->with('id')->willReturn('data');
         $handler->expects($this->never())->method('write');
@@ -141,7 +141,7 @@ public function testWriteEmptyExistingSession()
 
     public function testDestroy()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('destroy')
             ->with('id')->willReturn(true);
         $proxy = new StrictSessionHandler($handler);
@@ -151,7 +151,7 @@ public function testDestroy()
 
     public function testDestroyNewSession()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('read')
             ->with('id')->willReturn('');
         $handler->expects($this->once())->method('destroy')->willReturn(true);
@@ -163,7 +163,7 @@ public function testDestroyNewSession()
 
     public function testDestroyNonEmptyNewSession()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('read')
             ->with('id')->willReturn('');
         $handler->expects($this->once())->method('write')
@@ -179,7 +179,7 @@ public function testDestroyNonEmptyNewSession()
 
     public function testGc()
     {
-        $handler = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $handler = $this->createMock(\SessionHandlerInterface::class);
         $handler->expects($this->once())->method('gc')
             ->with(123)->willReturn(true);
         $proxy = new StrictSessionHandler($handler);

diff --git a/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -36,7 +36,7 @@ class SessionHandlerProxyTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->mock = $this->getMockBuilder(\SessionHandlerInterface::class)->getMock();
+        $this->mock = $this->createMock(\SessionHandlerInterface::class);
         $this->proxy = new SessionHandlerProxy($this->mock);
     }
 
@@ -127,7 +127,7 @@ public function testGc()
      */
     public function testValidateId()
     {
-        $mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();
+        $mock = $this->createMock(TestSessionHandler::class);
         $mock->expects($this->once())
             ->method('validateId');
 
@@ -142,7 +142,7 @@ public function testValidateId()
      */
     public function testUpdateTimestamp()
     {
-        $mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();
+        $mock = $this->createMock(TestSessionHandler::class);
         $mock->expects($this->once())
             ->method('updateTimestamp')
             ->willReturn(false);