From e820e14c369139e697b4ea3cdfe43f2aa1e5b99a Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 31 Jul 2019 21:19:25 +0200 Subject: [PATCH] Make tests support phpunit 8 --- FormErrorIterator.php | 2 +- Test/FormIntegrationTestCase.php | 2 +- ...SetUpTearDownTrait.php => ForwardCompatTestTrait.php} | 4 ++-- Test/TypeTestCase.php | 2 +- Tests/AbstractFormTest.php | 7 +++++-- Tests/AbstractLayoutTest.php | 6 ++++-- Tests/AbstractRequestHandlerTest.php | 5 ++++- Tests/ButtonTest.php | 5 ++++- Tests/ChoiceList/AbstractChoiceListTest.php | 5 ++++- Tests/ChoiceList/ArrayChoiceListTest.php | 5 ++++- Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php | 5 ++++- .../ChoiceList/Factory/DefaultChoiceListFactoryTest.php | 5 ++++- Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php | 5 ++++- Tests/ChoiceList/LazyChoiceListTest.php | 5 ++++- Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php | 7 +++++-- Tests/Console/Descriptor/JsonDescriptorTest.php | 7 +++++-- Tests/Console/Descriptor/TextDescriptorTest.php | 7 +++++-- .../Extension/Core/DataMapper/PropertyPathMapperTest.php | 5 ++++- .../Core/DataTransformer/ArrayToPartsTransformerTest.php | 7 +++++-- .../DataTransformer/BooleanToStringTransformerTest.php | 7 +++++-- .../DataTransformer/ChoiceToValueTransformerTest.php | 7 +++++-- .../DataTransformer/ChoicesToValuesTransformerTest.php | 7 +++++-- .../DateTimeToLocalizedStringTransformerTest.php | 7 +++++-- .../DataTransformer/DateTimeToRfc3339TransformerTest.php | 7 +++++-- .../IntegerToLocalizedStringTransformerTest.php | 7 +++++-- .../MoneyToLocalizedStringTransformerTest.php | 7 +++++-- .../NumberToLocalizedStringTransformerTest.php | 7 +++++-- .../PercentToLocalizedStringTransformerTest.php | 7 +++++-- .../DataTransformer/ValueToDuplicatesTransformerTest.php | 7 +++++-- .../Core/EventListener/MergeCollectionListenerTest.php | 7 +++++-- .../Core/EventListener/ResizeFormListenerTest.php | 7 +++++-- Tests/Extension/Core/Type/ChoiceTypeTest.php | 7 +++++-- Tests/Extension/Core/Type/CountryTypeTest.php | 5 ++++- Tests/Extension/Core/Type/CurrencyTypeTest.php | 5 ++++- Tests/Extension/Core/Type/DateTimeTypeTest.php | 5 ++++- Tests/Extension/Core/Type/DateTypeTest.php | 7 +++++-- Tests/Extension/Core/Type/IntegerTypeTest.php | 5 ++++- Tests/Extension/Core/Type/LanguageTypeTest.php | 5 ++++- Tests/Extension/Core/Type/LocaleTypeTest.php | 5 ++++- Tests/Extension/Core/Type/MoneyTypeTest.php | 7 +++++-- Tests/Extension/Core/Type/NumberTypeTest.php | 7 +++++-- Tests/Extension/Core/Type/RepeatedTypeTest.php | 5 ++++- .../Csrf/EventListener/CsrfValidationListenerTest.php | 7 +++++-- Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php | 7 +++++-- .../DataCollector/DataCollectorExtensionTest.php | 5 ++++- Tests/Extension/DataCollector/FormDataCollectorTest.php | 5 ++++- Tests/Extension/DataCollector/FormDataExtractorTest.php | 4 +++- .../Type/DataCollectorTypeExtensionTest.php | 5 ++++- .../Validator/Constraints/FormValidatorTest.php | 5 ++++- .../Validator/EventListener/ValidationListenerTest.php | 5 ++++- Tests/Extension/Validator/ValidatorTypeGuesserTest.php | 5 ++++- .../Validator/ViolationMapper/ViolationMapperTest.php | 5 ++++- Tests/FormBuilderTest.php | 7 +++++-- Tests/FormFactoryBuilderTest.php | 5 ++++- Tests/FormFactoryTest.php | 5 ++++- Tests/FormRegistryTest.php | 5 ++++- Tests/NativeRequestHandlerTest.php | 9 ++++++--- Tests/ResolvedFormTypeTest.php | 5 ++++- 58 files changed, 246 insertions(+), 86 deletions(-) rename Test/{TestCaseSetUpTearDownTrait.php => ForwardCompatTestTrait.php} (95%) diff --git a/FormErrorIterator.php b/FormErrorIterator.php index db1d311a30..a565d227c2 100644 --- a/FormErrorIterator.php +++ b/FormErrorIterator.php @@ -70,7 +70,7 @@ public function __toString() if ($error instanceof FormError) { $string .= 'ERROR: '.$error->getMessage()."\n"; } else { - /** @var self $error */ + /* @var self $error */ $string .= $error->form->getName().":\n"; $string .= self::indent((string) $error); } diff --git a/Test/FormIntegrationTestCase.php b/Test/FormIntegrationTestCase.php index b50d943779..eabf82d161 100644 --- a/Test/FormIntegrationTestCase.php +++ b/Test/FormIntegrationTestCase.php @@ -20,7 +20,7 @@ */ abstract class FormIntegrationTestCase extends TestCase { - use TestCaseSetUpTearDownTrait; + use ForwardCompatTestTrait; /** * @var FormFactoryInterface diff --git a/Test/TestCaseSetUpTearDownTrait.php b/Test/ForwardCompatTestTrait.php similarity index 95% rename from Test/TestCaseSetUpTearDownTrait.php rename to Test/ForwardCompatTestTrait.php index b44d8212df..756f7d17bf 100644 --- a/Test/TestCaseSetUpTearDownTrait.php +++ b/Test/ForwardCompatTestTrait.php @@ -22,7 +22,7 @@ /** * @internal */ - trait TestCaseSetUpTearDownTrait + trait ForwardCompatTestTrait { private function doSetUp(): void { @@ -47,7 +47,7 @@ protected function tearDown(): void /** * @internal */ - trait TestCaseSetUpTearDownTrait + trait ForwardCompatTestTrait { /** * @return void diff --git a/Test/TypeTestCase.php b/Test/TypeTestCase.php index 19fb5c32a0..d7260c5da1 100644 --- a/Test/TypeTestCase.php +++ b/Test/TypeTestCase.php @@ -17,7 +17,7 @@ abstract class TypeTestCase extends FormIntegrationTestCase { - use TestCaseSetUpTearDownTrait; + use ForwardCompatTestTrait; /** * @var FormBuilder diff --git a/Tests/AbstractFormTest.php b/Tests/AbstractFormTest.php index 00d9e0fbd4..0a3edfee30 100644 --- a/Tests/AbstractFormTest.php +++ b/Tests/AbstractFormTest.php @@ -12,12 +12,15 @@ namespace Symfony\Component\Form\Tests; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\FormBuilder; abstract class AbstractFormTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var EventDispatcherInterface */ @@ -33,14 +36,14 @@ abstract class AbstractFormTest extends TestCase */ protected $form; - protected function setUp() + private function doSetUp() { $this->dispatcher = new EventDispatcher(); $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock(); $this->form = $this->createForm(); } - protected function tearDown() + private function doTearDown() { $this->dispatcher = null; $this->factory = null; diff --git a/Tests/AbstractLayoutTest.php b/Tests/AbstractLayoutTest.php index 4e01253e2e..1309e68039 100644 --- a/Tests/AbstractLayoutTest.php +++ b/Tests/AbstractLayoutTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Csrf\CsrfExtension; use Symfony\Component\Form\FormError; use Symfony\Component\Form\FormView; @@ -18,12 +19,13 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase { + use ForwardCompatTestTrait; use VersionAwareTest; protected $csrfTokenManager; protected $testableFeatures = []; - protected function setUp() + private function doSetUp() { if (!\extension_loaded('intl')) { $this->markTestSkipped('Extension intl is required.'); @@ -43,7 +45,7 @@ protected function getExtensions() ]; } - protected function tearDown() + private function doTearDown() { $this->csrfTokenManager = null; diff --git a/Tests/AbstractRequestHandlerTest.php b/Tests/AbstractRequestHandlerTest.php index f2ee71b342..36126dcb08 100644 --- a/Tests/AbstractRequestHandlerTest.php +++ b/Tests/AbstractRequestHandlerTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper; use Symfony\Component\Form\Form; @@ -26,6 +27,8 @@ */ abstract class AbstractRequestHandlerTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var RequestHandlerInterface */ @@ -40,7 +43,7 @@ abstract class AbstractRequestHandlerTest extends TestCase protected $serverParams; - protected function setUp() + private function doSetUp() { $this->serverParams = $this->getMockBuilder('Symfony\Component\Form\Util\ServerParams')->setMethods(['getNormalizedIniPostMaxSize', 'getContentLength'])->getMock(); $this->requestHandler = $this->getRequestHandler(); diff --git a/Tests/ButtonTest.php b/Tests/ButtonTest.php index 8c1ccec75c..7f4344fe63 100644 --- a/Tests/ButtonTest.php +++ b/Tests/ButtonTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ButtonBuilder; use Symfony\Component\Form\FormBuilder; @@ -20,11 +21,13 @@ */ class ButtonTest extends TestCase { + use ForwardCompatTestTrait; + private $dispatcher; private $factory; - protected function setUp() + private function doSetUp() { $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock(); $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock(); diff --git a/Tests/ChoiceList/AbstractChoiceListTest.php b/Tests/ChoiceList/AbstractChoiceListTest.php index aca967daba..3c5290cd86 100644 --- a/Tests/ChoiceList/AbstractChoiceListTest.php +++ b/Tests/ChoiceList/AbstractChoiceListTest.php @@ -12,12 +12,15 @@ namespace Symfony\Component\Form\Tests\ChoiceList; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; /** * @author Bernhard Schussek */ abstract class AbstractChoiceListTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var \Symfony\Component\Form\ChoiceList\ChoiceListInterface */ @@ -103,7 +106,7 @@ abstract class AbstractChoiceListTest extends TestCase */ protected $key4; - protected function setUp() + private function doSetUp() { parent::setUp(); diff --git a/Tests/ChoiceList/ArrayChoiceListTest.php b/Tests/ChoiceList/ArrayChoiceListTest.php index c71fd75bcf..c6a80f9b63 100644 --- a/Tests/ChoiceList/ArrayChoiceListTest.php +++ b/Tests/ChoiceList/ArrayChoiceListTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\ChoiceList; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\ArrayChoiceList; /** @@ -18,9 +19,11 @@ */ class ArrayChoiceListTest extends AbstractChoiceListTest { + use ForwardCompatTestTrait; + private $object; - protected function setUp() + private function doSetUp() { $this->object = new \stdClass(); diff --git a/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php b/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php index 7277d49780..53540651e5 100644 --- a/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php +++ b/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\ChoiceList\Factory; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator; /** @@ -19,6 +20,8 @@ */ class CachingFactoryDecoratorTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var \PHPUnit_Framework_MockObject_MockObject */ @@ -29,7 +32,7 @@ class CachingFactoryDecoratorTest extends TestCase */ private $factory; - protected function setUp() + private function doSetUp() { $this->decoratedFactory = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface')->getMock(); $this->factory = new CachingFactoryDecorator($this->decoratedFactory); diff --git a/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php b/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php index 5a9884e295..76280d4c5d 100644 --- a/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php +++ b/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\ChoiceList\Factory; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\ArrayChoiceList; use Symfony\Component\Form\ChoiceList\ChoiceListInterface; use Symfony\Component\Form\ChoiceList\Factory\DefaultChoiceListFactory; @@ -22,6 +23,8 @@ class DefaultChoiceListFactoryTest extends TestCase { + use ForwardCompatTestTrait; + private $obj1; private $obj2; @@ -84,7 +87,7 @@ public function getGroupAsObject($object) : new DefaultChoiceListFactoryTest_Castable('Group 2'); } - protected function setUp() + private function doSetUp() { $this->obj1 = (object) ['label' => 'A', 'index' => 'w', 'value' => 'a', 'preferred' => false, 'group' => 'Group 1', 'attr' => []]; $this->obj2 = (object) ['label' => 'B', 'index' => 'x', 'value' => 'b', 'preferred' => true, 'group' => 'Group 1', 'attr' => ['attr1' => 'value1']]; diff --git a/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php b/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php index 42893696db..9e16699a7b 100644 --- a/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php +++ b/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\ChoiceList\Factory; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\Factory\PropertyAccessDecorator; use Symfony\Component\PropertyAccess\PropertyPath; @@ -20,6 +21,8 @@ */ class PropertyAccessDecoratorTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var \PHPUnit_Framework_MockObject_MockObject */ @@ -30,7 +33,7 @@ class PropertyAccessDecoratorTest extends TestCase */ private $factory; - protected function setUp() + private function doSetUp() { $this->decoratedFactory = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface')->getMock(); $this->factory = new PropertyAccessDecorator($this->decoratedFactory); diff --git a/Tests/ChoiceList/LazyChoiceListTest.php b/Tests/ChoiceList/LazyChoiceListTest.php index 6854c43ef7..d6cffc9447 100644 --- a/Tests/ChoiceList/LazyChoiceListTest.php +++ b/Tests/ChoiceList/LazyChoiceListTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\ChoiceList; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\ArrayChoiceList; use Symfony\Component\Form\ChoiceList\LazyChoiceList; @@ -20,6 +21,8 @@ */ class LazyChoiceListTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var LazyChoiceList */ @@ -37,7 +40,7 @@ class LazyChoiceListTest extends TestCase private $value; - protected function setUp() + private function doSetUp() { $this->loadedList = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock(); $this->loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock(); diff --git a/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php b/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php index 362783c91e..ffde233264 100644 --- a/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php +++ b/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\ChoiceList\Loader; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\LazyChoiceList; use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader; @@ -20,6 +21,8 @@ */ class CallbackChoiceLoaderTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var \Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader */ @@ -45,7 +48,7 @@ class CallbackChoiceLoaderTest extends TestCase */ private static $lazyChoiceList; - public static function setUpBeforeClass() + private static function doSetUpBeforeClass() { self::$loader = new CallbackChoiceLoader(function () { return self::$choices; @@ -91,7 +94,7 @@ public function testLoadValuesForChoicesLoadsChoiceListOnFirstCall() ); } - public static function tearDownAfterClass() + private static function doTearDownAfterClass() { self::$loader = null; self::$value = null; diff --git a/Tests/Console/Descriptor/JsonDescriptorTest.php b/Tests/Console/Descriptor/JsonDescriptorTest.php index fb339f6b47..b8e8dd1b95 100644 --- a/Tests/Console/Descriptor/JsonDescriptorTest.php +++ b/Tests/Console/Descriptor/JsonDescriptorTest.php @@ -11,16 +11,19 @@ namespace Symfony\Component\Form\Tests\Console\Descriptor; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Console\Descriptor\JsonDescriptor; class JsonDescriptorTest extends AbstractDescriptorTest { - protected function setUp() + use ForwardCompatTestTrait; + + private function doSetUp() { putenv('COLUMNS=121'); } - protected function tearDown() + private function doTearDown() { putenv('COLUMNS'); } diff --git a/Tests/Console/Descriptor/TextDescriptorTest.php b/Tests/Console/Descriptor/TextDescriptorTest.php index 053f7e4512..c361874e82 100644 --- a/Tests/Console/Descriptor/TextDescriptorTest.php +++ b/Tests/Console/Descriptor/TextDescriptorTest.php @@ -11,16 +11,19 @@ namespace Symfony\Component\Form\Tests\Console\Descriptor; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Console\Descriptor\TextDescriptor; class TextDescriptorTest extends AbstractDescriptorTest { - protected function setUp() + use ForwardCompatTestTrait; + + private function doSetUp() { putenv('COLUMNS=121'); } - protected function tearDown() + private function doTearDown() { putenv('COLUMNS'); } diff --git a/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php b/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php index da351295c3..80017a0ffb 100644 --- a/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php +++ b/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataMapper; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper; @@ -23,6 +24,8 @@ class PropertyPathMapperTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var PropertyPathMapper */ @@ -38,7 +41,7 @@ class PropertyPathMapperTest extends TestCase */ private $propertyAccessor; - protected function setUp() + private function doSetUp() { $this->dispatcher = new EventDispatcher(); $this->propertyAccessor = PropertyAccess::createPropertyAccessor(); diff --git a/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php b/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php index 4f11c7f796..09b81fc5e1 100644 --- a/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php @@ -12,13 +12,16 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Core\DataTransformer\ArrayToPartsTransformer; class ArrayToPartsTransformerTest extends TestCase { + use ForwardCompatTestTrait; + private $transformer; - protected function setUp() + private function doSetUp() { $this->transformer = new ArrayToPartsTransformer([ 'first' => ['a', 'b', 'c'], @@ -26,7 +29,7 @@ protected function setUp() ]); } - protected function tearDown() + private function doTearDown() { $this->transformer = null; } diff --git a/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php index 5195092e18..5c1582eb04 100644 --- a/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Core\DataTransformer\BooleanToStringTransformer; class BooleanToStringTransformerTest extends TestCase { + use ForwardCompatTestTrait; + const TRUE_VALUE = '1'; /** @@ -23,12 +26,12 @@ class BooleanToStringTransformerTest extends TestCase */ protected $transformer; - protected function setUp() + private function doSetUp() { $this->transformer = new BooleanToStringTransformer(self::TRUE_VALUE); } - protected function tearDown() + private function doTearDown() { $this->transformer = null; } diff --git a/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php b/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php index da41a89729..37d383490f 100644 --- a/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php @@ -12,15 +12,18 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\ArrayChoiceList; use Symfony\Component\Form\Extension\Core\DataTransformer\ChoiceToValueTransformer; class ChoiceToValueTransformerTest extends TestCase { + use ForwardCompatTestTrait; + protected $transformer; protected $transformerWithNull; - protected function setUp() + private function doSetUp() { $list = new ArrayChoiceList(['', false, 'X', true]); $listWithNull = new ArrayChoiceList(['', false, 'X', null]); @@ -29,7 +32,7 @@ protected function setUp() $this->transformerWithNull = new ChoiceToValueTransformer($listWithNull); } - protected function tearDown() + private function doTearDown() { $this->transformer = null; $this->transformerWithNull = null; diff --git a/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php b/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php index 9e7a666ba8..e741a3e11f 100644 --- a/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php @@ -12,15 +12,18 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\ArrayChoiceList; use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToValuesTransformer; class ChoicesToValuesTransformerTest extends TestCase { + use ForwardCompatTestTrait; + protected $transformer; protected $transformerWithNull; - protected function setUp() + private function doSetUp() { $list = new ArrayChoiceList(['', false, 'X']); $listWithNull = new ArrayChoiceList(['', false, 'X', null]); @@ -29,7 +32,7 @@ protected function setUp() $this->transformerWithNull = new ChoicesToValuesTransformer($listWithNull); } - protected function tearDown() + private function doTearDown() { $this->transformer = null; $this->transformerWithNull = null; diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php index d2feb116bf..ec73a64950 100644 --- a/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php @@ -12,18 +12,21 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer; use Symfony\Component\Form\Tests\Extension\Core\DataTransformer\Traits\DateTimeEqualsTrait; use Symfony\Component\Intl\Util\IntlTestHelper; class DateTimeToLocalizedStringTransformerTest extends TestCase { + use ForwardCompatTestTrait; + use DateTimeEqualsTrait; protected $dateTime; protected $dateTimeWithoutSeconds; - protected function setUp() + private function doSetUp() { parent::setUp(); @@ -36,7 +39,7 @@ protected function setUp() $this->dateTimeWithoutSeconds = new \DateTime('2010-02-03 04:05:00 UTC'); } - protected function tearDown() + private function doTearDown() { $this->dateTime = null; $this->dateTimeWithoutSeconds = null; diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php index 773f00d713..ec251d8f35 100644 --- a/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php @@ -12,17 +12,20 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToRfc3339Transformer; use Symfony\Component\Form\Tests\Extension\Core\DataTransformer\Traits\DateTimeEqualsTrait; class DateTimeToRfc3339TransformerTest extends TestCase { + use ForwardCompatTestTrait; + use DateTimeEqualsTrait; protected $dateTime; protected $dateTimeWithoutSeconds; - protected function setUp() + private function doSetUp() { parent::setUp(); @@ -30,7 +33,7 @@ protected function setUp() $this->dateTimeWithoutSeconds = new \DateTime('2010-02-03 04:05:00 UTC'); } - protected function tearDown() + private function doTearDown() { $this->dateTime = null; $this->dateTimeWithoutSeconds = null; diff --git a/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php index f918434715..c7b60d1e57 100644 --- a/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php @@ -12,20 +12,23 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer; use Symfony\Component\Intl\Util\IntlTestHelper; class IntegerToLocalizedStringTransformerTest extends TestCase { + use ForwardCompatTestTrait; + private $defaultLocale; - protected function setUp() + private function doSetUp() { $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('en'); } - protected function tearDown() + private function doTearDown() { \Locale::setDefault($this->defaultLocale); } diff --git a/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php index c5bffe4d96..c7f61705f9 100644 --- a/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php @@ -12,19 +12,22 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer; use Symfony\Component\Intl\Util\IntlTestHelper; class MoneyToLocalizedStringTransformerTest extends TestCase { + use ForwardCompatTestTrait; + private $previousLocale; - protected function setUp() + private function doSetUp() { $this->previousLocale = setlocale(LC_ALL, '0'); } - protected function tearDown() + private function doTearDown() { setlocale(LC_ALL, $this->previousLocale); } diff --git a/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php index 9baad43549..fd3f570d4c 100644 --- a/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php @@ -12,20 +12,23 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer; use Symfony\Component\Intl\Util\IntlTestHelper; class NumberToLocalizedStringTransformerTest extends TestCase { + use ForwardCompatTestTrait; + private $defaultLocale; - protected function setUp() + private function doSetUp() { $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('en'); } - protected function tearDown() + private function doTearDown() { \Locale::setDefault($this->defaultLocale); } diff --git a/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php index f726edcda4..e9bfa87043 100644 --- a/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php @@ -12,20 +12,23 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer; use Symfony\Component\Intl\Util\IntlTestHelper; class PercentToLocalizedStringTransformerTest extends TestCase { + use ForwardCompatTestTrait; + private $defaultLocale; - protected function setUp() + private function doSetUp() { $this->defaultLocale = \Locale::getDefault(); \Locale::setDefault('en'); } - protected function tearDown() + private function doTearDown() { \Locale::setDefault($this->defaultLocale); } diff --git a/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php b/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php index 3ef681da66..179ace5a6c 100644 --- a/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php +++ b/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php @@ -12,18 +12,21 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Core\DataTransformer\ValueToDuplicatesTransformer; class ValueToDuplicatesTransformerTest extends TestCase { + use ForwardCompatTestTrait; + private $transformer; - protected function setUp() + private function doSetUp() { $this->transformer = new ValueToDuplicatesTransformer(['a', 'b', 'c']); } - protected function tearDown() + private function doTearDown() { $this->transformer = null; } diff --git a/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php b/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php index 8c691dffc1..daf5d60d37 100644 --- a/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php +++ b/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php @@ -12,19 +12,22 @@ namespace Symfony\Component\Form\Tests\Extension\Core\EventListener; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Core\EventListener\MergeCollectionListener; use Symfony\Component\Form\FormEvent; abstract class MergeCollectionListenerTest extends TestCase { + use ForwardCompatTestTrait; + protected $form; - protected function setUp() + private function doSetUp() { $this->form = $this->getForm('axes'); } - protected function tearDown() + private function doTearDown() { $this->form = null; } diff --git a/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php index ae7d2db467..a1775efe9f 100644 --- a/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php +++ b/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php @@ -13,6 +13,7 @@ use Doctrine\Common\Collections\ArrayCollection; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper; use Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener; @@ -23,10 +24,12 @@ class ResizeFormListenerTest extends TestCase { + use ForwardCompatTestTrait; + private $factory; private $form; - protected function setUp() + private function doSetUp() { $this->factory = (new FormFactoryBuilder())->getFormFactory(); $this->form = $this->getBuilder() @@ -35,7 +38,7 @@ protected function setUp() ->getForm(); } - protected function tearDown() + private function doTearDown() { $this->factory = null; $this->form = null; diff --git a/Tests/Extension/Core/Type/ChoiceTypeTest.php b/Tests/Extension/Core/Type/ChoiceTypeTest.php index bb7cc0ca7f..544f4442f1 100644 --- a/Tests/Extension/Core/Type/ChoiceTypeTest.php +++ b/Tests/Extension/Core/Type/ChoiceTypeTest.php @@ -11,11 +11,14 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView; use Symfony\Component\Form\ChoiceList\View\ChoiceView; class ChoiceTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ChoiceType'; private $choices = [ @@ -60,7 +63,7 @@ class ChoiceTypeTest extends BaseTypeTest ], ]; - protected function setUp() + private function doSetUp() { parent::setUp(); @@ -73,7 +76,7 @@ protected function setUp() ]; } - protected function tearDown() + private function doTearDown() { parent::tearDown(); diff --git a/Tests/Extension/Core/Type/CountryTypeTest.php b/Tests/Extension/Core/Type/CountryTypeTest.php index 96fce79f21..641f355de7 100644 --- a/Tests/Extension/Core/Type/CountryTypeTest.php +++ b/Tests/Extension/Core/Type/CountryTypeTest.php @@ -11,15 +11,18 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\View\ChoiceView; use Symfony\Component\Form\Extension\Core\Type\CountryType; use Symfony\Component\Intl\Util\IntlTestHelper; class CountryTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CountryType'; - protected function setUp() + private function doSetUp() { IntlTestHelper::requireIntl($this, false); diff --git a/Tests/Extension/Core/Type/CurrencyTypeTest.php b/Tests/Extension/Core/Type/CurrencyTypeTest.php index ae8c960cc1..afbae0d7bf 100644 --- a/Tests/Extension/Core/Type/CurrencyTypeTest.php +++ b/Tests/Extension/Core/Type/CurrencyTypeTest.php @@ -11,15 +11,18 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\View\ChoiceView; use Symfony\Component\Form\Extension\Core\Type\CurrencyType; use Symfony\Component\Intl\Util\IntlTestHelper; class CurrencyTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CurrencyType'; - protected function setUp() + private function doSetUp() { IntlTestHelper::requireIntl($this, false); diff --git a/Tests/Extension/Core/Type/DateTimeTypeTest.php b/Tests/Extension/Core/Type/DateTimeTypeTest.php index e3f3b729d3..c1d5726122 100644 --- a/Tests/Extension/Core/Type/DateTimeTypeTest.php +++ b/Tests/Extension/Core/Type/DateTimeTypeTest.php @@ -11,13 +11,16 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\FormError; class DateTimeTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateTimeType'; - protected function setUp() + private function doSetUp() { \Locale::setDefault('en'); diff --git a/Tests/Extension/Core/Type/DateTypeTest.php b/Tests/Extension/Core/Type/DateTypeTest.php index 31dfc65af0..6e9059d2cd 100644 --- a/Tests/Extension/Core/Type/DateTypeTest.php +++ b/Tests/Extension/Core/Type/DateTypeTest.php @@ -11,25 +11,28 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\View\ChoiceView; use Symfony\Component\Form\FormError; use Symfony\Component\Intl\Util\IntlTestHelper; class DateTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateType'; private $defaultTimezone; private $defaultLocale; - protected function setUp() + private function doSetUp() { parent::setUp(); $this->defaultTimezone = date_default_timezone_get(); $this->defaultLocale = \Locale::getDefault(); } - protected function tearDown() + private function doTearDown() { date_default_timezone_set($this->defaultTimezone); \Locale::setDefault($this->defaultLocale); diff --git a/Tests/Extension/Core/Type/IntegerTypeTest.php b/Tests/Extension/Core/Type/IntegerTypeTest.php index c5c7dd9161..7c3868990b 100644 --- a/Tests/Extension/Core/Type/IntegerTypeTest.php +++ b/Tests/Extension/Core/Type/IntegerTypeTest.php @@ -11,13 +11,16 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Intl\Util\IntlTestHelper; class IntegerTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\IntegerType'; - protected function setUp() + private function doSetUp() { IntlTestHelper::requireIntl($this, false); diff --git a/Tests/Extension/Core/Type/LanguageTypeTest.php b/Tests/Extension/Core/Type/LanguageTypeTest.php index 60614a9717..08f9c57bdf 100644 --- a/Tests/Extension/Core/Type/LanguageTypeTest.php +++ b/Tests/Extension/Core/Type/LanguageTypeTest.php @@ -11,15 +11,18 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\View\ChoiceView; use Symfony\Component\Form\Extension\Core\Type\LanguageType; use Symfony\Component\Intl\Util\IntlTestHelper; class LanguageTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\LanguageType'; - protected function setUp() + private function doSetUp() { IntlTestHelper::requireIntl($this, false); diff --git a/Tests/Extension/Core/Type/LocaleTypeTest.php b/Tests/Extension/Core/Type/LocaleTypeTest.php index 59cdc13547..6aead799cc 100644 --- a/Tests/Extension/Core/Type/LocaleTypeTest.php +++ b/Tests/Extension/Core/Type/LocaleTypeTest.php @@ -11,15 +11,18 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ChoiceList\View\ChoiceView; use Symfony\Component\Form\Extension\Core\Type\LocaleType; use Symfony\Component\Intl\Util\IntlTestHelper; class LocaleTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\LocaleType'; - protected function setUp() + private function doSetUp() { IntlTestHelper::requireIntl($this, false); diff --git a/Tests/Extension/Core/Type/MoneyTypeTest.php b/Tests/Extension/Core/Type/MoneyTypeTest.php index 34576ec630..7dacb03a09 100644 --- a/Tests/Extension/Core/Type/MoneyTypeTest.php +++ b/Tests/Extension/Core/Type/MoneyTypeTest.php @@ -11,15 +11,18 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Intl\Util\IntlTestHelper; class MoneyTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\MoneyType'; private $defaultLocale; - protected function setUp() + private function doSetUp() { // we test against different locales, so we need the full // implementation @@ -30,7 +33,7 @@ protected function setUp() $this->defaultLocale = \Locale::getDefault(); } - protected function tearDown() + private function doTearDown() { parent::tearDown(); diff --git a/Tests/Extension/Core/Type/NumberTypeTest.php b/Tests/Extension/Core/Type/NumberTypeTest.php index 9cc2893c66..c66ec0cc10 100644 --- a/Tests/Extension/Core/Type/NumberTypeTest.php +++ b/Tests/Extension/Core/Type/NumberTypeTest.php @@ -11,15 +11,18 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Intl\Util\IntlTestHelper; class NumberTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\NumberType'; private $defaultLocale; - protected function setUp() + private function doSetUp() { parent::setUp(); @@ -30,7 +33,7 @@ protected function setUp() \Locale::setDefault('de_DE'); } - protected function tearDown() + private function doTearDown() { parent::tearDown(); diff --git a/Tests/Extension/Core/Type/RepeatedTypeTest.php b/Tests/Extension/Core/Type/RepeatedTypeTest.php index c380c0590b..de99a9b9f1 100644 --- a/Tests/Extension/Core/Type/RepeatedTypeTest.php +++ b/Tests/Extension/Core/Type/RepeatedTypeTest.php @@ -11,10 +11,13 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Form; class RepeatedTypeTest extends BaseTypeTest { + use ForwardCompatTestTrait; + const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\RepeatedType'; /** @@ -22,7 +25,7 @@ class RepeatedTypeTest extends BaseTypeTest */ protected $form; - protected function setUp() + private function doSetUp() { parent::setUp(); diff --git a/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php b/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php index 5876b092b9..ff7be6b1f9 100644 --- a/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php +++ b/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\Extension\Csrf\EventListener; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper; use Symfony\Component\Form\Extension\Csrf\EventListener\CsrfValidationListener; @@ -22,12 +23,14 @@ class CsrfValidationListenerTest extends TestCase { + use ForwardCompatTestTrait; + protected $dispatcher; protected $factory; protected $tokenManager; protected $form; - protected function setUp() + private function doSetUp() { $this->dispatcher = new EventDispatcher(); $this->factory = (new FormFactoryBuilder())->getFormFactory(); @@ -37,7 +40,7 @@ protected function setUp() ->getForm(); } - protected function tearDown() + private function doTearDown() { $this->dispatcher = null; $this->factory = null; diff --git a/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php b/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php index 665b700479..d36fd38aad 100644 --- a/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php +++ b/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Csrf\Type; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Csrf\CsrfExtension; use Symfony\Component\Form\FormBuilderInterface; @@ -30,6 +31,8 @@ public function buildForm(FormBuilderInterface $builder, array $options) class FormTypeCsrfExtensionTest extends TypeTestCase { + use ForwardCompatTestTrait; + /** * @var \PHPUnit_Framework_MockObject_MockObject */ @@ -40,7 +43,7 @@ class FormTypeCsrfExtensionTest extends TypeTestCase */ protected $translator; - protected function setUp() + private function doSetUp() { $this->tokenManager = $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock(); $this->translator = $this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock(); @@ -48,7 +51,7 @@ protected function setUp() parent::setUp(); } - protected function tearDown() + private function doTearDown() { $this->tokenManager = null; $this->translator = null; diff --git a/Tests/Extension/DataCollector/DataCollectorExtensionTest.php b/Tests/Extension/DataCollector/DataCollectorExtensionTest.php index da84a5b436..72c32904b1 100644 --- a/Tests/Extension/DataCollector/DataCollectorExtensionTest.php +++ b/Tests/Extension/DataCollector/DataCollectorExtensionTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Form\Tests\Extension\DataCollector; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\DataCollector\DataCollectorExtension; class DataCollectorExtensionTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var DataCollectorExtension */ @@ -26,7 +29,7 @@ class DataCollectorExtensionTest extends TestCase */ private $dataCollector; - protected function setUp() + private function doSetUp() { $this->dataCollector = $this->getMockBuilder('Symfony\Component\Form\Extension\DataCollector\FormDataCollectorInterface')->getMock(); $this->extension = new DataCollectorExtension($this->dataCollector); diff --git a/Tests/Extension/DataCollector/FormDataCollectorTest.php b/Tests/Extension/DataCollector/FormDataCollectorTest.php index 83d44167d5..8e2e579d66 100644 --- a/Tests/Extension/DataCollector/FormDataCollectorTest.php +++ b/Tests/Extension/DataCollector/FormDataCollectorTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\Extension\DataCollector; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\DataCollector\FormDataCollector; use Symfony\Component\Form\Form; use Symfony\Component\Form\FormBuilder; @@ -19,6 +20,8 @@ class FormDataCollectorTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var \PHPUnit_Framework_MockObject_MockObject */ @@ -64,7 +67,7 @@ class FormDataCollectorTest extends TestCase */ private $childView; - protected function setUp() + private function doSetUp() { $this->dataExtractor = $this->getMockBuilder('Symfony\Component\Form\Extension\DataCollector\FormDataExtractorInterface')->getMock(); $this->dataCollector = new FormDataCollector($this->dataExtractor); diff --git a/Tests/Extension/DataCollector/FormDataExtractorTest.php b/Tests/Extension/DataCollector/FormDataExtractorTest.php index 860a96abcd..5d8faf7bd0 100644 --- a/Tests/Extension/DataCollector/FormDataExtractorTest.php +++ b/Tests/Extension/DataCollector/FormDataExtractorTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\Extension\DataCollector; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\CallbackTransformer; use Symfony\Component\Form\Exception\TransformationFailedException; use Symfony\Component\Form\Extension\DataCollector\FormDataExtractor; @@ -27,6 +28,7 @@ */ class FormDataExtractorTest extends TestCase { + use ForwardCompatTestTrait; use VarDumperTestTrait; /** @@ -44,7 +46,7 @@ class FormDataExtractorTest extends TestCase */ private $factory; - protected function setUp() + private function doSetUp() { $this->dataExtractor = new FormDataExtractor(); $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock(); diff --git a/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php b/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php index 35f38fc53a..f5d0750b37 100644 --- a/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php +++ b/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php @@ -12,10 +12,13 @@ namespace Symfony\Component\Form\Tests\Extension\DataCollector\Type; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\DataCollector\Type\DataCollectorTypeExtension; class DataCollectorTypeExtensionTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var DataCollectorTypeExtension */ @@ -26,7 +29,7 @@ class DataCollectorTypeExtensionTest extends TestCase */ private $dataCollector; - protected function setUp() + private function doSetUp() { $this->dataCollector = $this->getMockBuilder('Symfony\Component\Form\Extension\DataCollector\FormDataCollectorInterface')->getMock(); $this->extension = new DataCollectorTypeExtension($this->dataCollector); diff --git a/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/Tests/Extension/Validator/Constraints/FormValidatorTest.php index 8a8af9ed68..a36961ed47 100644 --- a/Tests/Extension/Validator/Constraints/FormValidatorTest.php +++ b/Tests/Extension/Validator/Constraints/FormValidatorTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Validator\Constraints; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\CallbackTransformer; @@ -38,6 +39,8 @@ */ class FormValidatorTest extends ConstraintValidatorTestCase { + use ForwardCompatTestTrait; + /** * @var EventDispatcherInterface */ @@ -48,7 +51,7 @@ class FormValidatorTest extends ConstraintValidatorTestCase */ private $factory; - protected function setUp() + private function doSetUp() { $this->dispatcher = new EventDispatcher(); $this->factory = (new FormFactoryBuilder())->getFormFactory(); diff --git a/Tests/Extension/Validator/EventListener/ValidationListenerTest.php b/Tests/Extension/Validator/EventListener/ValidationListenerTest.php index 76bc07b2ee..b1848ac9a4 100644 --- a/Tests/Extension/Validator/EventListener/ValidationListenerTest.php +++ b/Tests/Extension/Validator/EventListener/ValidationListenerTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\Extension\Validator\EventListener; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper; @@ -32,6 +33,8 @@ class ValidationListenerTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var EventDispatcherInterface */ @@ -58,7 +61,7 @@ class ValidationListenerTest extends TestCase private $params; - protected function setUp() + private function doSetUp() { $this->dispatcher = new EventDispatcher(); $this->factory = (new FormFactoryBuilder())->getFormFactory(); diff --git a/Tests/Extension/Validator/ValidatorTypeGuesserTest.php b/Tests/Extension/Validator/ValidatorTypeGuesserTest.php index 878bbfad21..3f657c3643 100644 --- a/Tests/Extension/Validator/ValidatorTypeGuesserTest.php +++ b/Tests/Extension/Validator/ValidatorTypeGuesserTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\Extension\Validator; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser; use Symfony\Component\Form\Guess\Guess; use Symfony\Component\Form\Guess\ValueGuess; @@ -32,6 +33,8 @@ */ class ValidatorTypeGuesserTest extends TestCase { + use ForwardCompatTestTrait; + const TEST_CLASS = 'Symfony\Component\Form\Tests\Extension\Validator\ValidatorTypeGuesserTest_TestClass'; const TEST_PROPERTY = 'property'; @@ -51,7 +54,7 @@ class ValidatorTypeGuesserTest extends TestCase */ private $metadataFactory; - protected function setUp() + private function doSetUp() { $this->metadata = new ClassMetadata(self::TEST_CLASS); $this->metadataFactory = new FakeMetadataFactory(); diff --git a/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php index 2fa3e92892..7f7e9cd527 100644 --- a/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php +++ b/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\Extension\Validator\ViolationMapper; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\CallbackTransformer; @@ -31,6 +32,8 @@ */ class ViolationMapperTest extends TestCase { + use ForwardCompatTestTrait; + const LEVEL_0 = 0; const LEVEL_1 = 1; const LEVEL_1B = 2; @@ -61,7 +64,7 @@ class ViolationMapperTest extends TestCase */ private $params; - protected function setUp() + private function doSetUp() { $this->dispatcher = new EventDispatcher(); $this->mapper = new ViolationMapper(); diff --git a/Tests/FormBuilderTest.php b/Tests/FormBuilderTest.php index 1247a80bbd..4bf4a6dad9 100644 --- a/Tests/FormBuilderTest.php +++ b/Tests/FormBuilderTest.php @@ -12,24 +12,27 @@ namespace Symfony\Component\Form\Tests; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\ButtonBuilder; use Symfony\Component\Form\FormBuilder; use Symfony\Component\Form\SubmitButtonBuilder; class FormBuilderTest extends TestCase { + use ForwardCompatTestTrait; + private $dispatcher; private $factory; private $builder; - protected function setUp() + private function doSetUp() { $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock(); $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock(); $this->builder = new FormBuilder('name', null, $this->dispatcher, $this->factory); } - protected function tearDown() + private function doTearDown() { $this->dispatcher = null; $this->factory = null; diff --git a/Tests/FormFactoryBuilderTest.php b/Tests/FormFactoryBuilderTest.php index 3e66ce8c38..12d5d3a671 100644 --- a/Tests/FormFactoryBuilderTest.php +++ b/Tests/FormFactoryBuilderTest.php @@ -12,16 +12,19 @@ namespace Symfony\Component\Form\Tests; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\FormFactoryBuilder; use Symfony\Component\Form\Tests\Fixtures\FooType; class FormFactoryBuilderTest extends TestCase { + use ForwardCompatTestTrait; + private $registry; private $guesser; private $type; - protected function setUp() + private function doSetUp() { $factory = new \ReflectionClass('Symfony\Component\Form\FormFactory'); $this->registry = $factory->getProperty('registry'); diff --git a/Tests/FormFactoryTest.php b/Tests/FormFactoryTest.php index 4426310676..965485cf2c 100644 --- a/Tests/FormFactoryTest.php +++ b/Tests/FormFactoryTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\FormFactory; use Symfony\Component\Form\FormTypeGuesserChain; use Symfony\Component\Form\Guess\Guess; @@ -23,6 +24,8 @@ */ class FormFactoryTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var \PHPUnit_Framework_MockObject_MockObject */ @@ -48,7 +51,7 @@ class FormFactoryTest extends TestCase */ private $factory; - protected function setUp() + private function doSetUp() { $this->guesser1 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock(); $this->guesser2 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock(); diff --git a/Tests/FormRegistryTest.php b/Tests/FormRegistryTest.php index e4dee5da8a..8d72db3391 100644 --- a/Tests/FormRegistryTest.php +++ b/Tests/FormRegistryTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\FormRegistry; use Symfony\Component\Form\FormTypeGuesserChain; use Symfony\Component\Form\ResolvedFormType; @@ -31,6 +32,8 @@ */ class FormRegistryTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var FormRegistry */ @@ -61,7 +64,7 @@ class FormRegistryTest extends TestCase */ private $extension2; - protected function setUp() + private function doSetUp() { $this->resolvedTypeFactory = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeFactory')->getMock(); $this->guesser1 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock(); diff --git a/Tests/NativeRequestHandlerTest.php b/Tests/NativeRequestHandlerTest.php index 36638a124f..ab66904617 100644 --- a/Tests/NativeRequestHandlerTest.php +++ b/Tests/NativeRequestHandlerTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\NativeRequestHandler; /** @@ -18,14 +19,16 @@ */ class NativeRequestHandlerTest extends AbstractRequestHandlerTest { + use ForwardCompatTestTrait; + private static $serverBackup; - public static function setUpBeforeClass() + private static function doSetUpBeforeClass() { self::$serverBackup = $_SERVER; } - protected function setUp() + private function doSetUp() { parent::setUp(); @@ -38,7 +41,7 @@ protected function setUp() ]; } - protected function tearDown() + private function doTearDown() { parent::tearDown(); diff --git a/Tests/ResolvedFormTypeTest.php b/Tests/ResolvedFormTypeTest.php index ba078ad1fd..b424f2fc55 100644 --- a/Tests/ResolvedFormTypeTest.php +++ b/Tests/ResolvedFormTypeTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests; use PHPUnit\Framework\TestCase; +use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Form\Form; use Symfony\Component\Form\FormConfigInterface; use Symfony\Component\Form\FormTypeExtensionInterface; @@ -24,6 +25,8 @@ */ class ResolvedFormTypeTest extends TestCase { + use ForwardCompatTestTrait; + /** * @var \PHPUnit_Framework_MockObject_MockObject */ @@ -69,7 +72,7 @@ class ResolvedFormTypeTest extends TestCase */ private $resolvedType; - protected function setUp() + private function doSetUp() { $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock(); $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();