CoreLibs composer v8.0.5 update test

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Dashboard.php

@@ -117,7 +117,7 @@ final class Dashboard extends Renderer
     private function coverageDistribution(array $classes): array
     {
         $result = [
-            'class'  => [
+            'class' => [
                 '0%'      => 0,
                 '0-10%'   => 0,
                 '10-20%'  => 0,

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/File.php

@@ -134,7 +134,7 @@ final class File extends Renderer
             [
                 'items'     => $this->renderItems($node),
                 'lines'     => $this->renderSourceWithLineCoverage($node),
-                'legend'    => '<p><span class="success"><strong>Executed</strong></span><span class="danger"><strong>Not Executed</strong></span><span class="warning"><strong>Dead Code</strong></span></p>',
+                'legend'    => '<p><span class="legend covered-by-small-tests">Covered by small (and larger) tests</span><span class="legend covered-by-medium-tests">Covered by medium (and large) tests</span><span class="legend covered-by-large-tests">Covered by large tests (and tests of unknown size)</span><span class="legend not-covered">Not covered</span><span class="legend not-coverable">Not coverable</span></p>',
                 'structure' => '',
             ]
         );
@@ -284,19 +284,19 @@ final class File extends Renderer
             $buffer .= $this->renderItemTemplate(
                 $template,
                 [
-                    'name'                            => $this->abbreviateClassName($name),
-                    'numClasses'                      => $numClasses,
-                    'numTestedClasses'                => $numTestedClasses,
-                    'numMethods'                      => $numMethods,
-                    'numTestedMethods'                => $numTestedMethods,
-                    'linesExecutedPercent'            => Percentage::fromFractionAndTotal(
+                    'name'                 => $this->abbreviateClassName($name),
+                    'numClasses'           => $numClasses,
+                    'numTestedClasses'     => $numTestedClasses,
+                    'numMethods'           => $numMethods,
+                    'numTestedMethods'     => $numTestedMethods,
+                    'linesExecutedPercent' => Percentage::fromFractionAndTotal(
                         $item['executedLines'],
                         $item['executableLines'],
                     )->asFloat(),
-                    'linesExecutedPercentAsString'    => $linesExecutedPercentAsString,
-                    'numExecutedLines'                => $item['executedLines'],
-                    'numExecutableLines'              => $item['executableLines'],
-                    'branchesExecutedPercent'         => Percentage::fromFractionAndTotal(
+                    'linesExecutedPercentAsString' => $linesExecutedPercentAsString,
+                    'numExecutedLines'             => $item['executedLines'],
+                    'numExecutableLines'           => $item['executableLines'],
+                    'branchesExecutedPercent'      => Percentage::fromFractionAndTotal(
                         $item['executedBranches'],
                         $item['executableBranches'],
                     )->asFloat(),
@@ -307,14 +307,14 @@ final class File extends Renderer
                         $item['executedPaths'],
                         $item['executablePaths']
                     )->asFloat(),
-                    'pathsExecutedPercentAsString'    => $pathsExecutedPercentAsString,
-                    'numExecutedPaths'                => $item['executedPaths'],
-                    'numExecutablePaths'              => $item['executablePaths'],
-                    'testedMethodsPercent'            => $testedMethodsPercentage->asFloat(),
-                    'testedMethodsPercentAsString'    => $testedMethodsPercentage->asString(),
-                    'testedClassesPercent'            => $testedClassesPercentage->asFloat(),
-                    'testedClassesPercentAsString'    => $testedClassesPercentage->asString(),
-                    'crap'                            => $item['crap'],
+                    'pathsExecutedPercentAsString' => $pathsExecutedPercentAsString,
+                    'numExecutedPaths'             => $item['executedPaths'],
+                    'numExecutablePaths'           => $item['executablePaths'],
+                    'testedMethodsPercent'         => $testedMethodsPercentage->asFloat(),
+                    'testedMethodsPercentAsString' => $testedMethodsPercentage->asString(),
+                    'testedClassesPercent'         => $testedClassesPercentage->asFloat(),
+                    'testedClassesPercentAsString' => $testedClassesPercentage->asString(),
+                    'crap'                         => $item['crap'],
                 ]
             );
 
@@ -384,7 +384,7 @@ final class File extends Renderer
         return $this->renderItemTemplate(
             $template,
             [
-                'name'                            => sprintf(
+                'name' => sprintf(
                     '%s<a href="#%d"><abbr title="%s">%s</abbr></a>',
                     $indent,
                     $item['startLine'],

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/css/style.css

@@ -128,3 +128,31 @@ table + .structure-heading {
  border-top: 1px solid lightgrey;
  padding-top: 0.5em;
 }
+
+.legend {
+ font-weight: bold;
+ margin-right: 2px;
+ padding-left: 10px;
+ padding-right: 10px;
+ text-align: center;
+}
+
+.covered-by-small-tests {
+ background-color: #99cb84;
+}
+
+.covered-by-medium-tests {
+ background-color: #c3e3b5;
+}
+
+.covered-by-large-tests {
+ background-color: #dff0d8;
+}
+
+.not-covered {
+ background-color: #f2dede;
+}
+
+.not-coverable {
+ background-color: #fcf8e3;
+}

vendor/phpunit/php-code-coverage/src/StaticAnalysis/CodeUnitFindingVisitor.php

@@ -26,6 +26,7 @@ use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Interface_;
 use PhpParser\Node\Stmt\Trait_;
 use PhpParser\Node\UnionType;
+use PhpParser\NodeAbstract;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitorAbstract;
 use SebastianBergmann\Complexity\CyclomaticComplexityCalculatingVisitor;
@@ -180,8 +181,12 @@ final class CodeUnitFindingVisitor extends NodeVisitorAbstract
             return '?' . $type->type;
         }
 
-        if ($type instanceof UnionType || $type instanceof IntersectionType) {
-            return $this->unionOrIntersectionAsString($type);
+        if ($type instanceof UnionType) {
+            return $this->unionTypeAsString($type);
+        }
+
+        if ($type instanceof IntersectionType) {
+            return $this->intersectionTypeAsString($type);
         }
 
         return $type->toString();
@@ -298,29 +303,43 @@ final class CodeUnitFindingVisitor extends NodeVisitorAbstract
         return trim(rtrim($namespacedName, $name), '\\');
     }
 
-    /**
-     * @psalm-param UnionType|IntersectionType $type
-     */
-    private function unionOrIntersectionAsString(ComplexType $type): string
+    private function unionTypeAsString(UnionType $node): string
     {
-        if ($type instanceof UnionType) {
-            $separator = '|';
-        } else {
-            $separator = '&';
-        }
-
         $types = [];
 
-        foreach ($type->types as $_type) {
-            if ($_type instanceof Name) {
-                $types[] = $_type->toCodeString();
-            } else {
-                assert($_type instanceof Identifier);
+        foreach ($node->types as $type) {
+            if ($type instanceof IntersectionType) {
+                $types[] = '(' . $this->intersectionTypeAsString($type) . ')';
 
-                $types[] = $_type->toString();
+                continue;
             }
+
+            $types[] = $this->typeAsString($type);
         }
 
-        return implode($separator, $types);
+        return implode('|', $types);
+    }
+
+    private function intersectionTypeAsString(IntersectionType $node): string
+    {
+        $types = [];
+
+        foreach ($node->types as $type) {
+            $types[] = $this->typeAsString($type);
+        }
+
+        return implode('&', $types);
+    }
+
+    /**
+     * @psalm-param Identifier|Name $node $node
+     */
+    private function typeAsString(NodeAbstract $node): string
+    {
+        if ($node instanceof Name) {
+            return $node->toCodeString();
+        }
+
+        return $node->toString();
     }
 }

vendor/phpunit/php-code-coverage/src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -88,12 +88,19 @@ final class ExecutableLinesFindingVisitor extends NodeVisitorAbstract
             return;
         }
 
+        if ($node instanceof Node\Stmt\Interface_) {
+            foreach (range($node->getStartLine(), $node->getEndLine()) as $line) {
+                $this->unsets[$line] = true;
+            }
+
+            return;
+        }
+
         if ($node instanceof Node\Stmt\Declare_ ||
             $node instanceof Node\Stmt\DeclareDeclare ||
             $node instanceof Node\Stmt\Else_ ||
             $node instanceof Node\Stmt\EnumCase ||
             $node instanceof Node\Stmt\Finally_ ||
-            $node instanceof Node\Stmt\Interface_ ||
             $node instanceof Node\Stmt\Label ||
             $node instanceof Node\Stmt\Namespace_ ||
             $node instanceof Node\Stmt\Nop ||

vendor/phpunit/php-code-coverage/src/Version.php

@@ -22,7 +22,7 @@ final class Version
     public static function id(): string
     {
         if (self::$version === null) {
-            self::$version = (new VersionId('9.2.24', dirname(__DIR__)))->getVersion();
+            self::$version = (new VersionId('9.2.26', dirname(__DIR__)))->getVersion();
         }
 
         return self::$version;