Remove use of ForwardCompatTrait

Author: jderusse

Tests/Collator/CollatorTest.php

@@ -11,14 +11,11 @@
 
 namespace Symfony\Component\Intl\Tests\Collator;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Collator\Collator;
 use Symfony\Component\Intl\Globals\IntlGlobals;
 
 class CollatorTest extends AbstractCollatorTest
 {
-    use ForwardCompatTestTrait;
-
     public function testConstructorWithUnsupportedLocale()
     {
         $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');

Tests/Collator/Verification/CollatorTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Intl\Tests\Collator\Verification;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Tests\Collator\AbstractCollatorTest;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
@@ -23,9 +22,7 @@
  */
 class CollatorTest extends AbstractCollatorTest
 {
-    use ForwardCompatTestTrait;
-
-    private function doSetUp()
+    protected function setUp()
     {
         IntlTestHelper::requireFullIntl($this, false);
 

Tests/Data/Bundle/Reader/BundleEntryReaderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
 use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 
@@ -21,8 +20,6 @@
  */
 class BundleEntryReaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     const RES_DIR = '/res/dir';
 
     /**
@@ -64,7 +61,7 @@ class BundleEntryReaderTest extends TestCase
         'Foo' => 'Bar',
     ];
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->readerImpl = $this->getMockBuilder('Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface')->getMock();
         $this->reader = new BundleEntryReader($this->readerImpl);

Tests/Data/Bundle/Reader/IntlBundleReaderTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Bundle\Reader\IntlBundleReader;
 
 /**
@@ -21,14 +20,12 @@
  */
 class IntlBundleReaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var IntlBundleReader
      */
     private $reader;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->reader = new IntlBundleReader();
     }

Tests/Data/Bundle/Reader/JsonBundleReaderTest.php

@@ -12,22 +12,19 @@
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Bundle\Reader\JsonBundleReader;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
 class JsonBundleReaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var JsonBundleReader
      */
     private $reader;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->reader = new JsonBundleReader();
     }

Tests/Data/Bundle/Reader/PhpBundleReaderTest.php

@@ -12,22 +12,19 @@
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Bundle\Reader\PhpBundleReader;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
 class PhpBundleReaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var PhpBundleReader
      */
     private $reader;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->reader = new PhpBundleReader();
     }

Tests/Data/Bundle/Writer/JsonBundleWriterTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Writer;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Intl\Data\Bundle\Writer\JsonBundleWriter;
 
@@ -21,8 +20,6 @@
  */
 class JsonBundleWriterTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var JsonBundleWriter
      */
@@ -35,7 +32,7 @@ class JsonBundleWriterTest extends TestCase
      */
     private $filesystem;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->writer = new JsonBundleWriter();
         $this->directory = sys_get_temp_dir().'/JsonBundleWriterTest/'.mt_rand(1000, 9999);
@@ -44,7 +41,7 @@ private function doSetUp()
         $this->filesystem->mkdir($this->directory);
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         $this->filesystem->remove($this->directory);
     }

Tests/Data/Bundle/Writer/PhpBundleWriterTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Writer;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Intl\Data\Bundle\Writer\PhpBundleWriter;
 
@@ -21,8 +20,6 @@
  */
 class PhpBundleWriterTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var PhpBundleWriter
      */
@@ -35,7 +32,7 @@ class PhpBundleWriterTest extends TestCase
      */
     private $filesystem;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->writer = new PhpBundleWriter();
         $this->directory = sys_get_temp_dir().'/PhpBundleWriterTest/'.mt_rand(1000, 9999);
@@ -44,7 +41,7 @@ private function doSetUp()
         $this->filesystem->mkdir($this->directory);
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         $this->filesystem->remove($this->directory);
     }

Tests/Data/Bundle/Writer/TextBundleWriterTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Writer;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Intl\Data\Bundle\Writer\TextBundleWriter;
 
@@ -23,8 +22,6 @@
  */
 class TextBundleWriterTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var TextBundleWriter
      */
@@ -37,7 +34,7 @@ class TextBundleWriterTest extends TestCase
      */
     private $filesystem;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->writer = new TextBundleWriter();
         $this->directory = sys_get_temp_dir().'/TextBundleWriterTest/'.mt_rand(1000, 9999);
@@ -46,7 +43,7 @@ private function doSetUp()
         $this->filesystem->mkdir($this->directory);
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         $this->filesystem->remove($this->directory);
     }

Tests/Data/Provider/AbstractCurrencyDataProviderTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Provider;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Provider\CurrencyDataProvider;
 use Symfony\Component\Intl\Intl;
 
@@ -20,8 +19,6 @@
  */
 abstract class AbstractCurrencyDataProviderTest extends AbstractDataProviderTest
 {
-    use ForwardCompatTestTrait;
-
     // The below arrays document the state of the ICU data bundled with this package.
 
     protected static $currencies = [
@@ -593,7 +590,7 @@ abstract class AbstractCurrencyDataProviderTest extends AbstractDataProviderTest
      */
     protected $dataProvider;
 
-    private function doSetUp()
+    protected function setUp()
     {
         parent::setUp();