[Phpunit] Fix running skipped tests expecting only deprecations

chalasr · chalasr · commit 993c43ecceb7 · 2020-01-28T02:23:25.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -196,7 +196,7 @@ public function addSkippedTest($test, \Exception $e, $time)
 
     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) && $test->getTestResultObject()) {
             // This event is triggered before the test is re-run in isolation
             if ($this->willBeIsolated($test)) {
                 $this->runsInSeparateProcess = tempnam(sys_get_temp_dir(), 'deprec');
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/OnlyExpectingDeprecationSkippedTest.php b/src/Symfony/Bridge/PhpUnit/Tests/OnlyExpectingDeprecationSkippedTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * This test is meant to be skipped.
+ *
+ * @requires extension ext-dummy
+ */
+final class OnlyExpectingDeprecationSkippedTest extends TestCase
+{
+    /**
+     * Do not remove this test in the next major versions.
+     *
+     * @group legacy
+     *
+     * @expectedDeprecation unreachable
+     */
+    public function testExpectingOnlyDeprecations()
+    {
+        $this->fail('should never be ran.');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function addSkippedTest($test, \Exception $e, $time)`
`196`	`196`
`197`	`197`	`public function startTest($test)`
`198`	`198`	`{`
`199`		`- if (-2 < $this->state && ($test instanceof \PHPUnit\Framework\TestCase \|\| $test instanceof TestCase)) {`
	`199`	`+ if (-2 < $this->state && ($test instanceof \PHPUnit\Framework\TestCase \|\| $test instanceof TestCase) && $test->getTestResultObject()) {`
`200`	`200`	`// This event is triggered before the test is re-run in isolation`
`201`	`201`	`if ($this->willBeIsolated($test)) {`
`202`	`202`	`$this->runsInSeparateProcess = tempnam(sys_get_temp_dir(), 'deprec');`