Merge branch '4.4' into 5.1

* 4.4:
  [Debug] fix test
  consistently use same types for strict comparisons
  [PhpUnitBridge] Skip internal classes in CoverageListenerTrait
  [VarExporter] unserialize() might throw an Exception on php 8.
  [ErrorHandler] Parse "x not found" errors correctly on php 8.
  Prevent parsing invalid octal digits as octal numbers
  remove unnecessary check for  existing request
  [DI] fix ContainerBuilder on PHP8
  [Console] Make sure $maxAttempts is an int or null.
  [VarDumper] Fix caster for invalid SplFileInfo objects on php 8.
  [Intl] Skip test cases that produce a TypeError on php 8.
  [PhpUnitBridge] Adjust output parsing for PHPUnit 9.3.
  [PhpUnitBridge] CoverageListenerTrait update for PHPUnit 8.5/9.x
  add bosnian (bs) translation
  [Debug] Parse "x not found" errors correctly on php 8.

Author: nicolas-grekas

Legacy/CoverageListenerTrait.php

@@ -107,6 +107,13 @@ private function addCoversForDocBlockInsideRegistry($test, $covers)
         $symbolAnnotations = new \ReflectionProperty($docBlock, 'symbolAnnotations');
         $symbolAnnotations->setAccessible(true);
 
+        // Exclude internal classes; PHPUnit 9.1+ is picky about tests covering, say, a \RuntimeException
+        $covers = array_filter($covers, function ($class) {
+            $reflector = new ReflectionClass($class);
+
+            return $reflector->isUserDefined();
+        });
+
         $symbolAnnotations->setValue($docBlock, array_replace($docBlock->symbolAnnotations(), [
             'covers' => $covers,
         ]));

Tests/CoverageListenerTest.php

@@ -27,13 +27,19 @@ public function test()
         $dir = __DIR__.'/../Tests/Fixtures/coverage';
         $phpunit = $_SERVER['argv'][0];
 
-        exec("$php $phpunit -c $dir/phpunit-without-listener.xml.dist $dir/tests/ --coverage-text 2> /dev/null", $output);
+        exec("$php $phpunit -c $dir/phpunit-without-listener.xml.dist $dir/tests/ --coverage-text --colors=never 2> /dev/null", $output);
         $output = implode("\n", $output);
-        $this->assertStringContainsString('FooCov', $output);
+        $this->assertMatchesRegularExpression('/FooCov\n\s*Methods:\s+100.00%[^\n]+Lines:\s+100.00%/', $output);
 
-        exec("$php $phpunit -c $dir/phpunit-with-listener.xml.dist $dir/tests/ --coverage-text 2> /dev/null", $output);
+        exec("$php $phpunit -c $dir/phpunit-with-listener.xml.dist $dir/tests/ --coverage-text --colors=never 2> /dev/null", $output);
         $output = implode("\n", $output);
-        $this->assertStringNotContainsString('FooCov', $output);
+
+        if (false === strpos($output, 'FooCov')) {
+            $this->addToAssertionCount(1);
+        } else {
+            $this->assertMatchesRegularExpression('/FooCov\n\s*Methods:\s+0.00%[^\n]+Lines:\s+0.00%/', $output);
+        }
+
         $this->assertStringContainsString("SutNotFoundTest::test\nCould not find the tested class.", $output);
         $this->assertStringNotContainsString("CoversTest::test\nCould not find the tested class.", $output);
         $this->assertStringNotContainsString("CoversDefaultClassTest::test\nCould not find the tested class.", $output);