Make tests support phpunit 8

nicolas-grekas · nicolas-grekas · commit 557753d708dd · 2019-07-31T23:55:24.000+02:00
diff --git a/Tests/Collator/Verification/CollatorTest.php b/Tests/Collator/Verification/CollatorTest.php
@@ -11,6 +11,7 @@
 
 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;
 
@@ -22,7 +23,9 @@
  */
 class CollatorTest extends AbstractCollatorTest
 {
-    protected function setUp()
+    use ForwardCompatTestTrait;
+
+    private function doSetUp()
     {
         IntlTestHelper::requireFullIntl($this, false);
 
diff --git a/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php b/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
@@ -12,6 +12,7 @@
 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;
 
@@ -20,6 +21,8 @@
  */
 class BundleEntryReaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     const RES_DIR = '/res/dir';
 
     /**
@@ -61,7 +64,7 @@ class BundleEntryReaderTest extends TestCase
         'Foo' => 'Bar',
     ];
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->readerImpl = $this->getMockBuilder('Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface')->getMock();
         $this->reader = new BundleEntryReader($this->readerImpl);
diff --git a/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php b/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php
@@ -12,6 +12,7 @@
 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;
 
 /**
@@ -20,12 +21,14 @@
  */
 class IntlBundleReaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var IntlBundleReader
      */
     private $reader;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->reader = new IntlBundleReader();
     }
diff --git a/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php b/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php
@@ -12,19 +12,22 @@
 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 <bschussek@gmail.com>
  */
 class JsonBundleReaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var JsonBundleReader
      */
     private $reader;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->reader = new JsonBundleReader();
     }
diff --git a/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php b/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php
@@ -12,19 +12,22 @@
 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 <bschussek@gmail.com>
  */
 class PhpBundleReaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var PhpBundleReader
      */
     private $reader;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->reader = new PhpBundleReader();
     }
diff --git a/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php b/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php
@@ -12,6 +12,7 @@
 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;
 
@@ -20,6 +21,8 @@
  */
 class JsonBundleWriterTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var JsonBundleWriter
      */
@@ -32,7 +35,7 @@ class JsonBundleWriterTest extends TestCase
      */
     private $filesystem;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->writer = new JsonBundleWriter();
         $this->directory = sys_get_temp_dir().'/JsonBundleWriterTest/'.mt_rand(1000, 9999);
@@ -41,7 +44,7 @@ protected function setUp()
         $this->filesystem->mkdir($this->directory);
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         $this->filesystem->remove($this->directory);
     }
diff --git a/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php b/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
@@ -12,6 +12,7 @@
 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;
 
@@ -20,6 +21,8 @@
  */
 class PhpBundleWriterTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var PhpBundleWriter
      */
@@ -32,7 +35,7 @@ class PhpBundleWriterTest extends TestCase
      */
     private $filesystem;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->writer = new PhpBundleWriter();
         $this->directory = sys_get_temp_dir().'/PhpBundleWriterTest/'.mt_rand(1000, 9999);
@@ -41,7 +44,7 @@ protected function setUp()
         $this->filesystem->mkdir($this->directory);
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         $this->filesystem->remove($this->directory);
     }
diff --git a/Tests/Data/Bundle/Writer/TextBundleWriterTest.php b/Tests/Data/Bundle/Writer/TextBundleWriterTest.php
@@ -12,6 +12,7 @@
 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;
 
@@ -22,6 +23,8 @@
  */
 class TextBundleWriterTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var TextBundleWriter
      */
@@ -34,7 +37,7 @@ class TextBundleWriterTest extends TestCase
      */
     private $filesystem;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->writer = new TextBundleWriter();
         $this->directory = sys_get_temp_dir().'/TextBundleWriterTest/'.mt_rand(1000, 9999);
@@ -43,7 +46,7 @@ protected function setUp()
         $this->filesystem->mkdir($this->directory);
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         $this->filesystem->remove($this->directory);
     }
diff --git a/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php b/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Provider;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Provider\CurrencyDataProvider;
 use Symfony\Component\Intl\Intl;
 
