Merge branch '4.4' into 5.1

* 4.4: Use createMock() and use import instead of FQCN
symfony · Jan 27, 2021 · 5aed487 · 5aed487
2 parents af3af2b + 3a3ea59
commit 5aed487
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Tests/InstantiatorTest.php b/Tests/InstantiatorTest.php
@@ -12,13 +12,15 @@
 namespace Symfony\Component\VarExporter\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarExporter\Exception\ClassNotFoundException;
+use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
 use Symfony\Component\VarExporter\Instantiator;
 
 class InstantiatorTest extends TestCase
 {
     public function testNotFoundClass()
     {
-        $this->expectException(\Symfony\Component\VarExporter\Exception\ClassNotFoundException::class);
+        $this->expectException(ClassNotFoundException::class);
         $this->expectExceptionMessage('Class "SomeNotExistingClass" not found.');
         Instantiator::instantiate('SomeNotExistingClass');
     }
@@ -28,7 +30,7 @@ public function testNotFoundClass()
      */
     public function testFailingInstantiation(string $class)
     {
-        $this->expectException(\Symfony\Component\VarExporter\Exception\NotInstantiableTypeException::class);
+        $this->expectException(NotInstantiableTypeException::class);
         $this->expectExceptionMessageMatches('/Type ".*" is not instantiable\./');
         Instantiator::instantiate($class);
     }

diff --git a/Tests/VarExporterTest.php b/Tests/VarExporterTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+use Symfony\Component\VarExporter\Exception\ClassNotFoundException;
+use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
 use Symfony\Component\VarExporter\Internal\Registry;
 use Symfony\Component\VarExporter\VarExporter;
 
@@ -22,7 +24,7 @@ class VarExporterTest extends TestCase
 
     public function testPhpIncompleteClassesAreForbidden()
     {
-        $this->expectException(\Symfony\Component\VarExporter\Exception\ClassNotFoundException::class);
+        $this->expectException(ClassNotFoundException::class);
         $this->expectExceptionMessage('Class "SomeNotExistingClass" not found.');
         $unserializeCallback = ini_set('unserialize_callback_func', 'var_dump');
         try {
@@ -37,7 +39,7 @@ public function testPhpIncompleteClassesAreForbidden()
      */
     public function testFailingSerialization($value)
     {
-        $this->expectException(\Symfony\Component\VarExporter\Exception\NotInstantiableTypeException::class);
+        $this->expectException(NotInstantiableTypeException::class);
         $this->expectExceptionMessageMatches('/Type ".*" is not instantiable\./');
         $expectedDump = $this->getDump($value);
         try {