Update to PHPUnit namespaces

peterrehm · fabpot · commit 949e128d46ab · 2017-02-18T08:02:39.000-08:00
diff --git a/Tests/Collator/AbstractCollatorTest.php b/Tests/Collator/AbstractCollatorTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Intl\Tests\Collator;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Collator\Collator;
 
 /**
  * Test case for Collator implementations.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class AbstractCollatorTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractCollatorTest extends TestCase
 {
     /**
      * @dataProvider asortProvider
diff --git a/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php b/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class BundleEntryReaderTest extends \PHPUnit_Framework_TestCase
+class BundleEntryReaderTest extends TestCase
 {
     const RES_DIR = '/res/dir';
 
diff --git a/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php b/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Data\Bundle\Reader\IntlBundleReader;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @requires extension intl
  */
-class IntlBundleReaderTest extends \PHPUnit_Framework_TestCase
+class IntlBundleReaderTest extends TestCase
 {
     /**
      * @var IntlBundleReader
diff --git a/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php b/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Data\Bundle\Reader\JsonBundleReader;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class JsonBundleReaderTest extends \PHPUnit_Framework_TestCase
+class JsonBundleReaderTest extends TestCase
 {
     /**
      * @var JsonBundleReader
diff --git a/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php b/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Data\Bundle\Reader\PhpBundleReader;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class PhpBundleReaderTest extends \PHPUnit_Framework_TestCase
+class PhpBundleReaderTest extends TestCase
 {
     /**
      * @var PhpBundleReader
diff --git a/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php b/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Writer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Intl\Data\Bundle\Writer\JsonBundleWriter;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @requires PHP 5.4
  */
-class JsonBundleWriterTest extends \PHPUnit_Framework_TestCase
+class JsonBundleWriterTest extends TestCase
 {
     /**
      * @var JsonBundleWriter
diff --git a/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php b/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Writer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Intl\Data\Bundle\Writer\PhpBundleWriter;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class PhpBundleWriterTest extends \PHPUnit_Framework_TestCase
+class PhpBundleWriterTest extends TestCase
 {
     /**
      * @var PhpBundleWriter
diff --git a/Tests/Data/Bundle/Writer/TextBundleWriterTest.php b/Tests/Data/Bundle/Writer/TextBundleWriterTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Writer;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Intl\Data\Bundle\Writer\TextBundleWriter;
 
@@ -19,7 +20,7 @@
  *
  * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
  */
-class TextBundleWriterTest extends \PHPUnit_Framework_TestCase
+class TextBundleWriterTest extends TestCase
 {
     /**
      * @var TextBundleWriter
diff --git a/Tests/Data/Provider/AbstractDataProviderTest.php b/Tests/Data/Provider/AbstractDataProviderTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Provider;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
 use Symfony\Component\Intl\Locale;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class AbstractDataProviderTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractDataProviderTest extends TestCase
 {
     // Include the locales statically so that the data providers are decoupled
     // from the Intl class. Otherwise tests will fail if the intl extension is
diff --git a/Tests/Data/Util/LocaleScannerTest.php b/Tests/Data/Util/LocaleScannerTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Util;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Intl\Data\Util\LocaleScanner;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class LocaleScannerTest extends \PHPUnit_Framework_TestCase
+class LocaleScannerTest extends TestCase
 {
     private $directory;
 
diff --git a/Tests/Data/Util/RingBufferTest.php b/Tests/Data/Util/RingBufferTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Intl\Tests\Data\Util;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Data\Util\RingBuffer;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class RingBufferTest extends \PHPUnit_Framework_TestCase
+class RingBufferTest extends TestCase
 {
     /**
      * @var RingBuffer
diff --git a/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Intl\Tests\DateFormatter;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\DateFormatter\IntlDateFormatter;
 use Symfony\Component\Intl\Globals\IntlGlobals;
 
@@ -19,7 +20,7 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class AbstractIntlDateFormatterTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractIntlDateFormatterTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Globals/AbstractIntlGlobalsTest.php b/Tests/Globals/AbstractIntlGlobalsTest.php
@@ -11,12 +11,14 @@
 
 namespace Symfony\Component\Intl\Tests\Globals;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Test case for intl function implementations.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class AbstractIntlGlobalsTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractIntlGlobalsTest extends TestCase
 {
     public function errorNameProvider()
     {
diff --git a/Tests/Locale/AbstractLocaleTest.php b/Tests/Locale/AbstractLocaleTest.php
@@ -11,12 +11,14 @@
 
 namespace Symfony\Component\Intl\Tests\Locale;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Test case for Locale implementations.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class AbstractLocaleTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractLocaleTest extends TestCase
 {
     public function testSetDefault()
     {
diff --git a/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/Tests/NumberFormatter/AbstractNumberFormatterTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Intl\Tests\NumberFormatter;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Globals\IntlGlobals;
 use Symfony\Component\Intl\NumberFormatter\NumberFormatter;
 use Symfony\Component\Intl\Util\IntlTestHelper;
@@ -19,7 +20,7 @@
  * Note that there are some values written like -2147483647 - 1. This is the lower 32bit int max and is a known
  * behavior of PHP.
  */
-abstract class AbstractNumberFormatterTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractNumberFormatterTest extends TestCase
 {
     /**
      * @dataProvider formatCurrencyWithDecimalStyleProvider
diff --git a/Tests/Util/IcuVersionTest.php b/Tests/Util/IcuVersionTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Intl\Tests\Util;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Util\IcuVersion;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class IcuVersionTest extends \PHPUnit_Framework_TestCase
+class IcuVersionTest extends TestCase
 {
     public function normalizeProvider()
     {
diff --git a/Tests/Util/VersionTest.php b/Tests/Util/VersionTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Intl\Tests\Util;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Util\Version;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class VersionTest extends \PHPUnit_Framework_TestCase
+class VersionTest extends TestCase
 {
     public function normalizeProvider()
     {
diff --git a/Util/IntlTestHelper.php b/Util/IntlTestHelper.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Intl\Util;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Intl\Intl;
 
 /**
@@ -29,7 +30,7 @@ class IntlTestHelper
     /**
      * Should be called before tests that work fine with the stub implementation.
      */
-    public static function requireIntl(\PHPUnit_Framework_TestCase $testCase, $minimumIcuVersion = null)
+    public static function requireIntl(TestCase $testCase, $minimumIcuVersion = null)
     {
         if (null === $minimumIcuVersion) {
             $minimumIcuVersion = Intl::getIcuStubVersion();
@@ -63,7 +64,7 @@ public static function requireIntl(\PHPUnit_Framework_TestCase $testCase, $minim
      * Should be called before tests that require a feature-complete intl
      * implementation.
      */
-    public static function requireFullIntl(\PHPUnit_Framework_TestCase $testCase, $minimumIcuVersion = null)
+    public static function requireFullIntl(TestCase $testCase, $minimumIcuVersion = null)
     {
         // We only run tests if the intl extension is loaded...
         if (!Intl::isExtensionLoaded()) {
@@ -83,7 +84,7 @@ public static function requireFullIntl(\PHPUnit_Framework_TestCase $testCase, $m
     /**
      * Skips the test unless the current system has a 32bit architecture.
      */
-    public static function require32Bit(\PHPUnit_Framework_TestCase $testCase)
+    public static function require32Bit(TestCase $testCase)
     {
         if (4 !== PHP_INT_SIZE) {
             $testCase->markTestSkipped('PHP 32 bit is required.');
@@ -93,7 +94,7 @@ public static function require32Bit(\PHPUnit_Framework_TestCase $testCase)
     /**
      * Skips the test unless the current system has a 64bit architecture.
      */
-    public static function require64Bit(\PHPUnit_Framework_TestCase $testCase)
+    public static function require64Bit(TestCase $testCase)
     {
         if (8 !== PHP_INT_SIZE) {
             $testCase->markTestSkipped('PHP 64 bit is required.');

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,15 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Intl\Tests\Collator;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Intl\Collator\Collator;`
`15`	`16`
`16`	`17`	`/**`
`17`	`18`	`* Test case for Collator implementations.`
`18`	`19`	`*`
`19`	`20`	`* @author Bernhard Schussek <[email protected]>`
`20`	`21`	`*/`
`21`		`-abstract class AbstractCollatorTest extends \PHPUnit_Framework_TestCase`
	`22`	`+abstract class AbstractCollatorTest extends TestCase`
`22`	`23`	`{`
`23`	`24`	`/**`
`24`	`25`	`* @dataProvider asortProvider`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Intl\Tests\Data\Bundle\Writer;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Filesystem\Filesystem;`
`15`	`16`	`use Symfony\Component\Intl\Data\Bundle\Writer\TextBundleWriter;`
`16`	`17`
`@@ -19,7 +20,7 @@`
`19`	`20`	`*`
`20`	`21`	`* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt`
`21`	`22`	`*/`
`22`		`-class TextBundleWriterTest extends \PHPUnit_Framework_TestCase`
	`23`	`+class TextBundleWriterTest extends TestCase`
`23`	`24`	`{`
`24`	`25`	`/**`
`25`	`26`	`* @var TextBundleWriter`