@@ -19,6 +20,8 @@
  */
 abstract class AbstractCurrencyDataProviderTest extends AbstractDataProviderTest
 {
+    use ForwardCompatTestTrait;
+
     // The below arrays document the state of the ICU data bundled with this package.
 
     protected static $currencies = [
@@ -590,7 +593,7 @@ abstract class AbstractCurrencyDataProviderTest extends AbstractDataProviderTest
      */
     protected $dataProvider;
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
diff --git a/Tests/Data/Provider/AbstractDataProviderTest.php b/Tests/Data/Provider/AbstractDataProviderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Intl\Tests\Data\Provider;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
 use Symfony\Component\Intl\Locale;
@@ -21,6 +22,8 @@
  */
 abstract class AbstractDataProviderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     // Include the locales statically so that the data providers are decoupled
     // from the Intl class. Otherwise tests will fail if the intl extension is
     // not loaded, because it is NOT possible to skip the execution of data
@@ -701,7 +704,7 @@ abstract class AbstractDataProviderTest extends TestCase
 
     private static $rootLocales;
 
-    protected function setUp()
+    private function doSetUp()
     {
         \Locale::setDefault('en');
         Locale::setDefaultFallback('en');
diff --git a/Tests/Data/Provider/AbstractLanguageDataProviderTest.php b/Tests/Data/Provider/AbstractLanguageDataProviderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Provider;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Provider\LanguageDataProvider;
 use Symfony\Component\Intl\Intl;
 
@@ -19,6 +20,8 @@
  */
 abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
 {
+    use ForwardCompatTestTrait;
+
     // The below arrays document the state of the ICU data bundled with this package.
 
     protected static $languages = [
@@ -832,7 +835,7 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
      */
     protected $dataProvider;
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
diff --git a/Tests/Data/Provider/AbstractLocaleDataProviderTest.php b/Tests/Data/Provider/AbstractLocaleDataProviderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Provider;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Provider\LocaleDataProvider;
 use Symfony\Component\Intl\Intl;
 
@@ -19,12 +20,14 @@
  */
 abstract class AbstractLocaleDataProviderTest extends AbstractDataProviderTest
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var LocaleDataProvider
      */
     protected $dataProvider;
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
diff --git a/Tests/Data/Provider/AbstractRegionDataProviderTest.php b/Tests/Data/Provider/AbstractRegionDataProviderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Provider;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Provider\RegionDataProvider;
 use Symfony\Component\Intl\Intl;
 
@@ -19,6 +20,8 @@
  */
 abstract class AbstractRegionDataProviderTest extends AbstractDataProviderTest
 {
+    use ForwardCompatTestTrait;
+
     // The below arrays document the state of the ICU data bundled with this package.
 
     protected static $territories = [
@@ -284,7 +287,7 @@ abstract class AbstractRegionDataProviderTest extends AbstractDataProviderTest
      */
     protected $dataProvider;
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
diff --git a/Tests/Data/Provider/AbstractScriptDataProviderTest.php b/Tests/Data/Provider/AbstractScriptDataProviderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Provider;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Data\Provider\ScriptDataProvider;
 use Symfony\Component\Intl\Intl;
 
@@ -20,6 +21,8 @@
  */
 abstract class AbstractScriptDataProviderTest extends AbstractDataProviderTest
 {
+    use ForwardCompatTestTrait;
+
     // The below arrays document the state of the ICU data bundled with this package.
 
     protected static $scripts = [
@@ -220,7 +223,7 @@ abstract class AbstractScriptDataProviderTest extends AbstractDataProviderTest
      */
     protected $dataProvider;
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
diff --git a/Tests/Data/Util/LocaleScannerTest.php b/Tests/Data/Util/LocaleScannerTest.php
diff --git a/Tests/Data/Util/RingBufferTest.php b/Tests/Data/Util/RingBufferTest.php
diff --git a/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
diff --git a/Tests/DateFormatter/Verification/IntlDateFormatterTest.php b/Tests/DateFormatter/Verification/IntlDateFormatterTest.php
diff --git a/Tests/Globals/Verification/IntlGlobalsTest.php b/Tests/Globals/Verification/IntlGlobalsTest.php
diff --git a/Tests/Locale/Verification/LocaleTest.php b/Tests/Locale/Verification/LocaleTest.php
diff --git a/Tests/NumberFormatter/Verification/NumberFormatterTest.php b/Tests/NumberFormatter/Verification/NumberFormatterTest.php

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Intl\Tests\Collator\Verification;`
`13`	`13`
	`14`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`14`	`15`	`use Symfony\Component\Intl\Tests\Collator\AbstractCollatorTest;`
`15`	`16`	`use Symfony\Component\Intl\Util\IntlTestHelper;`
`16`	`17`
`@@ -22,7 +23,9 @@`
`22`	`23`	`*/`
`23`	`24`	`class CollatorTest extends AbstractCollatorTest`
`24`	`25`	`{`
`25`		`- protected function setUp()`
	`26`	`+ use ForwardCompatTestTrait;`
	`27`	`+`
	`28`	`+ private function doSetUp()`
`26`	`29`	`{`
`27`	`30`	`IntlTestHelper::requireFullIntl($this, false);`
`28`	`31`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Intl\Tests\Data\Bundle\Writer;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\Filesystem\Filesystem;`
`16`	`17`	`use Symfony\Component\Intl\Data\Bundle\Writer\JsonBundleWriter;`
`17`	`18`
`@@ -20,6 +21,8 @@`
`20`	`21`	`*/`
`21`	`22`	`class JsonBundleWriterTest extends TestCase`
`22`	`23`	`{`
	`24`	`+ use ForwardCompatTestTrait;`
	`25`	`+`
`23`	`26`	`/**`
`24`	`27`	`* @var JsonBundleWriter`
`25`	`28`	`*/`
`@@ -32,7 +35,7 @@ class JsonBundleWriterTest extends TestCase`
`32`	`35`	`*/`
`33`	`36`	`private $filesystem;`
`34`	`37`
`35`		`- protected function setUp()`
	`38`	`+ private function doSetUp()`
`36`	`39`	`{`
`37`	`40`	`$this->writer = new JsonBundleWriter();`
`38`	`41`	`$this->directory = sys_get_temp_dir().'/JsonBundleWriterTest/'.mt_rand(1000, 9999);`
`@@ -41,7 +44,7 @@ protected function setUp()`
`41`	`44`	`$this->filesystem->mkdir($this->directory);`
`42`	`45`	`}`
`43`	`46`
`44`		`- protected function tearDown()`
	`47`	`+ private function doTearDown()`
`45`	`48`	`{`
`46`	`49`	`$this->filesystem->remove($this->directory);`
`47`	`50`	`}`