Merge branch '4.4' into 5.1

* 4.4:
  Use createMock() and use import instead of FQCN

Author: nicolas-grekas

Tests/Caster/PdoCasterTest.php

@@ -12,6 +12,8 @@
 namespace Symfony\Component\VarDumper\Tests\Caster;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\ConstStub;
+use Symfony\Component\VarDumper\Caster\EnumStub;
 use Symfony\Component\VarDumper\Caster\PdoCaster;
 use Symfony\Component\VarDumper\Cloner\Stub;
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
@@ -34,10 +36,10 @@ public function testCastPdo()
 
         $cast = PdoCaster::castPdo($pdo, [], new Stub(), false);
 
-        $this->assertInstanceOf(\Symfony\Component\VarDumper\Caster\EnumStub::class, $cast["\0~\0attributes"]);
+        $this->assertInstanceOf(EnumStub::class, $cast["\0~\0attributes"]);
 
         $attr = $cast["\0~\0attributes"] = $cast["\0~\0attributes"]->value;
-        $this->assertInstanceOf(\Symfony\Component\VarDumper\Caster\ConstStub::class, $attr['CASE']);
+        $this->assertInstanceOf(ConstStub::class, $attr['CASE']);
         $this->assertSame('NATURAL', $attr['CASE']->class);
         $this->assertSame('BOTH', $attr['DEFAULT_FETCH_MODE']->class);
 

Tests/Dumper/ServerDumperTest.php

@@ -25,7 +25,7 @@ class ServerDumperTest extends TestCase
 
     public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable()
     {
-        $wrappedDumper = $this->getMockBuilder(DataDumperInterface::class)->getMock();
+        $wrappedDumper = $this->createMock(DataDumperInterface::class);
 
         $dumper = new ServerDumper(self::VAR_DUMPER_SERVER, $wrappedDumper);
 
@@ -39,7 +39,7 @@ public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable()
 
     public function testDump()
     {
-        $wrappedDumper = $this->getMockBuilder(DataDumperInterface::class)->getMock();
+        $wrappedDumper = $this->createMock(DataDumperInterface::class);
         $wrappedDumper->expects($this->never())->method('dump'); // test wrapped dumper is not used
 
         $cloner = new VarCloner();