Merge branch '2.7' into 2.8

* 2.7:
  Update to PHPUnit namespaces
  remove translation data collector when not usable

Author: nicolas-grekas

Test/FormIntegrationTestCase.php

@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Form\Test;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Forms;
 use Symfony\Component\Form\FormFactoryInterface;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
-abstract class FormIntegrationTestCase extends \PHPUnit_Framework_TestCase
+abstract class FormIntegrationTestCase extends TestCase
 {
     /**
      * @var FormFactoryInterface

Tests/AbstractExtensionTest.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Form\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\AbstractExtension;
 use Symfony\Component\Form\Tests\Fixtures\FooType;
 
-class AbstractExtensionTest extends \PHPUnit_Framework_TestCase
+class AbstractExtensionTest extends TestCase
 {
     public function testHasType()
     {

Tests/AbstractFormTest.php

@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Form\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
-abstract class AbstractFormTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractFormTest extends TestCase
 {
     /**
      * @var EventDispatcherInterface

Tests/AbstractRequestHandlerTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Form\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormFactory;
 use Symfony\Component\Form\Forms;
@@ -19,7 +20,7 @@
 /**
  * @author Bernhard Schussek <[email protected]>
  */
-abstract class AbstractRequestHandlerTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractRequestHandlerTest extends TestCase
 {
     /**
      * @var RequestHandlerInterface

Tests/ButtonBuilderTest.php

@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Form\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ButtonBuilder;
 
 /**
  * @author Alexander Cheprasov <[email protected]>
  */
-class ButtonBuilderTest extends \PHPUnit_Framework_TestCase
+class ButtonBuilderTest extends TestCase
 {
     public function getValidNames()
     {

Tests/ButtonTest.php

@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Form\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ButtonBuilder;
 use Symfony\Component\Form\FormBuilder;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
-class ButtonTest extends \PHPUnit_Framework_TestCase
+class ButtonTest extends TestCase
 {
     private $dispatcher;
 

Tests/CallbackTransformerTest.php

@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Form\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\CallbackTransformer;
 
-class CallbackTransformerTest extends \PHPUnit_Framework_TestCase
+class CallbackTransformerTest extends TestCase
 {
     public function testTransform()
     {

Tests/ChoiceList/AbstractChoiceListTest.php

@@ -11,10 +11,12 @@
 
 namespace Symfony\Component\Form\Tests\ChoiceList;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @author Bernhard Schussek <[email protected]>
  */
-abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractChoiceListTest extends TestCase
 {
     /**
      * @var \Symfony\Component\Form\ChoiceList\ChoiceListInterface

Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php

@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Form\Tests\ChoiceList\Factory;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
-class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
+class CachingFactoryDecoratorTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Form\Tests\ChoiceList\Factory;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\ChoiceList\Factory\DefaultChoiceListFactory;
@@ -21,7 +22,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\Extension\Core\View\ChoiceView as LegacyChoiceView;
 
-class DefaultChoiceListFactoryTest extends \PHPUnit_Framework_TestCase
+class DefaultChoiceListFactoryTest extends TestCase
 {
     private $obj1;
 

Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php

@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Form\Tests\ChoiceList\Factory;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ChoiceList\Factory\PropertyAccessDecorator;
 use Symfony\Component\PropertyAccess\PropertyPath;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
-class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
+class PropertyAccessDecoratorTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject

Tests/ChoiceList/LazyChoiceListTest.php

@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Form\Tests\ChoiceList;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ChoiceList\LazyChoiceList;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
-class LazyChoiceListTest extends \PHPUnit_Framework_TestCase
+class LazyChoiceListTest extends TestCase
 {
     /**
      * @var LazyChoiceList

Tests/ChoiceList/LegacyChoiceListAdapterTest.php

@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Form\Tests\ChoiceList;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ChoiceList\LegacyChoiceListAdapter;
 use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  * @group legacy
  */
-class LegacyChoiceListAdapterTest extends \PHPUnit_Framework_TestCase
+class LegacyChoiceListAdapterTest extends TestCase
 {
     /**
      * @var LegacyChoiceListAdapter

Tests/CompoundFormTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Form\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
 use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
 use Symfony\Component\Form\FormError;
@@ -945,7 +946,7 @@ public function testCreateViewWithChildren()
 
         $assertChildViewsEqual = function (array $childViews) use ($test) {
             return function (FormView $view) use ($test, $childViews) {
-                /* @var \PHPUnit_Framework_TestCase $test */
+                /* @var TestCase $test */
                 $test->assertSame($childViews, $view->children);
             };
         };

Tests/Extension/Core/ChoiceList/AbstractChoiceListTest.php

@@ -11,12 +11,14 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\ChoiceList;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @author Bernhard Schussek <[email protected]>
  *
  * @group legacy
  */
-abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractChoiceListTest extends TestCase
 {
     /**
      * @var \Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface

Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\ChoiceList;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
 use Symfony\Component\Form\Tests\Extension\Core\ChoiceList\Fixtures\LazyChoiceListImpl;
@@ -19,7 +20,7 @@
 /**
  * @group legacy
  */
-class LazyChoiceListTest extends \PHPUnit_Framework_TestCase
+class LazyChoiceListTest extends TestCase
 {
     /**
      * @var LazyChoiceListImpl

Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php

@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataMapper;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\FormConfigBuilder;
 use Symfony\Component\Form\FormConfigInterface;
 use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
 
-class PropertyPathMapperTest extends \PHPUnit_Framework_TestCase
+class PropertyPathMapperTest extends TestCase
 {
     /**
      * @var PropertyPathMapper

Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php

@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\DataTransformer\ArrayToPartsTransformer;
 
-class ArrayToPartsTransformerTest extends \PHPUnit_Framework_TestCase
+class ArrayToPartsTransformerTest extends TestCase
 {
     private $transformer;
 

Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
-class BaseDateTimeTransformerTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class BaseDateTimeTransformerTest extends TestCase
 {
     /**
      * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException

Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php

@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\DataTransformer\BooleanToStringTransformer;
 
-class BooleanToStringTransformerTest extends \PHPUnit_Framework_TestCase
+class BooleanToStringTransformerTest extends TestCase
 {
     const TRUE_VALUE = '1';
 

Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\Extension\Core\DataTransformer\ChoiceToValueTransformer;
 
-class ChoiceToValueTransformerTest extends \PHPUnit_Framework_TestCase
+class ChoiceToValueTransformerTest extends TestCase
 {
     protected $transformer;
     protected $transformerWithNull;

Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToValuesTransformer;
 
-class ChoicesToValuesTransformerTest extends \PHPUnit_Framework_TestCase
+class ChoicesToValuesTransformerTest extends TestCase
 {
     protected $transformer;
     protected $transformerWithNull;

Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php

@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DataTransformerChain;
 
-class DataTransformerChainTest extends \PHPUnit_Framework_TestCase
+class DataTransformerChainTest extends TestCase
 {
     public function testTransform()
     {

Tests/Extension/Core/DataTransformer/DateTimeTestCase.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
-abstract class DateTimeTestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+abstract class DateTimeTestCase extends TestCase
 {
     public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
     {

Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class IntegerToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
+class IntegerToLocalizedStringTransformerTest extends TestCase
 {
     protected function setUp()
     {

Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class MoneyToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
+class MoneyToLocalizedStringTransformerTest extends TestCase
 {
     public function testTransform()
     {

Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class NumberToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
+class NumberToLocalizedStringTransformerTest extends TestCase
 {
     protected function setUp()
     {

Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class PercentToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
+class PercentToLocalizedStringTransformerTest extends TestCase
 {
     protected function setUp()
     {