Merge tbranch '5.4' into 6.0

* 5.4:
  [Bridge] Corrects bug in test listener trait

Author: fabpot

Legacy/SymfonyTestsListenerTrait.php

@@ -271,7 +271,7 @@ public function endTest($test, $time)
             $assertions = \count(self::$expectedDeprecations) + $test->getNumAssertions();
             if ($test->doesNotPerformAssertions() && $assertions > 0) {
                 $test->getTestResultObject()->addFailure($test, new RiskyTestError(sprintf('This test is annotated with "@doesNotPerformAssertions", but performed %s assertions', $assertions)), $time);
-            } elseif ($assertions === 0 && $test->getTestResultObject()->noneSkipped()) {
+            } elseif ($assertions === 0 && !$test->doesNotPerformAssertions() && $test->getTestResultObject()->noneSkipped()) {
                 $test->getTestResultObject()->addFailure($test, new RiskyTestError('This test did not perform any assertions'), $time);
             }
 

Tests/FailTests/NoAssertionsTestNotRisky.php

@@ -0,0 +1,32 @@
+<?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\FailTests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
+
+/**
+ * This class is deliberately suffixed with *TestRisky.php so that it is ignored
+ * by PHPUnit. This test is designed to fail. See ../expectnotrisky.phpt.
+ */
+final class NoAssertionsTestNotRisky extends TestCase
+{
+    use ExpectDeprecationTrait;
+
+    /**
+     * Do not remove this test in the next major version.
+     */
+    public function testOne()
+    {
+        $this->expectNotToPerformAssertions();
+    }
+}

Tests/expectnotrisky.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Test NoAssertionsTestNotRisky not risky test
+--SKIPIF--
+<?php if ('\\' === DIRECTORY_SEPARATOR && !extension_loaded('mbstring')) die('Skipping on Windows without mbstring');
+--FILE--
+<?php
+$test =  realpath(__DIR__.'/FailTests/NoAssertionsTestNotRisky.php');
+passthru('php '.getenv('SYMFONY_SIMPLE_PHPUNIT_BIN_DIR').'/simple-phpunit.php --fail-on-risky --colors=never '.$test);
+?>
+--EXPECTF--
+PHPUnit %s
+
+%ATesting Symfony\Bridge\PhpUnit\Tests\FailTests\NoAssertionsTestNotRisky
+.                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+OK (1 test, 0 assertions)