[PhpUnitBridge] fix replaying skipped tests

symfony · nicolas-grekas · Nov 3, 2020 · Nov 3, 2020 · Nov 3, 2020 · 849d1b3845a4ed2dc59a1a3eac1c55368b256b05
commit 849d1b3845a4ed2dc59a1a3eac1c55368b256b05
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -121,7 +121,7 @@ public function startTestSuite($suite)
        $suiteName = $suite->getName();

        foreach ($suite->tests() as $test) {
-            if (!($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)) {
+            if (!($test instanceof \PHPUnit_Framework_TestCase || $test instanceof TestCase)) {
                continue;
            }
            if (null === Test::getPreserveGlobalStateSettings(\get_class($test), $test->getName(false))) {
@@ -156,7 +156,7 @@ public function startTestSuite($suite)
            $testSuites = [$suite];
            for ($i = 0; isset($testSuites[$i]); ++$i) {
                foreach ($testSuites[$i]->tests() as $test) {
-                    if ($test instanceof TestSuite) {
+                    if ($test instanceof \PHPUnit_Framework_TestSuite || $test instanceof TestSuite) {
                        if (!class_exists($test->getName(), false)) {
                            $testSuites[] = $test;
                            continue;
@@ -172,12 +172,19 @@ public function startTestSuite($suite)
                }
            }
        } elseif (2 === $this->state) {
+            $suites = [$suite];
            $skipped = [];
-            foreach ($suite->tests() as $test) {
-                if (!($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)
-                    || isset($this->wasSkipped[$suiteName]['*'])
-                    || isset($this->wasSkipped[$suiteName][$test->getName()])) {
-                    $skipped[] = $test;
+            while ($s = array_shift($suites)) {
+                foreach ($s->tests() as $test) {
+                    if ($test instanceof \PHPUnit_Framework_TestSuite || $test instanceof TestSuite) {
+                        $suites[] = $test;
+                        continue
+                    }
+                    if (($test instanceof \PHPUnit_Framework_TestCase || $test instanceof TestCase)
+                        && isset($this->wasSkipped[\get_class($test)][$test->getName()])
+                    ) {
+                        $skipped[] = $test;
+                    }
                }
            }
            $suite->setTests($skipped);
@@ -187,21 +194,13 @@ public function startTestSuite($suite)
    public function addSkippedTest($test, \Exception $e, $time)
    {
        if (0 < $this->state) {
-            if ($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase) {
-                $class = \get_class($test);
-                $method = $test->getName();
-            } else {
-                $class = $test->getName();
-                $method = '*';
-            }
-
-            $this->isSkipped[$class][$method] = 1;
+            $this->isSkipped[\get_class($test)][$test->getName()] = 1;
        }
    }

    public function startTest($test)
    {
-        if (-2 < $this->state && ($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)) {
+        if (-2 < $this->state && ($test instanceof \PHPUnit_Framework_TestCase || $test instanceof TestCase)) {
            // This event is triggered before the test is re-run in isolation
            if ($this->willBeIsolated($test)) {
                $this->runsInSeparateProcess = tempnam(sys_get_temp_dir(), 'deprec');
@@ -291,7 +290,7 @@ public function endTest($test, $time)
            $this->expectedDeprecations = $this->gatheredDeprecations = [];
            $this->previousErrorHandler = null;
        }
-        if (!$this->runsInSeparateProcess && -2 < $this->state && ($test instanceof \PHPUnit\Framework\TestCase || $test instanceof TestCase)) {
+        if (!$this->runsInSeparateProcess && -2 < $this->state && ($test instanceof \PHPUnit_Framework_TestCase || $test instanceof TestCase)) {
            if (\in_array('time-sensitive', $groups, true)) {
                ClockMock::withClockMock(false);
            }

diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php
@@ -30,6 +30,18 @@ protected function setUp(): void
        parent::setUp();
    }

+    /**
+     * @dataProvider formatProvider
+     */
+    public function testFormat($pattern, $timestamp, $expected)
+    {
+        if (\PHP_VERSION_ID < 70105 && $timestamp instanceof \DateTimeImmutable) {
+            $this->markTestSkipped('PHP >= 7.1.5 required for DateTimeImmutable.');
+        }
+
+        parent::testFormat($pattern, $timestamp, $expected);
+    }
+
    /**
     * @dataProvider formatTimezoneProvider
     */