Upgrade framework

vendor/phpunit/php-code-coverage/src/Node/Builder.php

@@ -1,28 +1,48 @@
-<?php
+<?php declare(strict_types=1);
 /*
- * This file is part of the php-code-coverage package.
+ * This file is part of phpunit/php-code-coverage.
  *
  * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace SebastianBergmann\CodeCoverage\Node;
 
+use const DIRECTORY_SEPARATOR;
+use function array_shift;
+use function basename;
+use function count;
+use function dirname;
+use function explode;
+use function implode;
+use function is_file;
+use function str_replace;
+use function strpos;
+use function substr;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\ProcessedCodeCoverageData;
+use SebastianBergmann\CodeCoverage\StaticAnalysis\FileAnalyser;
 
-class Builder
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
+final class Builder
 {
     /**
-     * @param CodeCoverage $coverage
-     *
-     * @return Directory
+     * @var FileAnalyser
      */
-    public function build(CodeCoverage $coverage)
+    private $analyser;
+
+    public function __construct(FileAnalyser $analyser)
     {
-        $files      = $coverage->getData();
-        $commonPath = $this->reducePaths($files);
+        $this->analyser = $analyser;
+    }
+
+    public function build(CodeCoverage $coverage): Directory
+    {
+        $data       = clone $coverage->getData(); // clone because path munging is destructive to the original data
+        $commonPath = $this->reducePaths($data);
         $root       = new Directory(
             $commonPath,
             null
@@ -30,32 +50,41 @@ class Builder
 
         $this->addItems(
             $root,
-            $this->buildDirectoryStructure($files),
-            $coverage->getTests(),
-            $coverage->getCacheTokens()
+            $this->buildDirectoryStructure($data),
+            $coverage->getTests()
         );
 
         return $root;
     }
 
-    /**
-     * @param Directory $root
-     * @param array     $items
-     * @param array     $tests
-     * @param bool      $cacheTokens
-     */
-    private function addItems(Directory $root, array $items, array $tests, $cacheTokens)
+    private function addItems(Directory $root, array $items, array $tests): void
     {
         foreach ($items as $key => $value) {
-            if (substr($key, -2) == '/f') {
-                $key = substr($key, 0, -2);
+            $key = (string) $key;
 
-                if (file_exists($root->getPath() . DIRECTORY_SEPARATOR . $key)) {
-                    $root->addFile($key, $value, $tests, $cacheTokens);
+            if (substr($key, -2) === '/f') {
+                $key      = substr($key, 0, -2);
+                $filename = $root->pathAsString() . DIRECTORY_SEPARATOR . $key;
+
+                if (is_file($filename)) {
+                    $root->addFile(
+                        new File(
+                            $key,
+                            $root,
+                            $value['lineCoverage'],
+                            $value['functionCoverage'],
+                            $tests,
+                            $this->analyser->classesIn($filename),
+                            $this->analyser->traitsIn($filename),
+                            $this->analyser->functionsIn($filename),
+                            $this->analyser->linesOfCodeFor($filename)
+                        )
+                    );
                 }
             } else {
                 $child = $root->addDirectory($key);
-                $this->addItems($child, $value, $tests, $cacheTokens);
+
+                $this->addItems($child, $value, $tests);
             }
         }
     }
@@ -99,31 +128,30 @@ class Builder
      *         )
      * )
      * </code>
-     *
-     * @param array $files
-     *
-     * @return array
      */
-    private function buildDirectoryStructure($files)
+    private function buildDirectoryStructure(ProcessedCodeCoverageData $data): array
     {
         $result = [];
 
-        foreach ($files as $path => $file) {
-            $path    = explode('/', $path);
+        foreach ($data->coveredFiles() as $originalPath) {
+            $path    = explode(DIRECTORY_SEPARATOR, $originalPath);
             $pointer = &$result;
             $max     = count($path);
 
             for ($i = 0; $i < $max; $i++) {
-                if ($i == ($max - 1)) {
+                $type = '';
+
+                if ($i === ($max - 1)) {
                     $type = '/f';
-                } else {
-                    $type = '';
                 }
 
                 $pointer = &$pointer[$path[$i] . $type];
             }
 
-            $pointer = $file;
+            $pointer = [
+                'lineCoverage'     => $data->lineCoverage()[$originalPath] ?? [],
+                'functionCoverage' => $data->functionCoverage()[$originalPath] ?? [],
+            ];
         }
 
         return $result;
@@ -165,25 +193,19 @@ class Builder
      *         )
      * )
      * </code>
-     *
-     * @param array $files
-     *
-     * @return string
      */
-    private function reducePaths(&$files)
+    private function reducePaths(ProcessedCodeCoverageData $coverage): string
     {
-        if (empty($files)) {
+        if (empty($coverage->coveredFiles())) {
             return '.';
         }
 
         $commonPath = '';
-        $paths      = array_keys($files);
+        $paths      = $coverage->coveredFiles();
 
-        if (count($files) == 1) {
-            $commonPath                 = dirname($paths[0]) . '/';
-            $files[basename($paths[0])] = $files[$paths[0]];
-
-            unset($files[$paths[0]]);
+        if (count($paths) === 1) {
+            $commonPath = dirname($paths[0]) . DIRECTORY_SEPARATOR;
+            $coverage->renameFile($paths[0], basename($paths[0]));
 
             return $commonPath;
         }
@@ -194,7 +216,7 @@ class Builder
             // strip phar:// prefixes
             if (strpos($paths[$i], 'phar://') === 0) {
                 $paths[$i] = substr($paths[$i], 7);
-                $paths[$i] = strtr($paths[$i], '/', DIRECTORY_SEPARATOR);
+                $paths[$i] = str_replace('/', DIRECTORY_SEPARATOR, $paths[$i]);
             }
             $paths[$i] = explode(DIRECTORY_SEPARATOR, $paths[$i]);
 
@@ -209,9 +231,10 @@ class Builder
         while (!$done) {
             for ($i = 0; $i < $max - 1; $i++) {
                 if (!isset($paths[$i][0]) ||
-                    !isset($paths[$i+1][0]) ||
-                    $paths[$i][0] != $paths[$i+1][0]) {
+                    !isset($paths[$i + 1][0]) ||
+                    $paths[$i][0] !== $paths[$i + 1][0]) {
                     $done = true;
+
                     break;
                 }
             }
@@ -219,7 +242,7 @@ class Builder
             if (!$done) {
                 $commonPath .= $paths[0][0];
 
-                if ($paths[0][0] != DIRECTORY_SEPARATOR) {
+                if ($paths[0][0] !== DIRECTORY_SEPARATOR) {
                     $commonPath .= DIRECTORY_SEPARATOR;
                 }
 
@@ -229,16 +252,13 @@ class Builder
             }
         }
 
-        $original = array_keys($files);
+        $original = $coverage->coveredFiles();
         $max      = count($original);
 
         for ($i = 0; $i < $max; $i++) {
-            $files[implode('/', $paths[$i])] = $files[$original[$i]];
-            unset($files[$original[$i]]);
+            $coverage->renameFile($original[$i], implode(DIRECTORY_SEPARATOR, $paths[$i]));
         }
 
-        ksort($files);
-
         return substr($commonPath, 0, -1);
     }
 }