minor #315 Bump to phpunit-bridge ^5.3 (nicolas-grekas)

This PR was merged into the 1.21-dev branch. Discussion ---------- Bump to phpunit-bridge ^5.3 See symfony/symfony#39419 Commits ------- 8e4ffb6 Bump to phpunit-bridge ^5.3
symfony · Dec 26, 2020 · 1c8cc31 · 1c8cc31
2 parents d6b374f + 8e4ffb6
commit 1c8cc31
Show file tree

Hide file tree

Showing 22 changed files with 63 additions and 221 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "symfony/intl": "^4.4|^5.0",
-        "symfony/phpunit-bridge": "^5"
+        "symfony/phpunit-bridge": "^5.3"
     },
     "replace": {
         "symfony/polyfill-apcu": "self.version",

diff --git a/src/Util/TestListener.php b/src/Util/TestListener.php
@@ -11,13 +11,7 @@
 
 namespace Symfony\Polyfill\Util;
 
-if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
-    class_alias('Symfony\Polyfill\Util\TestListenerForV5', 'Symfony\Polyfill\Util\TestListener');
-// Using an early return instead of a else does not work when using the PHPUnit phar due to some weird PHP behavior (the class
-// gets defined without executing the code before it and so the definition is not properly conditional)
-} elseif (version_compare(\PHPUnit\Runner\Version::id(), '7.0.0', '<')) {
-    class_alias('Symfony\Polyfill\Util\TestListenerForV6', 'Symfony\Polyfill\Util\TestListener');
-} elseif (version_compare(\PHPUnit\Runner\Version::id(), '9.1.0', '<')) {
+if (version_compare(\PHPUnit\Runner\Version::id(), '9.1.0', '<')) {
     class_alias('Symfony\Polyfill\Util\TestListenerForV7', 'Symfony\Polyfill\Util\TestListener');
 } else {
     class_alias('Symfony\Polyfill\Util\TestListenerForV9', 'Symfony\Polyfill\Util\TestListener');

diff --git a/src/Util/TestListenerForV5.php b/src/Util/TestListenerForV5.php
diff --git a/src/Util/TestListenerForV6.php b/src/Util/TestListenerForV6.php
diff --git a/src/Util/TestListenerTrait.php b/src/Util/TestListenerTrait.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Polyfill\Util;
 
+use PHPUnit\Framework\SkippedTestError;
+use PHPUnit\Util\Test;
+
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
@@ -24,13 +27,16 @@ public function startTestSuite($mainSuite)
             return;
         }
         self::$enabledPolyfills = false;
-        $SkippedTestError = class_exists('PHPUnit\Framework\SkippedTestError') ? 'PHPUnit\Framework\SkippedTestError' : 'PHPUnit_Framework_SkippedTestError';
+        $warnings = array();
 
         foreach ($mainSuite->tests() as $suite) {
             $testClass = $suite->getName();
             if (!$tests = $suite->tests()) {
                 continue;
             }
+            if (\in_array('class-polyfill', Test::getGroups($testClass), true)) {
+                continue;
+            }
             $testedClass = new \ReflectionClass($testClass);
             if (preg_match('{^ \* @requires PHP (.*)}mi', $testedClass->getDocComment(), $m) && version_compare($m[1], \PHP_VERSION, '>')) {
                 continue;
@@ -44,21 +50,20 @@ public function startTestSuite($mainSuite)
             }
             $testedClass = new \ReflectionClass($m[1].$m[2]);
             $bootstrap = new \SplFileObject(\dirname($testedClass->getFileName()).'/bootstrap.php');
-            $warnings = array();
+            $newWarnings = 0;
             $defLine = null;
 
             foreach (new \RegexIterator($bootstrap, '/define\(\'/') as $defLine) {
-                preg_match('/define\(\'(?P<name>.+)\'/', $defLine, $matches);
+                preg_match("/define\('(?P<name>[^']++)'/", $defLine, $matches);
                 if (\defined($matches['name'])) {
                     continue;
                 }
 
                 try {
                     eval($defLine);
-                } catch (\PHPUnit_Framework_Exception $ex){
-                    $warnings[] = TestListener::warning($ex->getMessage());
                 } catch (\PHPUnit\Framework\Exception $ex) {
                     $warnings[] = TestListener::warning($ex->getMessage());
+                    ++$newWarnings;
                 }
             }
 
@@ -67,6 +72,7 @@ public function startTestSuite($mainSuite)
             foreach (new \RegexIterator($bootstrap, '/return p\\\\'.$testedClass->getShortName().'::/') as $defLine) {
                 if (!preg_match('/^\s*function (?P<name>[^\(]++)(?P<signature>\(.*\)(?: ?: [^ ]++)?) \{ (?<return>return p\\\\'.$testedClass->getShortName().'::[^\(]++)(?P<args>\([^\)]*+\)); \}$/', $defLine, $f)) {
                     $warnings[] = TestListener::warning('Invalid line in bootstrap.php: '.trim($defLine));
+                    ++$newWarnings;
                     continue;
                 }
                 $testNamespace = substr($testClass, 0, strrpos($testClass, '\\'));
@@ -87,7 +93,7 @@ public function startTestSuite($mainSuite)
                         $defLine = sprintf("return \\call_user_func_array('%s', \\func_get_args())", $f['name']);
                     }
                 } catch (\ReflectionException $e) {
-                    $defLine = sprintf("throw new \\{$SkippedTestError}('Internal function not found: %s')", $f['name']);
+                    $defLine = sprintf("throw new \\%s('Internal function not found: %s')", SkippedTestError::class, $f['name']);
                 }
 
                 eval(<<<EOPHP
@@ -107,8 +113,8 @@ function {$f['name']}{$f['signature']}
 EOPHP
                 );
             }
