Use createMock() and use import instead of FQCN

OskarStark · nicolas-grekas · commit e1d0c67167a5 · 2021-01-27T10:09:26.000+01:00
diff --git a/Tests/DataCollector/TranslationDataCollectorTest.php b/Tests/DataCollector/TranslationDataCollectorTest.php
@@ -12,14 +12,15 @@
 namespace Symfony\Component\Translation\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\DataCollector\DataCollector;
 use Symfony\Component\Translation\DataCollector\TranslationDataCollector;
 use Symfony\Component\Translation\DataCollectorTranslator;
 
 class TranslationDataCollectorTest extends TestCase
 {
     protected function setUp(): void
     {
-        if (!class_exists(\Symfony\Component\HttpKernel\DataCollector\DataCollector::class)) {
+        if (!class_exists(DataCollector::class)) {
             $this->markTestSkipped('The "DataCollector" is not available');
         }
     }
diff --git a/Tests/DependencyInjection/TranslationExtractorPassTest.php b/Tests/DependencyInjection/TranslationExtractorPassTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Translation\DependencyInjection\TranslationExtractorPass;
 
@@ -48,7 +49,7 @@ public function testProcessNoDefinitionFound()
 
     public function testProcessMissingAlias()
     {
-        $this->expectException(\Symfony\Component\DependencyInjection\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('The alias for the tag "translation.extractor" of service "foo.id" must be set.');
         $container = new ContainerBuilder();
         $container->register('translation.extractor');
diff --git a/Tests/IntervalTest.php b/Tests/IntervalTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Translation\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\Exception\InvalidArgumentException;
 use Symfony\Component\Translation\Interval;
 
 /**
@@ -29,7 +30,7 @@ public function testTest($expected, $number, $interval)
 
     public function testTestException()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         Interval::test(1, 'foobar');
     }
 
diff --git a/Tests/Loader/CsvFileLoaderTest.php b/Tests/Loader/CsvFileLoaderTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Exception\InvalidResourceException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\CsvFileLoader;
 
 class CsvFileLoaderTest extends TestCase
@@ -41,15 +43,15 @@ public function testLoadDoesNothingIfEmpty()
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new CsvFileLoader();
         $resource = __DIR__.'/../fixtures/not-exists.csv';
         $loader->load($resource, 'en', 'domain1');
     }
 
     public function testLoadNonLocalResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new CsvFileLoader();
         $resource = 'http://example.com/resources.csv';
         $loader->load($resource, 'en', 'domain1');
diff --git a/Tests/Loader/IcuDatFileLoaderTest.php b/Tests/Loader/IcuDatFileLoaderTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Exception\InvalidResourceException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\IcuDatFileLoader;
 
 /**
@@ -21,7 +23,7 @@ class IcuDatFileLoaderTest extends LocalizedTestCase
 {
     public function testLoadInvalidResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new IcuDatFileLoader();
         $loader->load(__DIR__.'/../fixtures/resourcebundle/corrupted/resources', 'es', 'domain2');
     }
@@ -53,7 +55,7 @@ public function testDatFrenchLoad()
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new IcuDatFileLoader();
         $loader->load(__DIR__.'/../fixtures/non-existing.txt', 'en', 'domain1');
     }
diff --git a/Tests/Loader/IcuResFileLoaderTest.php b/Tests/Loader/IcuResFileLoaderTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use Symfony\Component\Config\Resource\DirectoryResource;
+use Symfony\Component\Translation\Exception\InvalidResourceException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\IcuResFileLoader;
 
 /**
@@ -33,14 +35,14 @@ public function testLoad()
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new IcuResFileLoader();
         $loader->load(__DIR__.'/../fixtures/non-existing.txt', 'en', 'domain1');
     }
 
     public function testLoadInvalidResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new IcuResFileLoader();
         $loader->load(__DIR__.'/../fixtures/resourcebundle/corrupted', 'en', 'domain1');
     }
diff --git a/Tests/Loader/IniFileLoaderTest.php b/Tests/Loader/IniFileLoaderTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\IniFileLoader;
 
 class IniFileLoaderTest extends TestCase
@@ -41,7 +42,7 @@ public function testLoadDoesNothingIfEmpty()
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new IniFileLoader();
         $resource = __DIR__.'/../fixtures/non-existing.ini';
         $loader->load($resource, 'en', 'domain1');
diff --git a/Tests/Loader/JsonFileLoaderTest.php b/Tests/Loader/JsonFileLoaderTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Exception\InvalidResourceException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\JsonFileLoader;
 
 class JsonFileLoaderTest extends TestCase
@@ -41,15 +43,15 @@ public function testLoadDoesNothingIfEmpty()
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new JsonFileLoader();
         $resource = __DIR__.'/../fixtures/non-existing.json';
         $loader->load($resource, 'en', 'domain1');
     }
 
     public function testParseException()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $this->expectExceptionMessage('Error parsing JSON: Syntax error, malformed JSON');
         $loader = new JsonFileLoader();
         $resource = __DIR__.'/../fixtures/malformed.json';
diff --git a/Tests/Loader/MoFileLoaderTest.php b/Tests/Loader/MoFileLoaderTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Exception\InvalidResourceException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\MoFileLoader;
 
 class MoFileLoaderTest extends TestCase
@@ -44,15 +46,15 @@ public function testLoadPlurals()
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new MoFileLoader();
         $resource = __DIR__.'/../fixtures/non-existing.mo';
         $loader->load($resource, 'en', 'domain1');
     }
 
     public function testLoadInvalidResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new MoFileLoader();
         $resource = __DIR__.'/../fixtures/empty.mo';
         $loader->load($resource, 'en', 'domain1');
diff --git a/Tests/Loader/PhpFileLoaderTest.php b/Tests/Loader/PhpFileLoaderTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Exception\InvalidResourceException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\PhpFileLoader;
 
 class PhpFileLoaderTest extends TestCase
@@ -30,15 +32,15 @@ public function testLoad()
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new PhpFileLoader();
         $resource = __DIR__.'/../fixtures/non-existing.php';
         $loader->load($resource, 'en', 'domain1');
     }
 
     public function testLoadThrowsAnExceptionIfFileNotLocal()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new PhpFileLoader();
         $resource = 'http://example.com/resources.php';
         $loader->load($resource, 'en', 'domain1');
diff --git a/Tests/Loader/PoFileLoaderTest.php b/Tests/Loader/PoFileLoaderTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\PoFileLoader;
 
 class PoFileLoaderTest extends TestCase
@@ -55,7 +56,7 @@ public function testLoadDoesNothingIfEmpty()
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new PoFileLoader();
         $resource = __DIR__.'/../fixtures/non-existing.po';
         $loader->load($resource, 'en', 'domain1');
diff --git a/Tests/Loader/QtFileLoaderTest.php b/Tests/Loader/QtFileLoaderTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Exception\InvalidResourceException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\QtFileLoader;
 
 class QtFileLoaderTest extends TestCase
@@ -34,23 +36,23 @@ public function testLoad()
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new QtFileLoader();
         $resource = __DIR__.'/../fixtures/non-existing.ts';
         $loader->load($resource, 'en', 'domain1');
     }
 
     public function testLoadNonLocalResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new QtFileLoader();
         $resource = 'http://domain1.com/resources.ts';
         $loader->load($resource, 'en', 'domain1');
     }
 
     public function testLoadInvalidResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new QtFileLoader();
         $resource = __DIR__.'/../fixtures/invalid-xml-resources.xlf';
         $loader->load($resource, 'en', 'domain1');
@@ -61,7 +63,7 @@ public function testLoadEmptyResource()
         $loader = new QtFileLoader();
         $resource = __DIR__.'/../fixtures/empty.xlf';
 
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $this->expectExceptionMessage(sprintf('Unable to load "%s".', $resource));
 
         $loader->load($resource, 'en', 'domain1');
diff --git a/Tests/Loader/XliffFileLoaderTest.php b/Tests/Loader/XliffFileLoaderTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Exception\InvalidResourceException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\XliffFileLoader;
 
 class XliffFileLoaderTest extends TestCase
@@ -112,37 +114,37 @@ public function testTargetAttributesAreStoredCorrectly()
 
     public function testLoadInvalidResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new XliffFileLoader();
         $loader->load(__DIR__.'/../fixtures/resources.php', 'en', 'domain1');
     }
 
     public function testLoadResourceDoesNotValidate()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new XliffFileLoader();
         $loader->load(__DIR__.'/../fixtures/non-valid.xlf', 'en', 'domain1');
     }
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new XliffFileLoader();
         $resource = __DIR__.'/../fixtures/non-existing.xlf';
         $loader->load($resource, 'en', 'domain1');
     }
 
     public function testLoadThrowsAnExceptionIfFileNotLocal()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new XliffFileLoader();
         $resource = 'http://example.com/resources.xlf';
         $loader->load($resource, 'en', 'domain1');
     }
 
     public function testDocTypeIsNotAllowed()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $this->expectExceptionMessage('Document types are not allowed.');
         $loader = new XliffFileLoader();
         $loader->load(__DIR__.'/../fixtures/withdoctype.xlf', 'en', 'domain1');
@@ -153,7 +155,7 @@ public function testParseEmptyFile()
         $loader = new XliffFileLoader();
         $resource = __DIR__.'/../fixtures/empty.xlf';
 
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $this->expectExceptionMessage(sprintf('Unable to load "%s":', $resource));
 
         $loader->load($resource, 'en', 'domain1');
diff --git a/Tests/Loader/YamlFileLoaderTest.php b/Tests/Loader/YamlFileLoaderTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Exception\InvalidResourceException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Loader\YamlFileLoader;
 
 class YamlFileLoaderTest extends TestCase
@@ -41,23 +43,23 @@ public function testLoadDoesNothingIfEmpty()
 
     public function testLoadNonExistingResource()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);
+        $this->expectException(NotFoundResourceException::class);
         $loader = new YamlFileLoader();
         $resource = __DIR__.'/../fixtures/non-existing.yml';
         $loader->load($resource, 'en', 'domain1');
     }
 
     public function testLoadThrowsAnExceptionIfFileNotLocal()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new YamlFileLoader();
         $resource = 'http://example.com/resources.yml';
         $loader->load($resource, 'en', 'domain1');
     }
 
     public function testLoadThrowsAnExceptionIfNotAnArray()
     {
-        $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);
+        $this->expectException(InvalidResourceException::class);
         $loader = new YamlFileLoader();
         $resource = __DIR__.'/../fixtures/non-valid.yml';
         $loader->load($resource, 'en', 'domain1');
diff --git a/Tests/LoggingTranslatorTest.php b/Tests/LoggingTranslatorTest.php
diff --git a/Tests/MessageCatalogueTest.php b/Tests/MessageCatalogueTest.php
diff --git a/Tests/MessageSelectorTest.php b/Tests/MessageSelectorTest.php
diff --git a/Tests/TranslatorCacheTest.php b/Tests/TranslatorCacheTest.php
diff --git a/Tests/TranslatorTest.php b/Tests/TranslatorTest.php
diff --git a/Tests/Writer/TranslationWriterTest.php b/Tests/Writer/TranslationWriterTest.php

Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,15 @@`
`12`	`12`	`namespace Symfony\Component\Translation\Tests\DataCollector;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Component\HttpKernel\DataCollector\DataCollector;`
`15`	`16`	`use Symfony\Component\Translation\DataCollector\TranslationDataCollector;`
`16`	`17`	`use Symfony\Component\Translation\DataCollectorTranslator;`
`17`	`18`
`18`	`19`	`class TranslationDataCollectorTest extends TestCase`
`19`	`20`	`{`
`20`	`21`	`protected function setUp(): void`
`21`	`22`	`{`
`22`		`- if (!class_exists(\Symfony\Component\HttpKernel\DataCollector\DataCollector::class)) {`
	`23`	`+ if (!class_exists(DataCollector::class)) {`
`23`	`24`	`$this->markTestSkipped('The "DataCollector" is not available');`
`24`	`25`	`}`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Translation\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Component\Translation\Exception\InvalidArgumentException;`
`15`	`16`	`use Symfony\Component\Translation\Interval;`
`16`	`17`
`17`	`18`	`/**`
`@@ -29,7 +30,7 @@ public function testTest($expected, $number, $interval)`
`29`	`30`
`30`	`31`	`public function testTestException()`
`31`	`32`	`{`
`32`		`- $this->expectException(\Symfony\Component\Translation\Exception\InvalidArgumentException::class);`
	`33`	`+ $this->expectException(InvalidArgumentException::class);`
`33`	`34`	`Interval::test(1, 'foobar');`
`34`	`35`	`}`
`35`	`36`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`namespace Symfony\Component\Translation\Tests\Loader;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Config\Resource\FileResource;`
	`15`	`+use Symfony\Component\Translation\Exception\InvalidResourceException;`
	`16`	`+use Symfony\Component\Translation\Exception\NotFoundResourceException;`
`15`	`17`	`use Symfony\Component\Translation\Loader\IcuDatFileLoader;`
`16`	`18`
`17`	`19`	`/**`
`@@ -21,7 +23,7 @@ class IcuDatFileLoaderTest extends LocalizedTestCase`
`21`	`23`	`{`
`22`	`24`	`public function testLoadInvalidResource()`
`23`	`25`	`{`
`24`		`- $this->expectException(\Symfony\Component\Translation\Exception\InvalidResourceException::class);`
	`26`	`+ $this->expectException(InvalidResourceException::class);`
`25`	`27`	`$loader = new IcuDatFileLoader();`
`26`	`28`	`$loader->load(__DIR__.'/../fixtures/resourcebundle/corrupted/resources', 'es', 'domain2');`
`27`	`29`	`}`
`@@ -53,7 +55,7 @@ public function testDatFrenchLoad()`
`53`	`55`
`54`	`56`	`public function testLoadNonExistingResource()`
`55`	`57`	`{`
`56`		`- $this->expectException(\Symfony\Component\Translation\Exception\NotFoundResourceException::class);`
	`58`	`+ $this->expectException(NotFoundResourceException::class);`
`57`	`59`	`$loader = new IcuDatFileLoader();`
`58`	`60`	`$loader->load(__DIR__.'/../fixtures/non-existing.txt', 'en', 'domain1');`
`59`	`61`	`}`