Make tests support phpunit 8

symfony · Jul 31, 2019 · e820e14 · e820e14
1 parent 4e4e1eb
commit e820e14
Show file tree

Hide file tree

Showing 58 changed files with 246 additions and 86 deletions.
diff --git 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
@@ -20,7 +20,7 @@
  */
 abstract class FormIntegrationTestCase extends TestCase
 {
-    use TestCaseSetUpTearDownTrait;
+    use ForwardCompatTestTrait;
 
     /**
      * @var FormFactoryInterface

diff --git a/Test/TestCaseSetUpTearDownTrait.php → Test/ForwardCompatTestTrait.php b/Test/TestCaseSetUpTearDownTrait.php → 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
@@ -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
@@ -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
@@ -11,19 +11,21 @@
 
 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;
 use Symfony\Component\Form\Test\FormIntegrationTestCase;
 
 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
@@ -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
@@ -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
@@ -12,12 +12,15 @@
 namespace Symfony\Component\Form\Tests\ChoiceList;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
 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
@@ -11,16 +11,19 @@
 
 namespace Symfony\Component\Form\Tests\ChoiceList;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
 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
@@ -12,13 +12,16 @@
 namespace Symfony\Component\Form\Tests\ChoiceList\Factory;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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');
     }