-            if (!$warnings && null === $defLine) {
-                $warnings[] = new $SkippedTestError('No Polyfills found in bootstrap.php for '.$testClass);
+            if (!$newWarnings && null === $defLine) {
+                $warnings[] = TestListener::warning('No polyfills found in bootstrap.php for '.$testClass);
             } else {
                 $mainSuite->addTest(new TestListener($suite));
             }

diff --git a/tests/Intl/Icu/AbstractCollatorTest.php b/tests/Intl/Icu/AbstractCollatorTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Polyfill\Intl\Icu\Tests;
+namespace Symfony\Polyfill\Tests\Intl\Icu;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Polyfill\Intl\Icu\Collator;

diff --git a/tests/Intl/Icu/AbstractIcuTest.php b/tests/Intl/Icu/AbstractIcuTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Polyfill\Intl\Icu\Tests;
+namespace Symfony\Polyfill\Tests\Intl\Icu;
 
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/Intl/Icu/AbstractIntlDateFormatterTest.php b/tests/Intl/Icu/AbstractIntlDateFormatterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Polyfill\Intl\Icu\Tests;
+namespace Symfony\Polyfill\Tests\Intl\Icu;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Polyfill\Intl\Icu\IntlDateFormatter;

diff --git a/tests/Intl/Icu/AbstractLocaleTest.php b/tests/Intl/Icu/AbstractLocaleTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Polyfill\Intl\Icu\Tests;
+namespace Symfony\Polyfill\Tests\Intl\Icu;
 
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/Intl/Icu/AbstractNumberFormatterTest.php b/tests/Intl/Icu/AbstractNumberFormatterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Polyfill\Intl\Icu\Tests;
+namespace Symfony\Polyfill\Tests\Intl\Icu;
 
 use PHPUnit\Framework\Error\Warning;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/Intl/Icu/CollatorTest.php b/tests/Intl/Icu/CollatorTest.php
@@ -9,13 +9,16 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Polyfill\Intl\Icu\Tests;
+namespace Symfony\Polyfill\Tests\Intl\Icu;
 
 use Symfony\Polyfill\Intl\Icu\Collator;
 use Symfony\Polyfill\Intl\Icu\Exception\MethodArgumentValueNotImplementedException;
 use Symfony\Polyfill\Intl\Icu\Exception\MethodNotImplementedException;
 use Symfony\Polyfill\Intl\Icu\Icu;
 
+/**
+ * @group class-polyfill
+ */
 class CollatorTest extends AbstractCollatorTest
 {
     public function testConstructorWithUnsupportedLocale()

diff --git a/tests/Intl/Icu/CurrenciesTest.php b/tests/Intl/Icu/CurrenciesTest.php
@@ -9,11 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Polyfill\Intl\Icu\Tests;
+namespace Symfony\Polyfill\Tests\Intl\Icu;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Polyfill\Intl\Icu\Currencies;
 
+/**
+ * @group class-polyfill
+ */
 class CurrenciesTest extends TestCase
 {
     public function testMetadata()

diff --git a/tests/Intl/Icu/IcuTest.php b/tests/Intl/Icu/IcuTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Polyfill\Intl\Icu\Tests;
+namespace Symfony\Polyfill\Tests\Intl\Icu;
 
 use Symfony\Polyfill\Intl\Icu\Icu;
 

diff --git a/tests/Intl/Icu/IntlDateFormatterTest.php b/tests/Intl/Icu/IntlDateFormatterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Polyfill\Intl\Icu\Tests;
+namespace Symfony\Polyfill\Tests\Intl\Icu;
 
 use Symfony\Polyfill\Intl\Icu\Exception\MethodArgumentNotImplementedException;
 use Symfony\Polyfill\Intl\Icu\Exception\MethodArgumentValueNotImplementedException;
@@ -18,6 +18,9 @@
 use Symfony\Polyfill\Intl\Icu\IntlDateFormatter;
 use Symfony\Polyfill\Intl\Icu\Icu;
 
+/**
+ * @group class-polyfill
+ */
 class IntlDateFormatterTest extends AbstractIntlDateFormatterTest
 {
     public function testConstructor()