Merge branch '3.2'

nicolas-grekas · nicolas-grekas · commit 9492b28dc409 · 2017-02-18T18:35:19.000+01:00
* 3.2:
  Fix typo in process error message
  Update to PHPUnit namespaces
  Minor typo fix messsagesData -&gt; messagesData
  remove translation data collector when not usable
diff --git a/Tests/Catalogue/AbstractOperationTest.php b/Tests/Catalogue/AbstractOperationTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Catalogue;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\MessageCatalogueInterface;
 
-abstract class AbstractOperationTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractOperationTest extends TestCase
 {
     public function testGetEmptyDomains()
     {
diff --git a/Tests/DataCollector/TranslationDataCollectorTest.php b/Tests/DataCollector/TranslationDataCollectorTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Translation\Tests\DataCollector;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\DataCollectorTranslator;
 use Symfony\Component\Translation\DataCollector\TranslationDataCollector;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 
-class TranslationDataCollectorTest extends \PHPUnit_Framework_TestCase
+class TranslationDataCollectorTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/DataCollectorTranslatorTest.php b/Tests/DataCollectorTranslatorTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Translation\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\DataCollectorTranslator;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 
-class DataCollectorTranslatorTest extends \PHPUnit_Framework_TestCase
+class DataCollectorTranslatorTest extends TestCase
 {
     public function testCollectMessages()
     {
diff --git a/Tests/Dumper/CsvFileDumperTest.php b/Tests/Dumper/CsvFileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\CsvFileDumper;
 
-class CsvFileDumperTest extends \PHPUnit_Framework_TestCase
+class CsvFileDumperTest extends TestCase
 {
     public function testFormatCatalogue()
     {
diff --git a/Tests/Dumper/FileDumperTest.php b/Tests/Dumper/FileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\FileDumper;
 
-class FileDumperTest extends \PHPUnit_Framework_TestCase
+class FileDumperTest extends TestCase
 {
     public function testDump()
     {
diff --git a/Tests/Dumper/IcuResFileDumperTest.php b/Tests/Dumper/IcuResFileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\IcuResFileDumper;
 
-class IcuResFileDumperTest extends \PHPUnit_Framework_TestCase
+class IcuResFileDumperTest extends TestCase
 {
     public function testFormatCatalogue()
     {
diff --git a/Tests/Dumper/IniFileDumperTest.php b/Tests/Dumper/IniFileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\IniFileDumper;
 
-class IniFileDumperTest extends \PHPUnit_Framework_TestCase
+class IniFileDumperTest extends TestCase
 {
     public function testFormatCatalogue()
     {
diff --git a/Tests/Dumper/JsonFileDumperTest.php b/Tests/Dumper/JsonFileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\JsonFileDumper;
 
-class JsonFileDumperTest extends \PHPUnit_Framework_TestCase
+class JsonFileDumperTest extends TestCase
 {
     public function testFormatCatalogue()
     {
diff --git a/Tests/Dumper/MoFileDumperTest.php b/Tests/Dumper/MoFileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\MoFileDumper;
 
-class MoFileDumperTest extends \PHPUnit_Framework_TestCase
+class MoFileDumperTest extends TestCase
 {
     public function testFormatCatalogue()
     {
diff --git a/Tests/Dumper/PhpFileDumperTest.php b/Tests/Dumper/PhpFileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\PhpFileDumper;
 
-class PhpFileDumperTest extends \PHPUnit_Framework_TestCase
+class PhpFileDumperTest extends TestCase
 {
     public function testFormatCatalogue()
     {
diff --git a/Tests/Dumper/PoFileDumperTest.php b/Tests/Dumper/PoFileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\PoFileDumper;
 
-class PoFileDumperTest extends \PHPUnit_Framework_TestCase
+class PoFileDumperTest extends TestCase
 {
     public function testFormatCatalogue()
     {
diff --git a/Tests/Dumper/QtFileDumperTest.php b/Tests/Dumper/QtFileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\QtFileDumper;
 
-class QtFileDumperTest extends \PHPUnit_Framework_TestCase
+class QtFileDumperTest extends TestCase
 {
     public function testFormatCatalogue()
     {
diff --git a/Tests/Dumper/XliffFileDumperTest.php b/Tests/Dumper/XliffFileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\XliffFileDumper;
 
-class XliffFileDumperTest extends \PHPUnit_Framework_TestCase
+class XliffFileDumperTest extends TestCase
 {
     public function testFormatCatalogue()
     {
diff --git a/Tests/Dumper/YamlFileDumperTest.php b/Tests/Dumper/YamlFileDumperTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Dumper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\YamlFileDumper;
 
-class YamlFileDumperTest extends \PHPUnit_Framework_TestCase
+class YamlFileDumperTest extends TestCase
 {
     public function testTreeFormatCatalogue()
     {
diff --git a/Tests/IdentityTranslatorTest.php b/Tests/IdentityTranslatorTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 use Symfony\Component\Translation\IdentityTranslator;
 
-class IdentityTranslatorTest extends \PHPUnit_Framework_TestCase
+class IdentityTranslatorTest extends TestCase
 {
     /**
      * @dataProvider getTransTests
diff --git a/Tests/IntervalTest.php b/Tests/IntervalTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Translation\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Interval;
 
-class IntervalTest extends \PHPUnit_Framework_TestCase
+class IntervalTest extends TestCase
 {
     /**
      * @dataProvider getTests
diff --git a/Tests/Loader/CsvFileLoaderTest.php b/Tests/Loader/CsvFileLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Loader\CsvFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
-class CsvFileLoaderTest extends \PHPUnit_Framework_TestCase
+class CsvFileLoaderTest extends TestCase
 {
     public function testLoad()
     {
diff --git a/Tests/Loader/IniFileLoaderTest.php b/Tests/Loader/IniFileLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Loader\IniFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
-class IniFileLoaderTest extends \PHPUnit_Framework_TestCase
+class IniFileLoaderTest extends TestCase
 {
     public function testLoad()
     {
diff --git a/Tests/Loader/JsonFileLoaderTest.php b/Tests/Loader/JsonFileLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Loader\JsonFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
-class JsonFileLoaderTest extends \PHPUnit_Framework_TestCase
+class JsonFileLoaderTest extends TestCase
 {
     public function testLoad()
     {
diff --git a/Tests/Loader/LocalizedTestCase.php b/Tests/Loader/LocalizedTestCase.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
-abstract class LocalizedTestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+abstract class LocalizedTestCase extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Loader/MoFileLoaderTest.php b/Tests/Loader/MoFileLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Loader\MoFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
-class MoFileLoaderTest extends \PHPUnit_Framework_TestCase
+class MoFileLoaderTest extends TestCase
 {
     public function testLoad()
     {
diff --git a/Tests/Loader/PhpFileLoaderTest.php b/Tests/Loader/PhpFileLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Loader\PhpFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
-class PhpFileLoaderTest extends \PHPUnit_Framework_TestCase
+class PhpFileLoaderTest extends TestCase
 {
     public function testLoad()
     {
diff --git a/Tests/Loader/PoFileLoaderTest.php b/Tests/Loader/PoFileLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Loader\PoFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
-class PoFileLoaderTest extends \PHPUnit_Framework_TestCase
+class PoFileLoaderTest extends TestCase
 {
     public function testLoad()
     {
diff --git a/Tests/Loader/QtFileLoaderTest.php b/Tests/Loader/QtFileLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Loader\QtFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
-class QtFileLoaderTest extends \PHPUnit_Framework_TestCase
+class QtFileLoaderTest extends TestCase
 {
     public function testLoad()
     {
diff --git a/Tests/Loader/XliffFileLoaderTest.php b/Tests/Loader/XliffFileLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Loader\XliffFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
-class XliffFileLoaderTest extends \PHPUnit_Framework_TestCase
+class XliffFileLoaderTest extends TestCase
 {
     public function testLoad()
     {
diff --git a/Tests/Loader/YamlFileLoaderTest.php b/Tests/Loader/YamlFileLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Loader\YamlFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
 
-class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
+class YamlFileLoaderTest extends TestCase
 {
     public function testLoad()
     {
diff --git a/Tests/LoggingTranslatorTest.php b/Tests/LoggingTranslatorTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Translation\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\LoggingTranslator;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 
-class LoggingTranslatorTest extends \PHPUnit_Framework_TestCase
+class LoggingTranslatorTest extends TestCase
 {
     public function testTransWithNoTranslationIsLogged()
     {
diff --git a/Tests/MessageCatalogueTest.php b/Tests/MessageCatalogueTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Translation\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageCatalogue;
 
-class MessageCatalogueTest extends \PHPUnit_Framework_TestCase
+class MessageCatalogueTest extends TestCase
 {
     public function testGetLocale()
     {
diff --git a/Tests/MessageSelectorTest.php b/Tests/MessageSelectorTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Translation\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\MessageSelector;
 
-class MessageSelectorTest extends \PHPUnit_Framework_TestCase
+class MessageSelectorTest extends TestCase
 {
     /**
      * @dataProvider getChooseTests
diff --git a/Tests/PluralizationRulesTest.php b/Tests/PluralizationRulesTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Translation\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\PluralizationRules;
 
 /**
@@ -26,7 +27,7 @@
  *
  * @author Clemens Tolboom clemens@build2be.nl
  */
-class PluralizationRulesTest extends \PHPUnit_Framework_TestCase
+class PluralizationRulesTest extends TestCase
 {
     /**
      * We test failed langcode here.
diff --git a/Tests/TranslatorCacheTest.php b/Tests/TranslatorCacheTest.php
diff --git a/Tests/TranslatorTest.php b/Tests/TranslatorTest.php
diff --git a/Tests/Util/ArrayConverterTest.php b/Tests/Util/ArrayConverterTest.php
diff --git a/Tests/Writer/TranslationWriterTest.php b/Tests/Writer/TranslationWriterTest.php

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,11 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Translation\Tests\Catalogue;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Translation\MessageCatalogue;`
`15`	`16`	`use Symfony\Component\Translation\MessageCatalogueInterface;`
`16`	`17`
`17`		`-abstract class AbstractOperationTest extends \PHPUnit_Framework_TestCase`
	`18`	`+abstract class AbstractOperationTest extends TestCase`
`18`	`19`	`{`
`19`	`20`	`public function testGetEmptyDomains()`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,12 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Translation\Tests\DataCollector;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Translation\DataCollectorTranslator;`
`15`	`16`	`use Symfony\Component\Translation\DataCollector\TranslationDataCollector;`
`16`	`17`	`use Symfony\Component\VarDumper\Cloner\VarCloner;`
`17`	`18`
`18`		`-class TranslationDataCollectorTest extends \PHPUnit_Framework_TestCase`
	`19`	`+class TranslationDataCollectorTest extends TestCase`
`19`	`20`	`{`
`20`	`21`	`protected function setUp()`
`21`	`22`	`{`