upgrade to laravel 8.x

vendor/phpunit/php-code-coverage/src/Report/Clover.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,31 +9,40 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report;
 
+use function count;
+use function dirname;
+use function file_put_contents;
+use function is_string;
+use function ksort;
+use function max;
+use function range;
+use function time;
+use DOMDocument;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\Directory;
+use SebastianBergmann\CodeCoverage\Driver\WriteOperationFailedException;
 use SebastianBergmann\CodeCoverage\Node\File;
-use SebastianBergmann\CodeCoverage\RuntimeException;
 
-/**
- * Generates a Clover XML logfile from a code coverage object.
- */
 final class Clover
 {
     /**
-     * @throws \RuntimeException
+     * @throws WriteOperationFailedException
      */
     public function process(CodeCoverage $coverage, ?string $target = null, ?string $name = null): string
     {
-        $xmlDocument               = new \DOMDocument('1.0', 'UTF-8');
+        $time = (string) time();
+
+        $xmlDocument               = new DOMDocument('1.0', 'UTF-8');
         $xmlDocument->formatOutput = true;
 
         $xmlCoverage = $xmlDocument->createElement('coverage');
-        $xmlCoverage->setAttribute('generated', (string) $_SERVER['REQUEST_TIME']);
+        $xmlCoverage->setAttribute('generated', $time);
         $xmlDocument->appendChild($xmlCoverage);
 
         $xmlProject = $xmlDocument->createElement('project');
-        $xmlProject->setAttribute('timestamp', (string) $_SERVER['REQUEST_TIME']);
+        $xmlProject->setAttribute('timestamp', $time);
 
-        if (\is_string($name)) {
+        if (is_string($name)) {
             $xmlProject->setAttribute('name', $name);
         }
 
@@ -50,10 +59,10 @@ final class Clover
             /* @var File $item */
 
             $xmlFile = $xmlDocument->createElement('file');
-            $xmlFile->setAttribute('name', $item->getPath());
+            $xmlFile->setAttribute('name', $item->pathAsString());
 
-            $classes      = $item->getClassesAndTraits();
-            $coverageData = $item->getCoverageData();
+            $classes      = $item->classesAndTraits();
+            $coverageData = $item->lineCoverageData();
             $lines        = [];
             $namespace    = 'global';
 
@@ -78,19 +87,19 @@ final class Clover
 
                     $methodCount = 0;
 
-                    foreach (\range($method['startLine'], $method['endLine']) as $line) {
+                    foreach (range($method['startLine'], $method['endLine']) as $line) {
                         if (isset($coverageData[$line]) && ($coverageData[$line] !== null)) {
-                            $methodCount = \max($methodCount, \count($coverageData[$line]));
+                            $methodCount = max($methodCount, count($coverageData[$line]));
                         }
                     }
 
                     $lines[$method['startLine']] = [
-                        'ccn'         => $method['ccn'],
-                        'count'       => $methodCount,
-                        'crap'        => $method['crap'],
-                        'type'        => 'method',
-                        'visibility'  => $method['visibility'],
-                        'name'        => $methodName,
+                        'ccn'        => $method['ccn'],
+                        'count'      => $methodCount,
+                        'crap'       => $method['crap'],
+                        'type'       => 'method',
+                        'visibility' => $method['visibility'],
+                        'name'       => $methodName,
                     ];
                 }
 
@@ -136,12 +145,12 @@ final class Clover
                 $xmlMetrics->setAttribute('complexity', (string) $class['ccn']);
                 $xmlMetrics->setAttribute('methods', (string) $classMethods);
                 $xmlMetrics->setAttribute('coveredmethods', (string) $coveredMethods);
-                $xmlMetrics->setAttribute('conditionals', '0');
-                $xmlMetrics->setAttribute('coveredconditionals', '0');
+                $xmlMetrics->setAttribute('conditionals', (string) $class['executableBranches']);
+                $xmlMetrics->setAttribute('coveredconditionals', (string) $class['executedBranches']);
                 $xmlMetrics->setAttribute('statements', (string) $classStatements);
                 $xmlMetrics->setAttribute('coveredstatements', (string) $coveredClassStatements);
-                $xmlMetrics->setAttribute('elements', (string) ($classMethods + $classStatements /* + conditionals */));
-                $xmlMetrics->setAttribute('coveredelements', (string) ($coveredMethods + $coveredClassStatements /* + coveredconditionals */));
+                $xmlMetrics->setAttribute('elements', (string) ($classMethods + $classStatements + $class['executableBranches']));
+                $xmlMetrics->setAttribute('coveredelements', (string) ($coveredMethods + $coveredClassStatements + $class['executedBranches']));
                 $xmlClass->appendChild($xmlMetrics);
             }
 
@@ -151,11 +160,11 @@ final class Clover
                 }
 
                 $lines[$line] = [
-                    'count' => \count($data), 'type' => 'stmt',
+                    'count' => count($data), 'type' => 'stmt',
                 ];
             }
 
-            \ksort($lines);
+            ksort($lines);
 
             foreach ($lines as $line => $data) {
                 $xmlLine = $xmlDocument->createElement('line');
@@ -182,20 +191,20 @@ final class Clover
                 $xmlFile->appendChild($xmlLine);
             }
 
-            $linesOfCode = $item->getLinesOfCode();
+            $linesOfCode = $item->linesOfCode();
 
             $xmlMetrics = $xmlDocument->createElement('metrics');
-            $xmlMetrics->setAttribute('loc', (string) $linesOfCode['loc']);
-            $xmlMetrics->setAttribute('ncloc', (string) $linesOfCode['ncloc']);
-            $xmlMetrics->setAttribute('classes', (string) $item->getNumClassesAndTraits());
-            $xmlMetrics->setAttribute('methods', (string) $item->getNumMethods());
-            $xmlMetrics->setAttribute('coveredmethods', (string) $item->getNumTestedMethods());
-            $xmlMetrics->setAttribute('conditionals', '0');
-            $xmlMetrics->setAttribute('coveredconditionals', '0');
-            $xmlMetrics->setAttribute('statements', (string) $item->getNumExecutableLines());
-            $xmlMetrics->setAttribute('coveredstatements', (string) $item->getNumExecutedLines());
-            $xmlMetrics->setAttribute('elements', (string) ($item->getNumMethods() + $item->getNumExecutableLines() /* + conditionals */));
-            $xmlMetrics->setAttribute('coveredelements', (string) ($item->getNumTestedMethods() + $item->getNumExecutedLines() /* + coveredconditionals */));
+            $xmlMetrics->setAttribute('loc', (string) $linesOfCode->linesOfCode());
+            $xmlMetrics->setAttribute('ncloc', (string) $linesOfCode->nonCommentLinesOfCode());
+            $xmlMetrics->setAttribute('classes', (string) $item->numberOfClassesAndTraits());
+            $xmlMetrics->setAttribute('methods', (string) $item->numberOfMethods());
+            $xmlMetrics->setAttribute('coveredmethods', (string) $item->numberOfTestedMethods());
+            $xmlMetrics->setAttribute('conditionals', (string) $item->numberOfExecutableBranches());
+            $xmlMetrics->setAttribute('coveredconditionals', (string) $item->numberOfExecutedBranches());
+            $xmlMetrics->setAttribute('statements', (string) $item->numberOfExecutableLines());
+            $xmlMetrics->setAttribute('coveredstatements', (string) $item->numberOfExecutedLines());
+            $xmlMetrics->setAttribute('elements', (string) ($item->numberOfMethods() + $item->numberOfExecutableLines() + $item->numberOfExecutableBranches()));
+            $xmlMetrics->setAttribute('coveredelements', (string) ($item->numberOfTestedMethods() + $item->numberOfExecutedLines() + $item->numberOfExecutedBranches()));
             $xmlFile->appendChild($xmlMetrics);
 
             if ($namespace === 'global') {
@@ -214,45 +223,33 @@ final class Clover
             }
         }
 
-        $linesOfCode = $report->getLinesOfCode();
+        $linesOfCode = $report->linesOfCode();
 
         $xmlMetrics = $xmlDocument->createElement('metrics');
-        $xmlMetrics->setAttribute('files', (string) \count($report));
-        $xmlMetrics->setAttribute('loc', (string) $linesOfCode['loc']);
-        $xmlMetrics->setAttribute('ncloc', (string) $linesOfCode['ncloc']);
-        $xmlMetrics->setAttribute('classes', (string) $report->getNumClassesAndTraits());
-        $xmlMetrics->setAttribute('methods', (string) $report->getNumMethods());
-        $xmlMetrics->setAttribute('coveredmethods', (string) $report->getNumTestedMethods());
-        $xmlMetrics->setAttribute('conditionals', '0');
-        $xmlMetrics->setAttribute('coveredconditionals', '0');
-        $xmlMetrics->setAttribute('statements', (string) $report->getNumExecutableLines());
-        $xmlMetrics->setAttribute('coveredstatements', (string) $report->getNumExecutedLines());
-        $xmlMetrics->setAttribute('elements', (string) ($report->getNumMethods() + $report->getNumExecutableLines() /* + conditionals */));
-        $xmlMetrics->setAttribute('coveredelements', (string) ($report->getNumTestedMethods() + $report->getNumExecutedLines() /* + coveredconditionals */));
+        $xmlMetrics->setAttribute('files', (string) count($report));
+        $xmlMetrics->setAttribute('loc', (string) $linesOfCode->linesOfCode());
+        $xmlMetrics->setAttribute('ncloc', (string) $linesOfCode->nonCommentLinesOfCode());
+        $xmlMetrics->setAttribute('classes', (string) $report->numberOfClassesAndTraits());
+        $xmlMetrics->setAttribute('methods', (string) $report->numberOfMethods());
+        $xmlMetrics->setAttribute('coveredmethods', (string) $report->numberOfTestedMethods());
+        $xmlMetrics->setAttribute('conditionals', (string) $report->numberOfExecutableBranches());
+        $xmlMetrics->setAttribute('coveredconditionals', (string) $report->numberOfExecutedBranches());
+        $xmlMetrics->setAttribute('statements', (string) $report->numberOfExecutableLines());
+        $xmlMetrics->setAttribute('coveredstatements', (string) $report->numberOfExecutedLines());
+        $xmlMetrics->setAttribute('elements', (string) ($report->numberOfMethods() + $report->numberOfExecutableLines() + $report->numberOfExecutableBranches()));
+        $xmlMetrics->setAttribute('coveredelements', (string) ($report->numberOfTestedMethods() + $report->numberOfExecutedLines() + $report->numberOfExecutedBranches()));
         $xmlProject->appendChild($xmlMetrics);
 
         $buffer = $xmlDocument->saveXML();
 
         if ($target !== null) {
-            if (!$this->createDirectory(\dirname($target))) {
-                throw new \RuntimeException(\sprintf('Directory "%s" was not created', \dirname($target)));
-            }
+            Directory::create(dirname($target));
 
-            if (@\file_put_contents($target, $buffer) === false) {
-                throw new RuntimeException(
-                    \sprintf(
-                        'Could not write to "%s',
-                        $target
-                    )
-                );
+            if (@file_put_contents($target, $buffer) === false) {
+                throw new WriteOperationFailedException($target);
             }
         }
 
         return $buffer;
     }
-
-    private function createDirectory(string $directory): bool
-    {
-        return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
-    }
 }

vendor/phpunit/php-code-coverage/src/Report/Cobertura.php

@@ -0,0 +1,304 @@
+<?php declare(strict_types=1);
+/*
+ * 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\Report;
+
+use function count;
+use function dirname;
+use function file_put_contents;
+use function range;
+use function time;
+use DOMImplementation;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\Directory;
+use SebastianBergmann\CodeCoverage\Driver\WriteOperationFailedException;
+use SebastianBergmann\CodeCoverage\Node\File;
+
+final class Cobertura
+{
+    /**
+     * @throws WriteOperationFailedException
+     */
+    public function process(CodeCoverage $coverage, ?string $target = null, ?string $name = null): string
+    {
+        $time = (string) time();
+
+        $report = $coverage->getReport();
+
+        $implementation = new DOMImplementation;
+
+        $documentType = $implementation->createDocumentType(
+            'coverage',
+            '',
+            'http://cobertura.sourceforge.net/xml/coverage-04.dtd'
+        );
+
+        $document               = $implementation->createDocument('', '', $documentType);
+        $document->xmlVersion   = '1.0';
+        $document->encoding     = 'UTF-8';
+        $document->formatOutput = true;
+
+        $coverageElement = $document->createElement('coverage');
+
+        $linesValid   = $report->numberOfExecutableLines();
+        $linesCovered = $report->numberOfExecutedLines();
+        $lineRate     = $linesValid === 0 ? 0 : ($linesCovered / $linesValid);
+        $coverageElement->setAttribute('line-rate', (string) $lineRate);
+
+        $branchesValid   = $report->numberOfExecutableBranches();
+        $branchesCovered = $report->numberOfExecutedBranches();
+        $branchRate      = $branchesValid === 0 ? 0 : ($branchesCovered / $branchesValid);
+        $coverageElement->setAttribute('branch-rate', (string) $branchRate);
+
+        $coverageElement->setAttribute('lines-covered', (string) $report->numberOfExecutedLines());
+        $coverageElement->setAttribute('lines-valid', (string) $report->numberOfExecutableLines());
+        $coverageElement->setAttribute('branches-covered', (string) $report->numberOfExecutedBranches());
+        $coverageElement->setAttribute('branches-valid', (string) $report->numberOfExecutableBranches());
+        $coverageElement->setAttribute('complexity', '');
+        $coverageElement->setAttribute('version', '0.4');
+        $coverageElement->setAttribute('timestamp', $time);
+
+        $document->appendChild($coverageElement);
+
+        $sourcesElement = $document->createElement('sources');
+        $coverageElement->appendChild($sourcesElement);
+
+        $sourceElement = $document->createElement('source', $report->pathAsString());
+        $sourcesElement->appendChild($sourceElement);
+
+        $packagesElement = $document->createElement('packages');
+        $coverageElement->appendChild($packagesElement);
+
+        $complexity = 0;
+
+        foreach ($report as $item) {
+            if (!$item instanceof File) {
+                continue;
+            }
+
+            $packageElement    = $document->createElement('package');
+            $packageComplexity = 0;
+            $packageName       = $name ?? '';
+
+            $packageElement->setAttribute('name', $packageName);
+
+            $linesValid   = $item->numberOfExecutableLines();
+            $linesCovered = $item->numberOfExecutedLines();
+            $lineRate     = $linesValid === 0 ? 0 : ($linesCovered / $linesValid);
+
+            $packageElement->setAttribute('line-rate', (string) $lineRate);
+
+            $branchesValid   = $item->numberOfExecutableBranches();
+            $branchesCovered = $item->numberOfExecutedBranches();
+            $branchRate      = $branchesValid === 0 ? 0 : ($branchesCovered / $branchesValid);
+
+            $packageElement->setAttribute('branch-rate', (string) $branchRate);
+
+            $packageElement->setAttribute('complexity', '');
+            $packagesElement->appendChild($packageElement);
+
+            $classesElement = $document->createElement('classes');
+
+            $packageElement->appendChild($classesElement);
+
+            $classes      = $item->classesAndTraits();
+            $coverageData = $item->lineCoverageData();
+
+            foreach ($classes as $className => $class) {
+                $complexity += $class['ccn'];
+                $packageComplexity += $class['ccn'];
+
+                if (!empty($class['package']['namespace'])) {
+                    $className = $class['package']['namespace'] . '\\' . $className;
+                }
+
+                $linesValid   = $class['executableLines'];
+                $linesCovered = $class['executedLines'];
+                $lineRate     = $linesValid === 0 ? 0 : ($linesCovered / $linesValid);
+
+                $branchesValid   = $class['executableBranches'];
+                $branchesCovered = $class['executedBranches'];
+                $branchRate      = $branchesValid === 0 ? 0 : ($branchesCovered / $branchesValid);
+
+                $classElement = $document->createElement('class');
+
+                $classElement->setAttribute('name', $className);
+                $classElement->setAttribute('filename', str_replace($report->pathAsString() . DIRECTORY_SEPARATOR, '', $item->pathAsString()));
+                $classElement->setAttribute('line-rate', (string) $lineRate);
+                $classElement->setAttribute('branch-rate', (string) $branchRate);
+                $classElement->setAttribute('complexity', (string) $class['ccn']);
+
+                $classesElement->appendChild($classElement);
+
+                $methodsElement = $document->createElement('methods');
+
+                $classElement->appendChild($methodsElement);
+
+                $classLinesElement = $document->createElement('lines');
+
+                $classElement->appendChild($classLinesElement);
+
+                foreach ($class['methods'] as $methodName => $method) {
+                    if ($method['executableLines'] === 0) {
+                        continue;
+                    }
+
+                    preg_match("/\((.*?)\)/", $method['signature'], $signature);
+
+                    $linesValid   = $method['executableLines'];
+                    $linesCovered = $method['executedLines'];
+                    $lineRate     = $linesValid === 0 ? 0 : ($linesCovered / $linesValid);
+
+                    $branchesValid   = $method['executableBranches'];
+                    $branchesCovered = $method['executedBranches'];
+                    $branchRate      = $branchesValid === 0 ? 0 : ($branchesCovered / $branchesValid);
+
+                    $methodElement = $document->createElement('method');
+
+                    $methodElement->setAttribute('name', $methodName);
+                    $methodElement->setAttribute('signature', $signature[1]);
+                    $methodElement->setAttribute('line-rate', (string) $lineRate);
+                    $methodElement->setAttribute('branch-rate', (string) $branchRate);
+                    $methodElement->setAttribute('complexity', (string) $method['ccn']);
+
+                    $methodLinesElement = $document->createElement('lines');
+
+                    $methodElement->appendChild($methodLinesElement);
+
+                    foreach (range($method['startLine'], $method['endLine']) as $line) {
+                        if (!isset($coverageData[$line]) || $coverageData[$line] === null) {
+                            continue;
+                        }
+                        $methodLineElement = $document->createElement('line');
+
+                        $methodLineElement->setAttribute('number', (string) $line);
+                        $methodLineElement->setAttribute('hits', (string) count($coverageData[$line]));
+
+                        $methodLinesElement->appendChild($methodLineElement);
+
+                        $classLineElement = $methodLineElement->cloneNode();
+
+                        $classLinesElement->appendChild($classLineElement);
+                    }
+
+                    $methodsElement->appendChild($methodElement);
+                }
+            }
+
+            if ($report->numberOfFunctions() === 0) {
+                $packageElement->setAttribute('complexity', (string) $packageComplexity);
+
+                continue;
+            }
+
+            $functionsComplexity      = 0;
+            $functionsLinesValid      = 0;
+            $functionsLinesCovered    = 0;
+            $functionsBranchesValid   = 0;
+            $functionsBranchesCovered = 0;
+
+            $classElement = $document->createElement('class');
+            $classElement->setAttribute('name', basename($item->pathAsString()));
+            $classElement->setAttribute('filename', str_replace($report->pathAsString() . DIRECTORY_SEPARATOR, '', $item->pathAsString()));
+
+            $methodsElement = $document->createElement('methods');
+
+            $classElement->appendChild($methodsElement);
+
+            $classLinesElement = $document->createElement('lines');
+
+            $classElement->appendChild($classLinesElement);
+
+            $functions = $report->functions();
+
+            foreach ($functions as $functionName => $function) {
+                if ($function['executableLines'] === 0) {
+                    continue;
+                }
+
+                $complexity += $function['ccn'];
+                $packageComplexity += $function['ccn'];
+                $functionsComplexity += $function['ccn'];
+
+                $linesValid   = $function['executableLines'];
+                $linesCovered = $function['executedLines'];
+                $lineRate     = $linesValid === 0 ? 0 : ($linesCovered / $linesValid);
+
+                $functionsLinesValid += $linesValid;
+                $functionsLinesCovered += $linesCovered;
+
+                $branchesValid   = $function['executableBranches'];
+                $branchesCovered = $function['executedBranches'];
+                $branchRate      = $branchesValid === 0 ? 0 : ($branchesCovered / $branchesValid);
+
+                $functionsBranchesValid += $branchesValid;
+                $functionsBranchesCovered += $branchesValid;
+
+                $methodElement = $document->createElement('method');
+
+                $methodElement->setAttribute('name', $functionName);
+                $methodElement->setAttribute('signature', $function['signature']);
+                $methodElement->setAttribute('line-rate', (string) $lineRate);
+                $methodElement->setAttribute('branch-rate', (string) $branchRate);
+                $methodElement->setAttribute('complexity', (string) $function['ccn']);
+
+                $methodLinesElement = $document->createElement('lines');
+
+                $methodElement->appendChild($methodLinesElement);
+
+                foreach (range($function['startLine'], $function['endLine']) as $line) {
+                    if (!isset($coverageData[$line]) || $coverageData[$line] === null) {
+                        continue;
+                    }
+                    $methodLineElement = $document->createElement('line');
+
+                    $methodLineElement->setAttribute('number', (string) $line);
+                    $methodLineElement->setAttribute('hits', (string) count($coverageData[$line]));
+
+                    $methodLinesElement->appendChild($methodLineElement);
+
+                    $classLineElement = $methodLineElement->cloneNode();
+
+                    $classLinesElement->appendChild($classLineElement);
+                }
+
+                $methodsElement->appendChild($methodElement);
+            }
+
+            $packageElement->setAttribute('complexity', (string) $packageComplexity);
+
+            if ($functionsLinesValid === 0) {
+                continue;
+            }
+
+            $lineRate   = $functionsLinesCovered / $functionsLinesValid;
+            $branchRate = $functionsBranchesValid === 0 ? 0 : ($functionsBranchesCovered / $functionsBranchesValid);
+
+            $classElement->setAttribute('line-rate', (string) $lineRate);
+            $classElement->setAttribute('branch-rate', (string) $branchRate);
+            $classElement->setAttribute('complexity', (string) $functionsComplexity);
+
+            $classesElement->appendChild($classElement);
+        }
+
+        $coverageElement->setAttribute('complexity', (string) $complexity);
+
+        $buffer = $document->saveXML();
+
+        if ($target !== null) {
+            Directory::create(dirname($target));
+
+            if (@file_put_contents($target, $buffer) === false) {
+                throw new WriteOperationFailedException($target);
+            }
+        }
+
+        return $buffer;
+    }
+}

vendor/phpunit/php-code-coverage/src/Report/Crap4j.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,9 +9,17 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report;
 
+use function date;
+use function dirname;
+use function file_put_contents;
+use function htmlspecialchars;
+use function is_string;
+use function round;
+use DOMDocument;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\Directory;
+use SebastianBergmann\CodeCoverage\Driver\WriteOperationFailedException;
 use SebastianBergmann\CodeCoverage\Node\File;
-use SebastianBergmann\CodeCoverage\RuntimeException;
 
 final class Crap4j
 {
@@ -26,19 +34,19 @@ final class Crap4j
     }
 
     /**
-     * @throws \RuntimeException
+     * @throws WriteOperationFailedException
      */
     public function process(CodeCoverage $coverage, ?string $target = null, ?string $name = null): string
     {
-        $document               = new \DOMDocument('1.0', 'UTF-8');
+        $document               = new DOMDocument('1.0', 'UTF-8');
         $document->formatOutput = true;
 
         $root = $document->createElement('crap_result');
         $document->appendChild($root);
 
-        $project = $document->createElement('project', \is_string($name) ? $name : '');
+        $project = $document->createElement('project', is_string($name) ? $name : '');
         $root->appendChild($project);
-        $root->appendChild($document->createElement('timestamp', \date('Y-m-d H:i:s', $_SERVER['REQUEST_TIME'])));
+        $root->appendChild($document->createElement('timestamp', date('Y-m-d H:i:s')));
 
         $stats       = $document->createElement('stats');
         $methodsNode = $document->createElement('methods');
@@ -59,13 +67,13 @@ final class Crap4j
             }
 
             $file = $document->createElement('file');
-            $file->setAttribute('name', $item->getPath());
+            $file->setAttribute('name', $item->pathAsString());
 
-            $classes = $item->getClassesAndTraits();
+            $classes = $item->classesAndTraits();
 
             foreach ($classes as $className => $class) {
                 foreach ($class['methods'] as $methodName => $method) {
-                    $crapLoad = $this->getCrapLoad($method['crap'], $method['ccn'], $method['coverage']);
+                    $crapLoad = $this->crapLoad((float) $method['crap'], $method['ccn'], $method['coverage']);
 
                     $fullCrap += $method['crap'];
                     $fullCrapLoad += $crapLoad;
@@ -77,19 +85,19 @@ final class Crap4j
 
                     $methodNode = $document->createElement('method');
 
-                    if (!empty($class['package']['namespace'])) {
-                        $namespace = $class['package']['namespace'];
+                    if (!empty($class['namespace'])) {
+                        $namespace = $class['namespace'];
                     }
 
                     $methodNode->appendChild($document->createElement('package', $namespace));
                     $methodNode->appendChild($document->createElement('className', $className));
                     $methodNode->appendChild($document->createElement('methodName', $methodName));
-                    $methodNode->appendChild($document->createElement('methodSignature', \htmlspecialchars($method['signature'])));
-                    $methodNode->appendChild($document->createElement('fullMethod', \htmlspecialchars($method['signature'])));
-                    $methodNode->appendChild($document->createElement('crap', (string) $this->roundValue($method['crap'])));
+                    $methodNode->appendChild($document->createElement('methodSignature', htmlspecialchars($method['signature'])));
+                    $methodNode->appendChild($document->createElement('fullMethod', htmlspecialchars($method['signature'])));
+                    $methodNode->appendChild($document->createElement('crap', (string) $this->roundValue((float) $method['crap'])));
                     $methodNode->appendChild($document->createElement('complexity', (string) $method['ccn']));
                     $methodNode->appendChild($document->createElement('coverage', (string) $this->roundValue($method['coverage'])));
-                    $methodNode->appendChild($document->createElement('crapLoad', (string) \round($crapLoad)));
+                    $methodNode->appendChild($document->createElement('crapLoad', (string) round($crapLoad)));
 
                     $methodsNode->appendChild($methodNode);
                 }
@@ -99,7 +107,7 @@ final class Crap4j
         $stats->appendChild($document->createElement('name', 'Method Crap Stats'));
         $stats->appendChild($document->createElement('methodCount', (string) $fullMethodCount));
         $stats->appendChild($document->createElement('crapMethodCount', (string) $fullCrapMethodCount));
-        $stats->appendChild($document->createElement('crapLoad', (string) \round($fullCrapLoad)));
+        $stats->appendChild($document->createElement('crapLoad', (string) round($fullCrapLoad)));
         $stats->appendChild($document->createElement('totalCrap', (string) $fullCrap));
 
         $crapMethodPercent = 0;
@@ -116,29 +124,17 @@ final class Crap4j
         $buffer = $document->saveXML();
 
         if ($target !== null) {
-            if (!$this->createDirectory(\dirname($target))) {
-                throw new \RuntimeException(\sprintf('Directory "%s" was not created', \dirname($target)));
-            }
+            Directory::create(dirname($target));
 
-            if (@\file_put_contents($target, $buffer) === false) {
-                throw new RuntimeException(
-                    \sprintf(
-                        'Could not write to "%s',
-                        $target
-                    )
-                );
+            if (@file_put_contents($target, $buffer) === false) {
+                throw new WriteOperationFailedException($target);
             }
         }
 
         return $buffer;
     }
 
-    /**
-     * @param float $crapValue
-     * @param int   $cyclomaticComplexity
-     * @param float $coveragePercent
-     */
-    private function getCrapLoad($crapValue, $cyclomaticComplexity, $coveragePercent): float
+    private function crapLoad(float $crapValue, int $cyclomaticComplexity, float $coveragePercent): float
     {
         $crapLoad = 0;
 
@@ -150,16 +146,8 @@ final class Crap4j
         return $crapLoad;
     }
 
-    /**
-     * @param float $value
-     */
-    private function roundValue($value): float
+    private function roundValue(float $value): float
     {
-        return \round($value, 2);
-    }
-
-    private function createDirectory(string $directory): bool
-    {
-        return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
+        return round($value, 2);
     }
 }

vendor/phpunit/php-code-coverage/src/Report/Html/Facade.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,13 +9,15 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Html;
 
+use const DIRECTORY_SEPARATOR;
+use function copy;
+use function date;
+use function dirname;
+use function substr;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\Directory as DirectoryUtil;
 use SebastianBergmann\CodeCoverage\Node\Directory as DirectoryNode;
-use SebastianBergmann\CodeCoverage\RuntimeException;
 
-/**
- * Generates an HTML report from a code coverage object.
- */
 final class Facade
 {
     /**
@@ -46,28 +48,19 @@ final class Facade
         $this->templatePath   = __DIR__ . '/Renderer/Template/';
     }
 
-    /**
-     * @throws RuntimeException
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
-     */
     public function process(CodeCoverage $coverage, string $target): void
     {
-        $target = $this->getDirectory($target);
+        $target = $this->directory($target);
         $report = $coverage->getReport();
-
-        if (!isset($_SERVER['REQUEST_TIME'])) {
-            $_SERVER['REQUEST_TIME'] = \time();
-        }
-
-        $date = \date('D M j G:i:s T Y', $_SERVER['REQUEST_TIME']);
+        $date   = date('D M j G:i:s T Y');
 
         $dashboard = new Dashboard(
             $this->templatePath,
             $this->generator,
             $date,
             $this->lowUpperBound,
-            $this->highLowerBound
+            $this->highLowerBound,
+            $coverage->collectsBranchAndPathCoverage()
         );
 
         $directory = new Directory(
@@ -75,7 +68,8 @@ final class Facade
             $this->generator,
             $date,
             $this->lowUpperBound,
-            $this->highLowerBound
+            $this->highLowerBound,
+            $coverage->collectsBranchAndPathCoverage()
         );
 
         $file = new File(
@@ -83,85 +77,64 @@ final class Facade
             $this->generator,
             $date,
             $this->lowUpperBound,
-            $this->highLowerBound
+            $this->highLowerBound,
+            $coverage->collectsBranchAndPathCoverage()
         );
 
         $directory->render($report, $target . 'index.html');
         $dashboard->render($report, $target . 'dashboard.html');
 
         foreach ($report as $node) {
-            $id = $node->getId();
+            $id = $node->id();
 
             if ($node instanceof DirectoryNode) {
-                if (!$this->createDirectory($target . $id)) {
-                    throw new \RuntimeException(\sprintf('Directory "%s" was not created', $target . $id));
-                }
+                DirectoryUtil::create($target . $id);
 
                 $directory->render($node, $target . $id . '/index.html');
                 $dashboard->render($node, $target . $id . '/dashboard.html');
             } else {
-                $dir = \dirname($target . $id);
+                $dir = dirname($target . $id);
 
-                if (!$this->createDirectory($dir)) {
-                    throw new \RuntimeException(\sprintf('Directory "%s" was not created', $dir));
-                }
+                DirectoryUtil::create($dir);
 
-                $file->render($node, $target . $id . '.html');
+                $file->render($node, $target . $id);
             }
         }
 
         $this->copyFiles($target);
     }
 
-    /**
-     * @throws RuntimeException
-     */
     private function copyFiles(string $target): void
     {
-        $dir = $this->getDirectory($target . '_css');
+        $dir = $this->directory($target . '_css');
 
-        \copy($this->templatePath . 'css/bootstrap.min.css', $dir . 'bootstrap.min.css');
-        \copy($this->templatePath . 'css/nv.d3.min.css', $dir . 'nv.d3.min.css');
-        \copy($this->templatePath . 'css/style.css', $dir . 'style.css');
-        \copy($this->templatePath . 'css/custom.css', $dir . 'custom.css');
-        \copy($this->templatePath . 'css/octicons.css', $dir . 'octicons.css');
+        copy($this->templatePath . 'css/bootstrap.min.css', $dir . 'bootstrap.min.css');
+        copy($this->templatePath . 'css/nv.d3.min.css', $dir . 'nv.d3.min.css');
+        copy($this->templatePath . 'css/style.css', $dir . 'style.css');
+        copy($this->templatePath . 'css/custom.css', $dir . 'custom.css');
+        copy($this->templatePath . 'css/octicons.css', $dir . 'octicons.css');
 
-        $dir = $this->getDirectory($target . '_icons');
-        \copy($this->templatePath . 'icons/file-code.svg', $dir . 'file-code.svg');
-        \copy($this->templatePath . 'icons/file-directory.svg', $dir . 'file-directory.svg');
+        $dir = $this->directory($target . '_icons');
+        copy($this->templatePath . 'icons/file-code.svg', $dir . 'file-code.svg');
+        copy($this->templatePath . 'icons/file-directory.svg', $dir . 'file-directory.svg');
 
-        $dir = $this->getDirectory($target . '_js');
-        \copy($this->templatePath . 'js/bootstrap.min.js', $dir . 'bootstrap.min.js');
-        \copy($this->templatePath . 'js/popper.min.js', $dir . 'popper.min.js');
-        \copy($this->templatePath . 'js/d3.min.js', $dir . 'd3.min.js');
-        \copy($this->templatePath . 'js/jquery.min.js', $dir . 'jquery.min.js');
-        \copy($this->templatePath . 'js/nv.d3.min.js', $dir . 'nv.d3.min.js');
-        \copy($this->templatePath . 'js/file.js', $dir . 'file.js');
+        $dir = $this->directory($target . '_js');
+        copy($this->templatePath . 'js/bootstrap.min.js', $dir . 'bootstrap.min.js');
+        copy($this->templatePath . 'js/popper.min.js', $dir . 'popper.min.js');
+        copy($this->templatePath . 'js/d3.min.js', $dir . 'd3.min.js');
+        copy($this->templatePath . 'js/jquery.min.js', $dir . 'jquery.min.js');
+        copy($this->templatePath . 'js/nv.d3.min.js', $dir . 'nv.d3.min.js');
+        copy($this->templatePath . 'js/file.js', $dir . 'file.js');
     }
 
-    /**
-     * @throws RuntimeException
-     */
-    private function getDirectory(string $directory): string
+    private function directory(string $directory): string
     {
-        if (\substr($directory, -1, 1) != \DIRECTORY_SEPARATOR) {
-            $directory .= \DIRECTORY_SEPARATOR;
+        if (substr($directory, -1, 1) != DIRECTORY_SEPARATOR) {
+            $directory .= DIRECTORY_SEPARATOR;
         }
 
-        if (!$this->createDirectory($directory)) {
-            throw new RuntimeException(
-                \sprintf(
-                    'Directory "%s" does not exist.',
-                    $directory
-                )
-            );
-        }
+        DirectoryUtil::create($directory);
 
         return $directory;
     }
-
-    private function createDirectory(string $directory): bool
-    {
-        return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
-    }
 }

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

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,14 +9,21 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Html;
 
+use function array_pop;
+use function count;
+use function phpversion;
+use function sprintf;
+use function str_repeat;
+use function substr_count;
 use SebastianBergmann\CodeCoverage\Node\AbstractNode;
 use SebastianBergmann\CodeCoverage\Node\Directory as DirectoryNode;
 use SebastianBergmann\CodeCoverage\Node\File as FileNode;
 use SebastianBergmann\CodeCoverage\Version;
 use SebastianBergmann\Environment\Runtime;
+use SebastianBergmann\Template\Template;
 
 /**
- * Base class for node renderers.
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
  */
 abstract class Renderer
 {
@@ -45,32 +52,38 @@ abstract class Renderer
      */
     protected $highLowerBound;
 
+    /**
+     * @var bool
+     */
+    protected $hasBranchCoverage;
+
     /**
      * @var string
      */
     protected $version;
 
-    public function __construct(string $templatePath, string $generator, string $date, int $lowUpperBound, int $highLowerBound)
+    public function __construct(string $templatePath, string $generator, string $date, int $lowUpperBound, int $highLowerBound, bool $hasBranchCoverage)
     {
-        $this->templatePath   = $templatePath;
-        $this->generator      = $generator;
-        $this->date           = $date;
-        $this->lowUpperBound  = $lowUpperBound;
-        $this->highLowerBound = $highLowerBound;
-        $this->version        = Version::id();
+        $this->templatePath      = $templatePath;
+        $this->generator         = $generator;
+        $this->date              = $date;
+        $this->lowUpperBound     = $lowUpperBound;
+        $this->highLowerBound    = $highLowerBound;
+        $this->version           = Version::id();
+        $this->hasBranchCoverage = $hasBranchCoverage;
     }
 
-    protected function renderItemTemplate(\Text_Template $template, array $data): string
+    protected function renderItemTemplate(Template $template, array $data): string
     {
-        $numSeparator  = '&nbsp;/&nbsp;';
+        $numSeparator = '&nbsp;/&nbsp;';
 
         if (isset($data['numClasses']) && $data['numClasses'] > 0) {
-            $classesLevel = $this->getColorLevel($data['testedClassesPercent']);
+            $classesLevel = $this->colorLevel($data['testedClassesPercent']);
 
             $classesNumber = $data['numTestedClasses'] . $numSeparator .
                 $data['numClasses'];
 
-            $classesBar = $this->getCoverageBar(
+            $classesBar = $this->coverageBar(
                 $data['testedClassesPercent']
             );
         } else {
@@ -81,12 +94,12 @@ abstract class Renderer
         }
 
         if ($data['numMethods'] > 0) {
-            $methodsLevel = $this->getColorLevel($data['testedMethodsPercent']);
+            $methodsLevel = $this->colorLevel($data['testedMethodsPercent']);
 
             $methodsNumber = $data['numTestedMethods'] . $numSeparator .
                 $data['numMethods'];
 
-            $methodsBar = $this->getCoverageBar(
+            $methodsBar = $this->coverageBar(
                 $data['testedMethodsPercent']
             );
         } else {
@@ -97,12 +110,12 @@ abstract class Renderer
         }
 
         if ($data['numExecutableLines'] > 0) {
-            $linesLevel = $this->getColorLevel($data['linesExecutedPercent']);
+            $linesLevel = $this->colorLevel($data['linesExecutedPercent']);
 
             $linesNumber = $data['numExecutedLines'] . $numSeparator .
                 $data['numExecutableLines'];
 
-            $linesBar = $this->getCoverageBar(
+            $linesBar = $this->coverageBar(
                 $data['linesExecutedPercent']
             );
         } else {
@@ -112,40 +125,80 @@ abstract class Renderer
             $data['linesExecutedPercentAsString'] = 'n/a';
         }
 
+        if ($data['numExecutablePaths'] > 0) {
+            $pathsLevel = $this->colorLevel($data['pathsExecutedPercent']);
+
+            $pathsNumber = $data['numExecutedPaths'] . $numSeparator .
+                $data['numExecutablePaths'];
+
+            $pathsBar = $this->coverageBar(
+                $data['pathsExecutedPercent']
+            );
+        } else {
+            $pathsLevel                           = '';
+            $pathsNumber                          = '0' . $numSeparator . '0';
+            $pathsBar                             = '';
+            $data['pathsExecutedPercentAsString'] = 'n/a';
+        }
+
+        if ($data['numExecutableBranches'] > 0) {
+            $branchesLevel = $this->colorLevel($data['branchesExecutedPercent']);
+
+            $branchesNumber = $data['numExecutedBranches'] . $numSeparator .
+                $data['numExecutableBranches'];
+
+            $branchesBar = $this->coverageBar(
+                $data['branchesExecutedPercent']
+            );
+        } else {
+            $branchesLevel                           = '';
+            $branchesNumber                          = '0' . $numSeparator . '0';
+            $branchesBar                             = '';
+            $data['branchesExecutedPercentAsString'] = 'n/a';
+        }
+
         $template->setVar(
             [
-                'icon'                   => $data['icon'] ?? '',
-                'crap'                   => $data['crap'] ?? '',
-                'name'                   => $data['name'],
-                'lines_bar'              => $linesBar,
-                'lines_executed_percent' => $data['linesExecutedPercentAsString'],
-                'lines_level'            => $linesLevel,
-                'lines_number'           => $linesNumber,
-                'methods_bar'            => $methodsBar,
-                'methods_tested_percent' => $data['testedMethodsPercentAsString'],
-                'methods_level'          => $methodsLevel,
-                'methods_number'         => $methodsNumber,
-                'classes_bar'            => $classesBar,
-                'classes_tested_percent' => $data['testedClassesPercentAsString'] ?? '',
-                'classes_level'          => $classesLevel,
-                'classes_number'         => $classesNumber,
+                'icon'                      => $data['icon'] ?? '',
+                'crap'                      => $data['crap'] ?? '',
+                'name'                      => $data['name'],
+                'lines_bar'                 => $linesBar,
+                'lines_executed_percent'    => $data['linesExecutedPercentAsString'],
+                'lines_level'               => $linesLevel,
+                'lines_number'              => $linesNumber,
+                'paths_bar'                 => $pathsBar,
+                'paths_executed_percent'    => $data['pathsExecutedPercentAsString'],
+                'paths_level'               => $pathsLevel,
+                'paths_number'              => $pathsNumber,
+                'branches_bar'              => $branchesBar,
+                'branches_executed_percent' => $data['branchesExecutedPercentAsString'],
+                'branches_level'            => $branchesLevel,
+                'branches_number'           => $branchesNumber,
+                'methods_bar'               => $methodsBar,
+                'methods_tested_percent'    => $data['testedMethodsPercentAsString'],
+                'methods_level'             => $methodsLevel,
+                'methods_number'            => $methodsNumber,
+                'classes_bar'               => $classesBar,
+                'classes_tested_percent'    => $data['testedClassesPercentAsString'] ?? '',
+                'classes_level'             => $classesLevel,
+                'classes_number'            => $classesNumber,
             ]
         );
 
         return $template->render();
     }
 
-    protected function setCommonTemplateVariables(\Text_Template $template, AbstractNode $node): void
+    protected function setCommonTemplateVariables(Template $template, AbstractNode $node): void
     {
         $template->setVar(
             [
-                'id'               => $node->getId(),
-                'full_path'        => $node->getPath(),
-                'path_to_root'     => $this->getPathToRoot($node),
-                'breadcrumbs'      => $this->getBreadcrumbs($node),
+                'id'               => $node->id(),
+                'full_path'        => $node->pathAsString(),
+                'path_to_root'     => $this->pathToRoot($node),
+                'breadcrumbs'      => $this->breadcrumbs($node),
                 'date'             => $this->date,
                 'version'          => $this->version,
-                'runtime'          => $this->getRuntimeString(),
+                'runtime'          => $this->runtimeString(),
                 'generator'        => $this->generator,
                 'low_upper_bound'  => $this->lowUpperBound,
                 'high_lower_bound' => $this->highLowerBound,
@@ -153,40 +206,40 @@ abstract class Renderer
         );
     }
 
-    protected function getBreadcrumbs(AbstractNode $node): string
+    protected function breadcrumbs(AbstractNode $node): string
     {
         $breadcrumbs = '';
-        $path        = $node->getPathAsArray();
+        $path        = $node->pathAsArray();
         $pathToRoot  = [];
-        $max         = \count($path);
+        $max         = count($path);
 
         if ($node instanceof FileNode) {
             $max--;
         }
 
         for ($i = 0; $i < $max; $i++) {
-            $pathToRoot[] = \str_repeat('../', $i);
+            $pathToRoot[] = str_repeat('../', $i);
         }
 
         foreach ($path as $step) {
             if ($step !== $node) {
-                $breadcrumbs .= $this->getInactiveBreadcrumb(
+                $breadcrumbs .= $this->inactiveBreadcrumb(
                     $step,
-                    \array_pop($pathToRoot)
+                    array_pop($pathToRoot)
                 );
             } else {
-                $breadcrumbs .= $this->getActiveBreadcrumb($step);
+                $breadcrumbs .= $this->activeBreadcrumb($step);
             }
         }
 
         return $breadcrumbs;
     }
 
-    protected function getActiveBreadcrumb(AbstractNode $node): string
+    protected function activeBreadcrumb(AbstractNode $node): string
     {
-        $buffer = \sprintf(
+        $buffer = sprintf(
             '         <li class="breadcrumb-item active">%s</li>' . "\n",
-            $node->getName()
+            $node->name()
         );
 
         if ($node instanceof DirectoryNode) {
@@ -196,44 +249,45 @@ abstract class Renderer
         return $buffer;
     }
 
-    protected function getInactiveBreadcrumb(AbstractNode $node, string $pathToRoot): string
+    protected function inactiveBreadcrumb(AbstractNode $node, string $pathToRoot): string
     {
-        return \sprintf(
+        return sprintf(
             '         <li class="breadcrumb-item"><a href="%sindex.html">%s</a></li>' . "\n",
             $pathToRoot,
-            $node->getName()
+            $node->name()
         );
     }
 
-    protected function getPathToRoot(AbstractNode $node): string
+    protected function pathToRoot(AbstractNode $node): string
     {
-        $id    = $node->getId();
-        $depth = \substr_count($id, '/');
+        $id    = $node->id();
+        $depth = substr_count($id, '/');
 
         if ($id !== 'index' &&
             $node instanceof DirectoryNode) {
             $depth++;
         }
 
-        return \str_repeat('../', $depth);
+        return str_repeat('../', $depth);
     }
 
-    protected function getCoverageBar(float $percent): string
+    protected function coverageBar(float $percent): string
     {
-        $level = $this->getColorLevel($percent);
+        $level = $this->colorLevel($percent);
 
-        $template = new \Text_Template(
-            $this->templatePath . 'coverage_bar.html',
+        $templateName = $this->templatePath . ($this->hasBranchCoverage ? 'coverage_bar_branch.html' : 'coverage_bar.html');
+        $template     = new Template(
+            $templateName,
             '{{',
             '}}'
         );
 
-        $template->setVar(['level' => $level, 'percent' => \sprintf('%.2F', $percent)]);
+        $template->setVar(['level' => $level, 'percent' => sprintf('%.2F', $percent)]);
 
         return $template->render();
     }
 
-    protected function getColorLevel(float $percent): string
+    protected function colorLevel(float $percent): string
     {
         if ($percent <= $this->lowUpperBound) {
             return 'danger';
@@ -247,28 +301,30 @@ abstract class Renderer
         return 'success';
     }
 
-    private function getRuntimeString(): string
+    private function runtimeString(): string
     {
         $runtime = new Runtime;
 
-        $buffer = \sprintf(
+        $buffer = sprintf(
             '<a href="%s" target="_top">%s %s</a>',
             $runtime->getVendorUrl(),
             $runtime->getName(),
             $runtime->getVersion()
         );
 
-        if ($runtime->hasXdebug() && !$runtime->hasPHPDBGCodeCoverage()) {
-            $buffer .= \sprintf(
-                ' with <a href="https://xdebug.org/">Xdebug %s</a>',
-                \phpversion('xdebug')
-            );
+        if ($runtime->hasPHPDBGCodeCoverage()) {
+            return $buffer;
         }
 
-        if ($runtime->hasPCOV() && !$runtime->hasPHPDBGCodeCoverage()) {
-            $buffer .= \sprintf(
+        if ($runtime->hasPCOV()) {
+            $buffer .= sprintf(
                 ' with <a href="https://github.com/krakjoe/pcov">PCOV %s</a>',
-                \phpversion('pcov')
+                phpversion('pcov')
+            );
+        } elseif ($runtime->hasXdebug()) {
+            $buffer .= sprintf(
+                ' with <a href="https://xdebug.org/">Xdebug %s</a>',
+                phpversion('xdebug')
             );
         }
 

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

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,30 +9,37 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Html;
 
+use function array_values;
+use function arsort;
+use function asort;
+use function count;
+use function explode;
+use function floor;
+use function json_encode;
+use function sprintf;
+use function str_replace;
 use SebastianBergmann\CodeCoverage\Node\AbstractNode;
 use SebastianBergmann\CodeCoverage\Node\Directory as DirectoryNode;
+use SebastianBergmann\Template\Template;
 
 /**
- * Renders the dashboard for a directory node.
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
  */
 final class Dashboard extends Renderer
 {
-    /**
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
-     */
     public function render(DirectoryNode $node, string $file): void
     {
-        $classes  = $node->getClassesAndTraits();
-        $template = new \Text_Template(
-            $this->templatePath . 'dashboard.html',
+        $classes      = $node->classesAndTraits();
+        $templateName = $this->templatePath . ($this->hasBranchCoverage ? 'dashboard_branch.html' : 'dashboard.html');
+        $template     = new Template(
+            $templateName,
             '{{',
             '}}'
         );
 
         $this->setCommonTemplateVariables($template, $node);
 
-        $baseLink             = $node->getId() . '/';
+        $baseLink             = $node->id() . '/';
         $complexity           = $this->complexity($classes, $baseLink);
         $coverageDistribution = $this->coverageDistribution($classes);
         $insufficientCoverage = $this->insufficientCoverage($classes, $baseLink);
@@ -54,10 +61,19 @@ final class Dashboard extends Renderer
         $template->renderTo($file);
     }
 
+    protected function activeBreadcrumb(AbstractNode $node): string
+    {
+        return sprintf(
+            '         <li class="breadcrumb-item"><a href="index.html">%s</a></li>' . "\n" .
+            '         <li class="breadcrumb-item active">(Dashboard)</li>' . "\n",
+            $node->name()
+        );
+    }
+
     /**
      * Returns the data for the Class/Method Complexity charts.
      */
-    protected function complexity(array $classes, string $baseLink): array
+    private function complexity(array $classes, string $baseLink): array
     {
         $result = ['class' => [], 'method' => []];
 
@@ -70,9 +86,9 @@ final class Dashboard extends Renderer
                 $result['method'][] = [
                     $method['coverage'],
                     $method['ccn'],
-                    \sprintf(
+                    sprintf(
                         '<a href="%s">%s</a>',
-                        \str_replace($baseLink, '', $method['link']),
+                        str_replace($baseLink, '', $method['link']),
                         $methodName
                     ),
                 ];
@@ -81,24 +97,24 @@ final class Dashboard extends Renderer
             $result['class'][] = [
                 $class['coverage'],
                 $class['ccn'],
-                \sprintf(
+                sprintf(
                     '<a href="%s">%s</a>',
-                    \str_replace($baseLink, '', $class['link']),
+                    str_replace($baseLink, '', $class['link']),
                     $className
                 ),
             ];
         }
 
         return [
-            'class'  => \json_encode($result['class']),
-            'method' => \json_encode($result['method']),
+            'class'  => json_encode($result['class']),
+            'method' => json_encode($result['method']),
         ];
     }
 
     /**
      * Returns the data for the Class / Method Coverage Distribution chart.
      */
-    protected function coverageDistribution(array $classes): array
+    private function coverageDistribution(array $classes): array
     {
         $result = [
             'class' => [
@@ -138,7 +154,7 @@ final class Dashboard extends Renderer
                 } elseif ($method['coverage'] === 100) {
                     $result['method']['100%']++;
                 } else {
-                    $key = \floor($method['coverage'] / 10) * 10;
+                    $key = floor($method['coverage'] / 10) * 10;
                     $key = $key . '-' . ($key + 10) . '%';
                     $result['method'][$key]++;
                 }
@@ -149,22 +165,22 @@ final class Dashboard extends Renderer
             } elseif ($class['coverage'] === 100) {
                 $result['class']['100%']++;
             } else {
-                $key = \floor($class['coverage'] / 10) * 10;
+                $key = floor($class['coverage'] / 10) * 10;
                 $key = $key . '-' . ($key + 10) . '%';
                 $result['class'][$key]++;
             }
         }
 
         return [
-            'class'  => \json_encode(\array_values($result['class'])),
-            'method' => \json_encode(\array_values($result['method'])),
+            'class'  => json_encode(array_values($result['class'])),
+            'method' => json_encode(array_values($result['method'])),
         ];
     }
 
     /**
      * Returns the classes / methods with insufficient coverage.
      */
-    protected function insufficientCoverage(array $classes, string $baseLink): array
+    private function insufficientCoverage(array $classes, string $baseLink): array
     {
         $leastTestedClasses = [];
         $leastTestedMethods = [];
@@ -188,24 +204,24 @@ final class Dashboard extends Renderer
             }
         }
 
-        \asort($leastTestedClasses);
-        \asort($leastTestedMethods);
+        asort($leastTestedClasses);
+        asort($leastTestedMethods);
 
         foreach ($leastTestedClasses as $className => $coverage) {
-            $result['class'] .= \sprintf(
+            $result['class'] .= sprintf(
                 '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d%%</td></tr>' . "\n",
-                \str_replace($baseLink, '', $classes[$className]['link']),
+                str_replace($baseLink, '', $classes[$className]['link']),
                 $className,
                 $coverage
             );
         }
 
         foreach ($leastTestedMethods as $methodName => $coverage) {
-            [$class, $method] = \explode('::', $methodName);
+            [$class, $method] = explode('::', $methodName);
 
-            $result['method'] .= \sprintf(
+            $result['method'] .= sprintf(
                 '       <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d%%</td></tr>' . "\n",
-                \str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
+                str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
                 $methodName,
                 $method,
                 $coverage
@@ -218,7 +234,7 @@ final class Dashboard extends Renderer
     /**
      * Returns the project risks according to the CRAP index.
      */
-    protected function projectRisks(array $classes, string $baseLink): array
+    private function projectRisks(array $classes, string $baseLink): array
     {
         $classRisks  = [];
         $methodRisks = [];
@@ -238,29 +254,29 @@ final class Dashboard extends Renderer
             }
 
             if ($class['coverage'] < $this->highLowerBound &&
-                $class['ccn'] > \count($class['methods'])) {
+                $class['ccn'] > count($class['methods'])) {
                 $classRisks[$className] = $class['crap'];
             }
         }
 
-        \arsort($classRisks);
-        \arsort($methodRisks);
+        arsort($classRisks);
+        arsort($methodRisks);
 
         foreach ($classRisks as $className => $crap) {
-            $result['class'] .= \sprintf(
+            $result['class'] .= sprintf(
                 '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d</td></tr>' . "\n",
-                \str_replace($baseLink, '', $classes[$className]['link']),
+                str_replace($baseLink, '', $classes[$className]['link']),
                 $className,
                 $crap
             );
         }
 
         foreach ($methodRisks as $methodName => $crap) {
-            [$class, $method] = \explode('::', $methodName);
+            [$class, $method] = explode('::', $methodName);
 
-            $result['method'] .= \sprintf(
+            $result['method'] .= sprintf(
                 '       <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d</td></tr>' . "\n",
-                \str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
+                str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
                 $methodName,
                 $method,
                 $crap
@@ -269,13 +285,4 @@ final class Dashboard extends Renderer
 
         return $result;
     }
-
-    protected function getActiveBreadcrumb(AbstractNode $node): string
-    {
-        return \sprintf(
-            '         <li class="breadcrumb-item"><a href="index.html">%s</a></li>' . "\n" .
-            '         <li class="breadcrumb-item active">(Dashboard)</li>' . "\n",
-            $node->getName()
-        );
-    }
 }

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

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,37 +9,38 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Html;
 
+use function count;
+use function sprintf;
+use function str_repeat;
 use SebastianBergmann\CodeCoverage\Node\AbstractNode as Node;
 use SebastianBergmann\CodeCoverage\Node\Directory as DirectoryNode;
+use SebastianBergmann\Template\Template;
 
 /**
- * Renders a directory node.
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
  */
 final class Directory extends Renderer
 {
-    /**
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
-     */
     public function render(DirectoryNode $node, string $file): void
     {
-        $template = new \Text_Template($this->templatePath . 'directory.html', '{{', '}}');
+        $templateName = $this->templatePath . ($this->hasBranchCoverage ? 'directory_branch.html' : 'directory.html');
+        $template     = new Template($templateName, '{{', '}}');
 
         $this->setCommonTemplateVariables($template, $node);
 
         $items = $this->renderItem($node, true);
 
-        foreach ($node->getDirectories() as $item) {
+        foreach ($node->directories() as $item) {
             $items .= $this->renderItem($item);
         }
 
-        foreach ($node->getFiles() as $item) {
+        foreach ($node->files() as $item) {
             $items .= $this->renderItem($item);
         }
 
         $template->setVar(
             [
-                'id'    => $node->getId(),
+                'id'    => $node->id(),
                 'items' => $items,
             ]
         );
@@ -47,51 +48,65 @@ final class Directory extends Renderer
         $template->renderTo($file);
     }
 
-    protected function renderItem(Node $node, bool $total = false): string
+    private function renderItem(Node $node, bool $total = false): string
     {
         $data = [
-            'numClasses'                   => $node->getNumClassesAndTraits(),
-            'numTestedClasses'             => $node->getNumTestedClassesAndTraits(),
-            'numMethods'                   => $node->getNumFunctionsAndMethods(),
-            'numTestedMethods'             => $node->getNumTestedFunctionsAndMethods(),
-            'linesExecutedPercent'         => $node->getLineExecutedPercent(false),
-            'linesExecutedPercentAsString' => $node->getLineExecutedPercent(),
-            'numExecutedLines'             => $node->getNumExecutedLines(),
-            'numExecutableLines'           => $node->getNumExecutableLines(),
-            'testedMethodsPercent'         => $node->getTestedFunctionsAndMethodsPercent(false),
-            'testedMethodsPercentAsString' => $node->getTestedFunctionsAndMethodsPercent(),
-            'testedClassesPercent'         => $node->getTestedClassesAndTraitsPercent(false),
-            'testedClassesPercentAsString' => $node->getTestedClassesAndTraitsPercent(),
+            'numClasses'                      => $node->numberOfClassesAndTraits(),
+            'numTestedClasses'                => $node->numberOfTestedClassesAndTraits(),
+            'numMethods'                      => $node->numberOfFunctionsAndMethods(),
+            'numTestedMethods'                => $node->numberOfTestedFunctionsAndMethods(),
+            'linesExecutedPercent'            => $node->percentageOfExecutedLines()->asFloat(),
+            'linesExecutedPercentAsString'    => $node->percentageOfExecutedLines()->asString(),
+            'numExecutedLines'                => $node->numberOfExecutedLines(),
+            'numExecutableLines'              => $node->numberOfExecutableLines(),
+            'branchesExecutedPercent'         => $node->percentageOfExecutedBranches()->asFloat(),
+            'branchesExecutedPercentAsString' => $node->percentageOfExecutedBranches()->asString(),
+            'numExecutedBranches'             => $node->numberOfExecutedBranches(),
+            'numExecutableBranches'           => $node->numberOfExecutableBranches(),
+            'pathsExecutedPercent'            => $node->percentageOfExecutedPaths()->asFloat(),
+            'pathsExecutedPercentAsString'    => $node->percentageOfExecutedPaths()->asString(),
+            'numExecutedPaths'                => $node->numberOfExecutedPaths(),
+            'numExecutablePaths'              => $node->numberOfExecutablePaths(),
+            'testedMethodsPercent'            => $node->percentageOfTestedFunctionsAndMethods()->asFloat(),
+            'testedMethodsPercentAsString'    => $node->percentageOfTestedFunctionsAndMethods()->asString(),
+            'testedClassesPercent'            => $node->percentageOfTestedClassesAndTraits()->asFloat(),
+            'testedClassesPercentAsString'    => $node->percentageOfTestedClassesAndTraits()->asString(),
         ];
 
         if ($total) {
             $data['name'] = 'Total';
         } else {
+            $up           = str_repeat('../', count($node->pathAsArray()) - 2);
+            $data['icon'] = sprintf('<img src="%s_icons/file-code.svg" class="octicon" />', $up);
+
             if ($node instanceof DirectoryNode) {
-                $data['name'] = \sprintf(
+                $data['name'] = sprintf(
                     '<a href="%s/index.html">%s</a>',
-                    $node->getName(),
-                    $node->getName()
+                    $node->name(),
+                    $node->name()
+                );
+                $data['icon'] = sprintf('<img src="%s_icons/file-directory.svg" class="octicon" />', $up);
+            } elseif ($this->hasBranchCoverage) {
+                $data['name'] = sprintf(
+                    '%s <a class="small" href="%s.html">[line]</a> <a class="small" href="%s_branch.html">[branch]</a> <a class="small" href="%s_path.html">[path]</a>',
+                    $node->name(),
+                    $node->name(),
+                    $node->name(),
+                    $node->name()
                 );
-
-                $up = \str_repeat('../', \count($node->getPathAsArray()) - 2);
-
-                $data['icon'] = \sprintf('<img src="%s_icons/file-directory.svg" class="octicon" />', $up);
             } else {
-                $data['name'] = \sprintf(
+                $data['name'] = sprintf(
                     '<a href="%s.html">%s</a>',
-                    $node->getName(),
-                    $node->getName()
+                    $node->name(),
+                    $node->name()
                 );
-
-                $up = \str_repeat('../', \count($node->getPathAsArray()) - 2);
-
-                $data['icon'] = \sprintf('<img src="%s_icons/file-code.svg" class="octicon" />', $up);
             }
         }
 
+        $templateName = $this->templatePath . ($this->hasBranchCoverage ? 'directory_item_branch.html' : 'directory_item.html');
+
         return $this->renderItemTemplate(
-            new \Text_Template($this->templatePath . 'directory_item.html', '{{', '}}'),
+            new Template($templateName, '{{', '}}'),
             $data
         );
     }

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/branches.html.dist

@@ -0,0 +1,9 @@
+<hr/>
+<h4>Branches</h4>
+<p>
+    Below are the source code lines that represent each code branch as identified by Xdebug. Please note a branch is not
+    necessarily coterminous with a line, a line may contain multiple branches and therefore show up more than once.
+    Please also be aware that some branches may be implicit rather than explicit, e.g. an <code>if</code> statement
+    <i>always</i> has an <code>else</code> as part of its logical flow even if you didn't write one.
+</p>
+{{branches}}

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/coverage_bar_branch.html.dist

@@ -0,0 +1,5 @@
+       <div class="progress">
+         <div class="progress-bar bg-{{level}}" role="progressbar" aria-valuenow="{{percent}}" aria-valuemin="0" aria-valuemax="100" style="width: {{percent}}%">
+           <span class="sr-only">{{percent}}% covered ({{level}})</span>
+         </div>
+       </div>

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

@@ -48,7 +48,7 @@ body {
  background-color: #f2dede;
 }
 
-.table tbody td.warning, li.warning, span.warning {
+.table tbody tr.warning, .table tbody td.warning, li.warning, span.warning {
  background-color: #fcf8e3;
 }
 
@@ -65,7 +65,7 @@ td.small {
 
 td.codeLine {
  font-family: "Source Code Pro", "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
- white-space: pre;
+ white-space: pre-wrap;
 }
 
 td span.comment {
@@ -120,3 +120,8 @@ svg text {
  overflow-x:hidden;
  overflow-y:scroll;
 }
+
+table + .structure-heading {
+ border-top: 1px solid lightgrey;
+ padding-top: 0.5em;
+}

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/dashboard_branch.html.dist

@@ -0,0 +1,281 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+  <meta charset="UTF-8">
+  <title>Dashboard for {{full_path}}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link href="{{path_to_root}}_css/bootstrap.min.css" rel="stylesheet" type="text/css">
+  <link href="{{path_to_root}}_css/nv.d3.min.css" rel="stylesheet" type="text/css">
+  <link href="{{path_to_root}}_css/style.css" rel="stylesheet" type="text/css">
+  <link href="{{path_to_root}}_css/custom.css" rel="stylesheet" type="text/css">
+ </head>
+ <body>
+  <header>
+   <div class="container-fluid">
+    <div class="row">
+     <div class="col-md-12">
+      <nav aria-label="breadcrumb">
+       <ol class="breadcrumb">
+{{breadcrumbs}}
+       </ol>
+      </nav>
+     </div>
+    </div>
+   </div>
+  </header>
+  <div class="container-fluid">
+   <div class="row">
+    <div class="col-md-12">
+     <h2>Classes</h2>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Coverage Distribution</h3>
+     <div id="classCoverageDistribution" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Complexity</h3>
+     <div id="classComplexity" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Insufficient Coverage</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Class</th>
+         <th class="text-right">Coverage</th>
+        </tr>
+       </thead>
+       <tbody>
+{{insufficient_coverage_classes}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Project Risks</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Class</th>
+         <th class="text-right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></th>
+        </tr>
+       </thead>
+       <tbody>
+{{project_risks_classes}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-12">
+     <h2>Methods</h2>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Coverage Distribution</h3>
+     <div id="methodCoverageDistribution" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Complexity</h3>
+     <div id="methodComplexity" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Insufficient Coverage</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Method</th>
+         <th class="text-right">Coverage</th>
+        </tr>
+       </thead>
+       <tbody>
+{{insufficient_coverage_methods}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Project Risks</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Method</th>
+         <th class="text-right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></th>
+        </tr>
+       </thead>
+       <tbody>
+{{project_risks_methods}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+   </div>
+   <footer>
+    <hr/>
+    <p>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage {{version}}</a> using {{runtime}}{{generator}} at {{date}}.</small>
+    </p>
+   </footer>
+  </div>
+  <script src="{{path_to_root}}_js/jquery.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}_js/d3.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}_js/nv.d3.min.js" type="text/javascript"></script>
+  <script type="text/javascript">
+$(document).ready(function() {
+  nv.addGraph(function() {
+    var chart = nv.models.multiBarChart();
+    chart.tooltips(false)
+      .showControls(false)
+      .showLegend(false)
+      .reduceXTicks(false)
+      .staggerLabels(true)
+      .yAxis.tickFormat(d3.format('d'));
+
+    d3.select('#classCoverageDistribution svg')
+      .datum(getCoverageDistributionData({{class_coverage_distribution}}, "Class Coverage"))
+      .transition().duration(500).call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  nv.addGraph(function() {
+    var chart = nv.models.multiBarChart();
+    chart.tooltips(false)
+      .showControls(false)
+      .showLegend(false)
+      .reduceXTicks(false)
+      .staggerLabels(true)
+      .yAxis.tickFormat(d3.format('d'));
+
+    d3.select('#methodCoverageDistribution svg')
+      .datum(getCoverageDistributionData({{method_coverage_distribution}}, "Method Coverage"))
+      .transition().duration(500).call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  function getCoverageDistributionData(data, label) {
+    var labels = [
+      '0%',
+      '0-10%',
+      '10-20%',
+      '20-30%',
+      '30-40%',
+      '40-50%',
+      '50-60%',
+      '60-70%',
+      '70-80%',
+      '80-90%',
+      '90-100%',
+      '100%'
+    ];
+    var values = [];
+    $.each(labels, function(key) {
+      values.push({x: labels[key], y: data[key]});
+    });
+
+    return [
+      {
+        key: label,
+        values: values,
+        color: "#4572A7"
+      }
+    ];
+  }
+  nv.addGraph(function() {
+    var chart = nv.models.scatterChart()
+      .showDistX(true)
+      .showDistY(true)
+      .showLegend(false)
+      .forceX([0, 100]);
+    chart.tooltipContent(function(graph) {
+      return '<p>' + graph.point.class + '</p>';
+    });
+
+    chart.xAxis.axisLabel('Code Coverage (in percent)');
+    chart.yAxis.axisLabel('Cyclomatic Complexity');
+
+    d3.select('#classComplexity svg')
+      .datum(getComplexityData({{complexity_class}}, 'Class Complexity'))
+      .transition()
+      .duration(500)
+      .call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  nv.addGraph(function() {
+    var chart = nv.models.scatterChart()
+      .showDistX(true)
+      .showDistY(true)
+      .showLegend(false)
+      .forceX([0, 100]);
+    chart.tooltipContent(function(graph) {
+      return '<p>' + graph.point.class + '</p>';
+    });
+
+    chart.xAxis.axisLabel('Code Coverage (in percent)');
+    chart.yAxis.axisLabel('Method Complexity');
+
+    d3.select('#methodComplexity svg')
+      .datum(getComplexityData({{complexity_method}}, 'Method Complexity'))
+      .transition()
+      .duration(500)
+      .call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  function getComplexityData(data, label) {
+    var values = [];
+    $.each(data, function(key) {
+      var value = Math.round(data[key][0]*100) / 100;
+      values.push({
+        x: value,
+        y: data[key][1],
+        class: data[key][2],
+        size: 0.05,
+        shape: 'diamond'
+      });
+    });
+
+    return [
+      {
+        key: label,
+        values: values,
+        color: "#4572A7"
+      }
+    ];
+  }
+});
+  </script>
+ </body>
+</html>

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/directory_branch.html.dist

@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+  <meta charset="UTF-8">
+  <title>Code Coverage for {{full_path}}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link href="{{path_to_root}}_css/bootstrap.min.css" rel="stylesheet" type="text/css">
+  <link href="{{path_to_root}}_css/octicons.css" rel="stylesheet" type="text/css">
+  <link href="{{path_to_root}}_css/style.css" rel="stylesheet" type="text/css">
+  <link href="{{path_to_root}}_css/custom.css" rel="stylesheet" type="text/css">
+ </head>
+ <body>
+  <header>
+   <div class="container-fluid">
+    <div class="row">
+     <div class="col-md-12">
+      <nav aria-label="breadcrumb">
+       <ol class="breadcrumb">
+{{breadcrumbs}}
+       </ol>
+      </nav>
+     </div>
+    </div>
+   </div>
+  </header>
+  <div class="container-fluid">
+   <div class="table-responsive">
+    <table class="table table-bordered">
+     <thead>
+      <tr>
+       <td>&nbsp;</td>
+       <td colspan="15"><div align="center"><strong>Code Coverage</strong></div></td>
+      </tr>
+      <tr>
+       <td>&nbsp;</td>
+       <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
+      </tr>
+     </thead>
+     <tbody>
+{{items}}
+     </tbody>
+    </table>
+   </div>
+   <footer>
+    <hr/>
+    <h4>Legend</h4>
+    <p>
+     <span class="danger"><strong>Low</strong>: 0% to {{low_upper_bound}}%</span>
+     <span class="warning"><strong>Medium</strong>: {{low_upper_bound}}% to {{high_lower_bound}}%</span>
+     <span class="success"><strong>High</strong>: {{high_lower_bound}}% to 100%</span>
+    </p>
+    <p>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage {{version}}</a> using {{runtime}}{{generator}} at {{date}}.</small>
+    </p>
+   </footer>
+  </div>
+ </body>
+</html>

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/directory_item_branch.html.dist

@@ -0,0 +1,19 @@
+      <tr>
+       <td class="{{lines_level}}">{{icon}}{{name}}</td>
+       <td class="{{lines_level}} big">{{lines_bar}}</td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+       <td class="{{branches_level}} big">{{branches_bar}}</td>
+       <td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
+       <td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
+       <td class="{{paths_level}} big">{{paths_bar}}</td>
+       <td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
+       <td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
+       <td class="{{methods_level}} big">{{methods_bar}}</td>
+       <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
+       <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
+       <td class="{{classes_level}} big">{{classes_bar}}</td>
+       <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
+       <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
+      </tr>
+

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/file.html.dist

@@ -43,19 +43,12 @@
      </tbody>
     </table>
    </div>
-   <table id="code" class="table table-borderless table-condensed">
-    <tbody>
 {{lines}}
-    </tbody>
-   </table>
+{{structure}}
    <footer>
     <hr/>
     <h4>Legend</h4>
-    <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>
      <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage {{version}}</a> using {{runtime}}{{generator}} at {{date}}.</small>
     </p>

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/file_branch.html.dist

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+  <meta charset="UTF-8">
+  <title>Code Coverage for {{full_path}}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link href="{{path_to_root}}_css/bootstrap.min.css" rel="stylesheet" type="text/css">
+  <link href="{{path_to_root}}_css/octicons.css" rel="stylesheet" type="text/css">
+  <link href="{{path_to_root}}_css/style.css" rel="stylesheet" type="text/css">
+  <link href="{{path_to_root}}_css/custom.css" rel="stylesheet" type="text/css">
+ </head>
+ <body>
+  <header>
+   <div class="container-fluid">
+    <div class="row">
+     <div class="col-md-12">
+      <nav aria-label="breadcrumb">
+       <ol class="breadcrumb">
+{{breadcrumbs}}
+       </ol>
+      </nav>
+     </div>
+    </div>
+   </div>
+  </header>
+  <div class="container-fluid">
+   <div class="table-responsive">
+    <table class="table table-bordered">
+     <thead>
+      <tr>
+       <td>&nbsp;</td>
+       <td colspan="16"><div align="center"><strong>Code Coverage</strong></div></td>
+      </tr>
+      <tr>
+       <td>&nbsp;</td>
+       <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
+       <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Paths</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Branches</strong></div></td>
+       <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+      </tr>
+     </thead>
+     <tbody>
+{{items}}
+     </tbody>
+    </table>
+   </div>
+{{lines}}
+{{structure}}
+   <footer>
+    <hr/>
+    <h4>Legend</h4>
+    {{legend}}
+    <p>
+     <small>Generated by <a href="https://github.com/sebastianbergmann/php-code-coverage" target="_top">php-code-coverage {{version}}</a> using {{runtime}}{{generator}} at {{date}}.</small>
+    </p>
+    <a title="Back to the top" id="toplink" href="#">
+        <svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M12 11L6 5l-6 6h12z"/></svg>
+    </a>
+   </footer>
+  </div>
+  <script src="{{path_to_root}}_js/jquery.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}_js/popper.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}_js/bootstrap.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}_js/file.js" type="text/javascript"></script>
+ </body>
+</html>

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/file_item_branch.html.dist

@@ -0,0 +1,20 @@
+      <tr>
+       <td class="{{classes_level}}">{{name}}</td>
+       <td class="{{classes_level}} big">{{classes_bar}}</td>
+       <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
+       <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
+       <td class="{{methods_level}} big">{{methods_bar}}</td>
+       <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
+       <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
+       <td class="{{methods_level}} small">{{crap}}</td>
+       <td class="{{paths_level}} big">{{paths_bar}}</td>
+       <td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
+       <td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
+       <td class="{{branches_level}} big">{{branches_bar}}</td>
+       <td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
+       <td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
+       <td class="{{lines_level}} big">{{lines_bar}}</td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+      </tr>
+

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/line.html.dist

@@ -0,0 +1 @@
+    <tr class="{{class}} d-flex"><td {{popover}} class="col-1 text-right"><a id="{{lineNumber}}" href="#{{lineNumber}}">{{lineNumber}}</a></td><td class="col-11 codeLine">{{lineContent}}</td></tr>

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/lines.html.dist

@@ -0,0 +1,5 @@
+<table id="code" class="table table-borderless table-condensed">
+<tbody>
+{{lines}}
+</tbody>
+</table>

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/method_item_branch.html.dist

@@ -0,0 +1,17 @@
+      <tr>
+       <td class="{{methods_level}}" colspan="4">{{name}}</td>
+       <td class="{{methods_level}} big">{{methods_bar}}</td>
+       <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
+       <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
+       <td class="{{methods_level}} small">{{crap}}</td>
+       <td class="{{paths_level}} big">{{paths_bar}}</td>
+       <td class="{{paths_level}} small"><div align="right">{{paths_executed_percent}}</div></td>
+       <td class="{{paths_level}} small"><div align="right">{{paths_number}}</div></td>
+       <td class="{{branches_level}} big">{{branches_bar}}</td>
+       <td class="{{branches_level}} small"><div align="right">{{branches_executed_percent}}</div></td>
+       <td class="{{branches_level}} small"><div align="right">{{branches_number}}</div></td>
+       <td class="{{lines_level}} big">{{lines_bar}}</td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+       <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+      </tr>
+

vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/paths.html.dist

@@ -0,0 +1,9 @@
+<hr/>
+<h4>Paths</h4>
+<p>
+    Below are the source code lines that represent each code path as identified by Xdebug. Please note a path is not
+    necessarily coterminous with a line, a line may contain multiple paths and therefore show up more than once.
+    Please also be aware that some paths may include implicit rather than explicit branches, e.g. an <code>if</code> statement
+    <i>always</i> has an <code>else</code> as part of its logical flow even if you didn't write one.
+</p>
+{{paths}}

vendor/phpunit/php-code-coverage/src/Report/PHP.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,56 +9,35 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report;
 
+use function dirname;
+use function file_put_contents;
+use function serialize;
+use function sprintf;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
-use SebastianBergmann\CodeCoverage\RuntimeException;
+use SebastianBergmann\CodeCoverage\Directory;
+use SebastianBergmann\CodeCoverage\Driver\WriteOperationFailedException;
 
-/**
- * Uses var_export() to write a SebastianBergmann\CodeCoverage\CodeCoverage object to a file.
- */
 final class PHP
 {
-    /**
-     * @throws \SebastianBergmann\CodeCoverage\RuntimeException
-     */
     public function process(CodeCoverage $coverage, ?string $target = null): string
     {
-        $filter = $coverage->filter();
-
-        $buffer = \sprintf(
-            '<?php
-$coverage = new SebastianBergmann\CodeCoverage\CodeCoverage;
-$coverage->setData(%s);
-$coverage->setTests(%s);
-
-$filter = $coverage->filter();
-$filter->setWhitelistedFiles(%s);
-
-return $coverage;',
-            \var_export($coverage->getData(true), true),
-            \var_export($coverage->getTests(), true),
-            \var_export($filter->getWhitelistedFiles(), true)
+        $buffer = sprintf(
+            "<?php
+return \unserialize(<<<'END_OF_COVERAGE_SERIALIZATION'%s%s%sEND_OF_COVERAGE_SERIALIZATION%s);",
+            PHP_EOL,
+            serialize($coverage),
+            PHP_EOL,
+            PHP_EOL
         );
 
         if ($target !== null) {
-            if (!$this->createDirectory(\dirname($target))) {
-                throw new \RuntimeException(\sprintf('Directory "%s" was not created', \dirname($target)));
-            }
+            Directory::create(dirname($target));
 
-            if (@\file_put_contents($target, $buffer) === false) {
-                throw new RuntimeException(
-                    \sprintf(
-                        'Could not write to "%s',
-                        $target
-                    )
-                );
+            if (@file_put_contents($target, $buffer) === false) {
+                throw new WriteOperationFailedException($target);
             }
         }
 
         return $buffer;
     }
-
-    private function createDirectory(string $directory): bool
-    {
-        return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
-    }
 }

vendor/phpunit/php-code-coverage/src/Report/Text.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,15 +9,18 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report;
 
+use const PHP_EOL;
+use function array_map;
+use function date;
+use function ksort;
+use function max;
+use function sprintf;
+use function str_pad;
+use function strlen;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Node\File;
-use SebastianBergmann\CodeCoverage\Util;
+use SebastianBergmann\CodeCoverage\Percentage;
 
-/**
- * Generates human readable output from a code coverage object.
- *
- * The output gets put into a text file our written to the CLI.
- */
 final class Text
 {
     /**
@@ -80,32 +83,46 @@ final class Text
 
     public function process(CodeCoverage $coverage, bool $showColors = false): string
     {
-        $output = \PHP_EOL . \PHP_EOL;
+        $hasBranchCoverage = !empty($coverage->getData(true)->functionCoverage());
+
+        $output = PHP_EOL . PHP_EOL;
         $report = $coverage->getReport();
 
         $colors = [
-            'header'  => '',
-            'classes' => '',
-            'methods' => '',
-            'lines'   => '',
-            'reset'   => '',
-            'eol'     => '',
+            'header'   => '',
+            'classes'  => '',
+            'methods'  => '',
+            'lines'    => '',
+            'branches' => '',
+            'paths'    => '',
+            'reset'    => '',
+            'eol'      => '',
         ];
 
         if ($showColors) {
-            $colors['classes'] = $this->getCoverageColor(
-                $report->getNumTestedClassesAndTraits(),
-                $report->getNumClassesAndTraits()
+            $colors['classes'] = $this->coverageColor(
+                $report->numberOfTestedClassesAndTraits(),
+                $report->numberOfClassesAndTraits()
             );
 
-            $colors['methods'] = $this->getCoverageColor(
-                $report->getNumTestedMethods(),
-                $report->getNumMethods()
+            $colors['methods'] = $this->coverageColor(
+                $report->numberOfTestedMethods(),
+                $report->numberOfMethods()
             );
 
-            $colors['lines']   = $this->getCoverageColor(
-                $report->getNumExecutedLines(),
-                $report->getNumExecutableLines()
+            $colors['lines'] = $this->coverageColor(
+                $report->numberOfExecutedLines(),
+                $report->numberOfExecutableLines()
+            );
+
+            $colors['branches'] = $this->coverageColor(
+                $report->numberOfExecutedBranches(),
+                $report->numberOfExecutableBranches()
+            );
+
+            $colors['paths'] = $this->coverageColor(
+                $report->numberOfExecutedPaths(),
+                $report->numberOfExecutablePaths()
             );
 
             $colors['reset']  = self::COLOR_RESET;
@@ -113,48 +130,70 @@ final class Text
             $colors['eol']    = self::COLOR_EOL;
         }
 
-        $classes = \sprintf(
+        $classes = sprintf(
             '  Classes: %6s (%d/%d)',
-            Util::percent(
-                $report->getNumTestedClassesAndTraits(),
-                $report->getNumClassesAndTraits(),
-                true
-            ),
-            $report->getNumTestedClassesAndTraits(),
-            $report->getNumClassesAndTraits()
+            Percentage::fromFractionAndTotal(
+                $report->numberOfTestedClassesAndTraits(),
+                $report->numberOfClassesAndTraits()
+            )->asString(),
+            $report->numberOfTestedClassesAndTraits(),
+            $report->numberOfClassesAndTraits()
         );
 
-        $methods = \sprintf(
+        $methods = sprintf(
             '  Methods: %6s (%d/%d)',
-            Util::percent(
-                $report->getNumTestedMethods(),
-                $report->getNumMethods(),
-                true
-            ),
-            $report->getNumTestedMethods(),
-            $report->getNumMethods()
+            Percentage::fromFractionAndTotal(
+                $report->numberOfTestedMethods(),
+                $report->numberOfMethods(),
+            )->asString(),
+            $report->numberOfTestedMethods(),
+            $report->numberOfMethods()
         );
 
-        $lines = \sprintf(
+        $paths    = '';
+        $branches = '';
+
+        if ($hasBranchCoverage) {
+            $paths = sprintf(
+                '  Paths:   %6s (%d/%d)',
+                Percentage::fromFractionAndTotal(
+                    $report->numberOfExecutedPaths(),
+                    $report->numberOfExecutablePaths(),
+                )->asString(),
+                $report->numberOfExecutedPaths(),
+                $report->numberOfExecutablePaths()
+            );
+
+            $branches = sprintf(
+                '  Branches:   %6s (%d/%d)',
+                Percentage::fromFractionAndTotal(
+                    $report->numberOfExecutedBranches(),
+                    $report->numberOfExecutableBranches(),
+                )->asString(),
+                $report->numberOfExecutedBranches(),
+                $report->numberOfExecutableBranches()
+            );
+        }
+
+        $lines = sprintf(
             '  Lines:   %6s (%d/%d)',
-            Util::percent(
-                $report->getNumExecutedLines(),
-                $report->getNumExecutableLines(),
-                true
-            ),
-            $report->getNumExecutedLines(),
-            $report->getNumExecutableLines()
+            Percentage::fromFractionAndTotal(
+                $report->numberOfExecutedLines(),
+                $report->numberOfExecutableLines(),
+            )->asString(),
+            $report->numberOfExecutedLines(),
+            $report->numberOfExecutableLines()
         );
 
-        $padding = \max(\array_map('strlen', [$classes, $methods, $lines]));
+        $padding = max(array_map('strlen', [$classes, $methods, $lines]));
 
         if ($this->showOnlySummary) {
             $title   = 'Code Coverage Report Summary:';
-            $padding = \max($padding, \strlen($title));
+            $padding = max($padding, strlen($title));
 
             $output .= $this->format($colors['header'], $padding, $title);
         } else {
-            $date  = \date('  Y-m-d H:i:s', $_SERVER['REQUEST_TIME']);
+            $date  = date('  Y-m-d H:i:s');
             $title = 'Code Coverage Report:';
 
             $output .= $this->format($colors['header'], $padding, $title);
@@ -165,10 +204,15 @@ final class Text
 
         $output .= $this->format($colors['classes'], $padding, $classes);
         $output .= $this->format($colors['methods'], $padding, $methods);
+
+        if ($hasBranchCoverage) {
+            $output .= $this->format($colors['paths'], $padding, $paths);
+            $output .= $this->format($colors['branches'], $padding, $branches);
+        }
         $output .= $this->format($colors['lines'], $padding, $lines);
 
         if ($this->showOnlySummary) {
-            return $output . \PHP_EOL;
+            return $output . PHP_EOL;
         }
 
         $classCoverage = [];
@@ -178,13 +222,17 @@ final class Text
                 continue;
             }
 
-            $classes = $item->getClassesAndTraits();
+            $classes = $item->classesAndTraits();
 
             foreach ($classes as $className => $class) {
-                $classStatements        = 0;
-                $coveredClassStatements = 0;
-                $coveredMethods         = 0;
-                $classMethods           = 0;
+                $classExecutableLines    = 0;
+                $classExecutedLines      = 0;
+                $classExecutableBranches = 0;
+                $classExecutedBranches   = 0;
+                $classExecutablePaths    = 0;
+                $classExecutedPaths      = 0;
+                $coveredMethods          = 0;
+                $classMethods            = 0;
 
                 foreach ($class['methods'] as $method) {
                     if ($method['executableLines'] == 0) {
@@ -192,68 +240,77 @@ final class Text
                     }
 
                     $classMethods++;
-                    $classStatements += $method['executableLines'];
-                    $coveredClassStatements += $method['executedLines'];
+                    $classExecutableLines += $method['executableLines'];
+                    $classExecutedLines += $method['executedLines'];
+                    $classExecutableBranches += $method['executableBranches'];
+                    $classExecutedBranches += $method['executedBranches'];
+                    $classExecutablePaths += $method['executablePaths'];
+                    $classExecutedPaths += $method['executedPaths'];
 
                     if ($method['coverage'] == 100) {
                         $coveredMethods++;
                     }
                 }
 
-                $namespace = '';
-
-                if (!empty($class['package']['namespace'])) {
-                    $namespace = '\\' . $class['package']['namespace'] . '::';
-                } elseif (!empty($class['package']['fullPackage'])) {
-                    $namespace = '@' . $class['package']['fullPackage'] . '::';
-                }
-
-                $classCoverage[$namespace . $className] = [
-                    'namespace'         => $namespace,
-                    'className '        => $className,
+                $classCoverage[$className] = [
+                    'namespace'         => $class['namespace'],
+                    'className'         => $className,
                     'methodsCovered'    => $coveredMethods,
                     'methodCount'       => $classMethods,
-                    'statementsCovered' => $coveredClassStatements,
-                    'statementCount'    => $classStatements,
+                    'statementsCovered' => $classExecutedLines,
+                    'statementCount'    => $classExecutableLines,
+                    'branchesCovered'   => $classExecutedBranches,
+                    'branchesCount'     => $classExecutableBranches,
+                    'pathsCovered'      => $classExecutedPaths,
+                    'pathsCount'        => $classExecutablePaths,
                 ];
             }
         }
 
-        \ksort($classCoverage);
+        ksort($classCoverage);
 
-        $methodColor = '';
-        $linesColor  = '';
-        $resetColor  = '';
+        $methodColor   = '';
+        $pathsColor    = '';
+        $branchesColor = '';
+        $linesColor    = '';
+        $resetColor    = '';
 
         foreach ($classCoverage as $fullQualifiedPath => $classInfo) {
             if ($this->showUncoveredFiles || $classInfo['statementsCovered'] != 0) {
                 if ($showColors) {
-                    $methodColor = $this->getCoverageColor($classInfo['methodsCovered'], $classInfo['methodCount']);
-                    $linesColor  = $this->getCoverageColor($classInfo['statementsCovered'], $classInfo['statementCount']);
-                    $resetColor  = $colors['reset'];
+                    $methodColor   = $this->coverageColor($classInfo['methodsCovered'], $classInfo['methodCount']);
+                    $pathsColor    = $this->coverageColor($classInfo['pathsCovered'], $classInfo['pathsCount']);
+                    $branchesColor = $this->coverageColor($classInfo['branchesCovered'], $classInfo['branchesCount']);
+                    $linesColor    = $this->coverageColor($classInfo['statementsCovered'], $classInfo['statementCount']);
+                    $resetColor    = $colors['reset'];
                 }
 
-                $output .= \PHP_EOL . $fullQualifiedPath . \PHP_EOL
-                    . '  ' . $methodColor . 'Methods: ' . $this->printCoverageCounts($classInfo['methodsCovered'], $classInfo['methodCount'], 2) . $resetColor . ' '
-                    . '  ' . $linesColor . 'Lines: ' . $this->printCoverageCounts($classInfo['statementsCovered'], $classInfo['statementCount'], 3) . $resetColor;
+                $output .= PHP_EOL . $fullQualifiedPath . PHP_EOL
+                    . '  ' . $methodColor . 'Methods: ' . $this->printCoverageCounts($classInfo['methodsCovered'], $classInfo['methodCount'], 2) . $resetColor . ' ';
+
+                if ($hasBranchCoverage) {
+                    $output .= '  ' . $pathsColor . 'Paths: ' . $this->printCoverageCounts($classInfo['pathsCovered'], $classInfo['pathsCount'], 3) . $resetColor . ' '
+                    . '  ' . $branchesColor . 'Branches: ' . $this->printCoverageCounts($classInfo['branchesCovered'], $classInfo['branchesCount'], 3) . $resetColor . ' ';
+                }
+                $output .= '  ' . $linesColor . 'Lines: ' . $this->printCoverageCounts($classInfo['statementsCovered'], $classInfo['statementCount'], 3) . $resetColor;
             }
         }
 
-        return $output . \PHP_EOL;
+        return $output . PHP_EOL;
     }
 
-    private function getCoverageColor(int $numberOfCoveredElements, int $totalNumberOfElements): string
+    private function coverageColor(int $numberOfCoveredElements, int $totalNumberOfElements): string
     {
-        $coverage = Util::percent(
+        $coverage = Percentage::fromFractionAndTotal(
             $numberOfCoveredElements,
             $totalNumberOfElements
         );
 
-        if ($coverage >= $this->highLowerBound) {
+        if ($coverage->asFloat() >= $this->highLowerBound) {
             return self::COLOR_GREEN;
         }
 
-        if ($coverage > $this->lowUpperBound) {
+        if ($coverage->asFloat() > $this->lowUpperBound) {
             return self::COLOR_YELLOW;
         }
 
@@ -264,20 +321,21 @@ final class Text
     {
         $format = '%' . $precision . 's';
 
-        return Util::percent(
+        return Percentage::fromFractionAndTotal(
             $numberOfCoveredElements,
-            $totalNumberOfElements,
-            true,
-            true
-        ) .
-        ' (' . \sprintf($format, $numberOfCoveredElements) . '/' .
-        \sprintf($format, $totalNumberOfElements) . ')';
+            $totalNumberOfElements
+        )->asFixedWidthString() .
+            ' (' . sprintf($format, $numberOfCoveredElements) . '/' .
+        sprintf($format, $totalNumberOfElements) . ')';
     }
 
-    private function format($color, $padding, $string): string
+    /**
+     * @param false|string $string
+     */
+    private function format(string $color, int $padding, $string): string
     {
         $reset = $color ? self::COLOR_RESET : '';
 
-        return $color . \str_pad($string, $padding) . $reset . \PHP_EOL;
+        return $color . str_pad((string) $string, $padding) . $reset . PHP_EOL;
     }
 }

vendor/phpunit/php-code-coverage/src/Report/Xml/BuildInformation.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,47 +9,54 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use function constant;
+use function phpversion;
+use DateTimeImmutable;
+use DOMElement;
 use SebastianBergmann\Environment\Runtime;
 
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 final class BuildInformation
 {
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $contextNode;
 
-    public function __construct(\DOMElement $contextNode)
+    public function __construct(DOMElement $contextNode)
     {
         $this->contextNode = $contextNode;
     }
 
     public function setRuntimeInformation(Runtime $runtime): void
     {
-        $runtimeNode = $this->getNodeByName('runtime');
+        $runtimeNode = $this->nodeByName('runtime');
 
         $runtimeNode->setAttribute('name', $runtime->getName());
         $runtimeNode->setAttribute('version', $runtime->getVersion());
         $runtimeNode->setAttribute('url', $runtime->getVendorUrl());
 
-        $driverNode = $this->getNodeByName('driver');
+        $driverNode = $this->nodeByName('driver');
 
         if ($runtime->hasPHPDBGCodeCoverage()) {
             $driverNode->setAttribute('name', 'phpdbg');
-            $driverNode->setAttribute('version', \constant('PHPDBG_VERSION'));
+            $driverNode->setAttribute('version', constant('PHPDBG_VERSION'));
         }
 
         if ($runtime->hasXdebug()) {
             $driverNode->setAttribute('name', 'xdebug');
-            $driverNode->setAttribute('version', \phpversion('xdebug'));
+            $driverNode->setAttribute('version', phpversion('xdebug'));
         }
 
         if ($runtime->hasPCOV()) {
             $driverNode->setAttribute('name', 'pcov');
-            $driverNode->setAttribute('version', \phpversion('pcov'));
+            $driverNode->setAttribute('version', phpversion('pcov'));
         }
     }
 
-    public function setBuildTime(\DateTime $date): void
+    public function setBuildTime(DateTimeImmutable $date): void
     {
         $this->contextNode->setAttribute('time', $date->format('D M j G:i:s T Y'));
     }
@@ -60,7 +67,7 @@ final class BuildInformation
         $this->contextNode->setAttribute('coverage', $coverageVersion);
     }
 
-    private function getNodeByName(string $name): \DOMElement
+    private function nodeByName(string $name): DOMElement
     {
         $node = $this->contextNode->getElementsByTagNameNS(
             'https://schema.phpunit.de/coverage/1.0',

vendor/phpunit/php-code-coverage/src/Report/Xml/Coverage.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,17 +9,22 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
-use SebastianBergmann\CodeCoverage\RuntimeException;
+use DOMElement;
+use SebastianBergmann\CodeCoverage\ReportAlreadyFinalizedException;
+use XMLWriter;
 
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 final class Coverage
 {
     /**
-     * @var \XMLWriter
+     * @var XMLWriter
      */
     private $writer;
 
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $contextNode;
 
@@ -28,23 +33,23 @@ final class Coverage
      */
     private $finalized = false;
 
-    public function __construct(\DOMElement $context, string $line)
+    public function __construct(DOMElement $context, string $line)
     {
         $this->contextNode = $context;
 
-        $this->writer = new \XMLWriter();
+        $this->writer = new XMLWriter();
         $this->writer->openMemory();
         $this->writer->startElementNS(null, $context->nodeName, 'https://schema.phpunit.de/coverage/1.0');
         $this->writer->writeAttribute('nr', $line);
     }
 
     /**
-     * @throws RuntimeException
+     * @throws ReportAlreadyFinalizedException
      */
     public function addTest(string $test): void
     {
         if ($this->finalized) {
-            throw new RuntimeException('Coverage Report already finalized');
+            throw new ReportAlreadyFinalizedException;
         }
 
         $this->writer->startElement('covered');

vendor/phpunit/php-code-coverage/src/Report/Xml/Directory.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,6 +9,9 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 final class Directory extends Node
 {
 }

vendor/phpunit/php-code-coverage/src/Report/Xml/Facade.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,12 +9,33 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use const DIRECTORY_SEPARATOR;
+use const PHP_EOL;
+use function count;
+use function dirname;
+use function file_get_contents;
+use function file_put_contents;
+use function is_array;
+use function is_dir;
+use function is_file;
+use function is_writable;
+use function libxml_clear_errors;
+use function libxml_get_errors;
+use function libxml_use_internal_errors;
+use function sprintf;
+use function strlen;
+use function substr;
+use DateTimeImmutable;
+use DOMDocument;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\Directory as DirectoryUtil;
+use SebastianBergmann\CodeCoverage\Driver\PathExistsButIsNotDirectoryException;
+use SebastianBergmann\CodeCoverage\Driver\WriteOperationFailedException;
 use SebastianBergmann\CodeCoverage\Node\AbstractNode;
 use SebastianBergmann\CodeCoverage\Node\Directory as DirectoryNode;
 use SebastianBergmann\CodeCoverage\Node\File as FileNode;
-use SebastianBergmann\CodeCoverage\RuntimeException;
 use SebastianBergmann\CodeCoverage\Version;
+use SebastianBergmann\CodeCoverage\XmlException;
 use SebastianBergmann\Environment\Runtime;
 
 final class Facade
@@ -40,12 +61,12 @@ final class Facade
     }
 
     /**
-     * @throws RuntimeException
+     * @throws XmlException
      */
     public function process(CodeCoverage $coverage, string $target): void
     {
-        if (\substr($target, -1, 1) !== \DIRECTORY_SEPARATOR) {
-            $target .= \DIRECTORY_SEPARATOR;
+        if (substr($target, -1, 1) !== DIRECTORY_SEPARATOR) {
+            $target .= DIRECTORY_SEPARATOR;
         }
 
         $this->target = $target;
@@ -54,7 +75,7 @@ final class Facade
         $report = $coverage->getReport();
 
         $this->project = new Project(
-            $coverage->getReport()->getName()
+            $coverage->getReport()->name()
         );
 
         $this->setBuildInformation();
@@ -66,92 +87,90 @@ final class Facade
 
     private function setBuildInformation(): void
     {
-        $buildNode = $this->project->getBuildInformation();
-        $buildNode->setRuntimeInformation(new Runtime());
-        $buildNode->setBuildTime(\DateTime::createFromFormat('U', (string) $_SERVER['REQUEST_TIME']));
+        $buildNode = $this->project->buildInformation();
+        $buildNode->setRuntimeInformation(new Runtime);
+        $buildNode->setBuildTime(new DateTimeImmutable);
         $buildNode->setGeneratorVersions($this->phpUnitVersion, Version::id());
     }
 
     /**
-     * @throws RuntimeException
+     * @throws PathExistsButIsNotDirectoryException
+     * @throws WriteOperationFailedException
      */
     private function initTargetDirectory(string $directory): void
     {
-        if (\file_exists($directory)) {
-            if (!\is_dir($directory)) {
-                throw new RuntimeException(
-                    "'$directory' exists but is not a directory."
-                );
+        if (is_file($directory)) {
+            if (!is_dir($directory)) {
+                throw new PathExistsButIsNotDirectoryException($directory);
             }
 
-            if (!\is_writable($directory)) {
-                throw new RuntimeException(
-                    "'$directory' exists but is not writable."
-                );
+            if (!is_writable($directory)) {
+                throw new WriteOperationFailedException($directory);
             }
-        } elseif (!$this->createDirectory($directory)) {
-            throw new RuntimeException(
-                "'$directory' could not be created."
-            );
         }
+
+        DirectoryUtil::create($directory);
     }
 
+    /**
+     * @throws XmlException
+     */
     private function processDirectory(DirectoryNode $directory, Node $context): void
     {
-        $directoryName = $directory->getName();
+        $directoryName = $directory->name();
 
-        if ($this->project->getProjectSourceDirectory() === $directoryName) {
+        if ($this->project->projectSourceDirectory() === $directoryName) {
             $directoryName = '/';
         }
 
         $directoryObject = $context->addDirectory($directoryName);
 
-        $this->setTotals($directory, $directoryObject->getTotals());
+        $this->setTotals($directory, $directoryObject->totals());
 
-        foreach ($directory->getDirectories() as $node) {
+        foreach ($directory->directories() as $node) {
             $this->processDirectory($node, $directoryObject);
         }
 
-        foreach ($directory->getFiles() as $node) {
+        foreach ($directory->files() as $node) {
             $this->processFile($node, $directoryObject);
         }
     }
 
     /**
-     * @throws RuntimeException
+     * @throws XmlException
      */
     private function processFile(FileNode $file, Directory $context): void
     {
         $fileObject = $context->addFile(
-            $file->getName(),
-            $file->getId() . '.xml'
+            $file->name(),
+            $file->id() . '.xml'
         );
 
-        $this->setTotals($file, $fileObject->getTotals());
+        $this->setTotals($file, $fileObject->totals());
 
-        $path = \substr(
-            $file->getPath(),
-            \strlen($this->project->getProjectSourceDirectory())
+        $path = substr(
+            $file->pathAsString(),
+            strlen($this->project->projectSourceDirectory())
         );
 
         $fileReport = new Report($path);
 
-        $this->setTotals($file, $fileReport->getTotals());
+        $this->setTotals($file, $fileReport->totals());
 
-        foreach ($file->getClassesAndTraits() as $unit) {
+        foreach ($file->classesAndTraits() as $unit) {
             $this->processUnit($unit, $fileReport);
         }
 
-        foreach ($file->getFunctions() as $function) {
+        foreach ($file->functions() as $function) {
             $this->processFunction($function, $fileReport);
         }
 
-        foreach ($file->getCoverageData() as $line => $tests) {
-            if (!\is_array($tests) || \count($tests) === 0) {
+        foreach ($file->lineCoverageData() as $line => $tests) {
+            if (!is_array($tests) || count($tests) === 0) {
                 continue;
             }
 
-            $coverage = $fileReport->getLineCoverage((string) $line);
+            $coverage = $fileReport->lineCoverage((string) $line);
 
             foreach ($tests as $test) {
                 $coverage->addTest($test);
@@ -160,19 +179,19 @@ final class Facade
             $coverage->finalize();
         }
 
-        $fileReport->getSource()->setSourceCode(
-            \file_get_contents($file->getPath())
+        $fileReport->source()->setSourceCode(
+            file_get_contents($file->pathAsString())
         );
 
-        $this->saveDocument($fileReport->asDom(), $file->getId());
+        $this->saveDocument($fileReport->asDom(), $file->id());
     }
 
     private function processUnit(array $unit, Report $report): void
     {
         if (isset($unit['className'])) {
-            $unitObject = $report->getClassObject($unit['className']);
+            $unitObject = $report->classObject($unit['className']);
         } else {
-            $unitObject = $report->getTraitObject($unit['traitName']);
+            $unitObject = $report->traitObject($unit['traitName']);
         }
 
         $unitObject->setLines(
@@ -182,15 +201,7 @@ final class Facade
         );
 
         $unitObject->setCrap((float) $unit['crap']);
-
-        $unitObject->setPackage(
-            $unit['package']['fullPackage'],
-            $unit['package']['package'],
-            $unit['package']['subpackage'],
-            $unit['package']['category']
-        );
-
-        $unitObject->setNamespace($unit['package']['namespace']);
+        $unitObject->setNamespace($unit['namespace']);
 
         foreach ($unit['methods'] as $method) {
             $methodObject = $unitObject->addMethod($method['methodName']);
@@ -207,7 +218,7 @@ final class Facade
 
     private function processFunction(array $function, Report $report): void
     {
-        $functionObject = $report->getFunctionObject($function['functionName']);
+        $functionObject = $report->functionObject($function['functionName']);
 
         $functionObject->setSignature($function['signature']);
         $functionObject->setLines((string) $function['startLine']);
@@ -217,71 +228,88 @@ final class Facade
 
     private function processTests(array $tests): void
     {
-        $testsObject = $this->project->getTests();
+        $testsObject = $this->project->tests();
 
         foreach ($tests as $test => $result) {
-            if ($test === 'UNCOVERED_FILES_FROM_WHITELIST') {
-                continue;
-            }
-
             $testsObject->addTest($test, $result);
         }
     }
 
     private function setTotals(AbstractNode $node, Totals $totals): void
     {
-        $loc = $node->getLinesOfCode();
+        $loc = $node->linesOfCode();
 
         $totals->setNumLines(
-            $loc['loc'],
-            $loc['cloc'],
-            $loc['ncloc'],
-            $node->getNumExecutableLines(),
-            $node->getNumExecutedLines()
+            $loc->linesOfCode(),
+            $loc->commentLinesOfCode(),
+            $loc->nonCommentLinesOfCode(),
+            $node->numberOfExecutableLines(),
+            $node->numberOfExecutedLines()
         );
 
         $totals->setNumClasses(
-            $node->getNumClasses(),
-            $node->getNumTestedClasses()
+            $node->numberOfClasses(),
+            $node->numberOfTestedClasses()
         );
 
         $totals->setNumTraits(
-            $node->getNumTraits(),
-            $node->getNumTestedTraits()
+            $node->numberOfTraits(),
+            $node->numberOfTestedTraits()
         );
 
         $totals->setNumMethods(
-            $node->getNumMethods(),
-            $node->getNumTestedMethods()
+            $node->numberOfMethods(),
+            $node->numberOfTestedMethods()
         );
 
         $totals->setNumFunctions(
-            $node->getNumFunctions(),
-            $node->getNumTestedFunctions()
+            $node->numberOfFunctions(),
+            $node->numberOfTestedFunctions()
         );
     }
 
-    private function getTargetDirectory(): string
+    private function targetDirectory(): string
     {
         return $this->target;
     }
 
     /**
-     * @throws RuntimeException
+     * @throws XmlException
      */
-    private function saveDocument(\DOMDocument $document, string $name): void
+    private function saveDocument(DOMDocument $document, string $name): void
     {
-        $filename = \sprintf('%s/%s.xml', $this->getTargetDirectory(), $name);
+        $filename = sprintf('%s/%s.xml', $this->targetDirectory(), $name);
 
         $document->formatOutput       = true;
         $document->preserveWhiteSpace = false;
-        $this->initTargetDirectory(\dirname($filename));
+        $this->initTargetDirectory(dirname($filename));
 
-        $document->save($filename);
+        file_put_contents($filename, $this->documentAsString($document));
     }
 
-    private function createDirectory(string $directory): bool
+    /**
+     * @throws XmlException
+     *
+     * @see https://bugs.php.net/bug.php?id=79191
+     */
+    private function documentAsString(DOMDocument $document): string
     {
-        return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
+        $xmlErrorHandling = libxml_use_internal_errors(true);
+        $xml              = $document->saveXML();
+
+        if ($xml === false) {
+            $message = 'Unable to generate the XML';
+
+            foreach (libxml_get_errors() as $error) {
+                $message .= PHP_EOL . $error->message;
+            }
+
+            throw new XmlException($message);
+        }
+
+        libxml_clear_errors();
+        libxml_use_internal_errors($xmlErrorHandling);
+
+        return $xml;
     }
 }

vendor/phpunit/php-code-coverage/src/Report/Xml/File.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,25 +9,31 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use DOMDocument;
+use DOMElement;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 class File
 {
     /**
-     * @var \DOMDocument
+     * @var DOMDocument
      */
     private $dom;
 
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $contextNode;
 
-    public function __construct(\DOMElement $context)
+    public function __construct(DOMElement $context)
     {
         $this->dom         = $context->ownerDocument;
         $this->contextNode = $context;
     }
 
-    public function getTotals(): Totals
+    public function totals(): Totals
     {
         $totalsContainer = $this->contextNode->firstChild;
 
@@ -43,7 +49,7 @@ class File
         return new Totals($totalsContainer);
     }
 
-    public function getLineCoverage(string $line): Coverage
+    public function lineCoverage(string $line): Coverage
     {
         $coverage = $this->contextNode->getElementsByTagNameNS(
             'https://schema.phpunit.de/coverage/1.0',
@@ -69,12 +75,12 @@ class File
         return new Coverage($lineNode, $line);
     }
 
-    protected function getContextNode(): \DOMElement
+    protected function contextNode(): DOMElement
     {
         return $this->contextNode;
     }
 
-    protected function getDomDocument(): \DOMDocument
+    protected function dom(): DOMDocument
     {
         return $this->dom;
     }

vendor/phpunit/php-code-coverage/src/Report/Xml/Method.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,14 +9,19 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use DOMElement;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 final class Method
 {
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $contextNode;
 
-    public function __construct(\DOMElement $context, string $name)
+    public function __construct(DOMElement $context, string $name)
     {
         $this->contextNode = $context;
 

vendor/phpunit/php-code-coverage/src/Report/Xml/Node.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,34 +9,40 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use DOMDocument;
+use DOMElement;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 abstract class Node
 {
     /**
-     * @var \DOMDocument
+     * @var DOMDocument
      */
     private $dom;
 
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $contextNode;
 
-    public function __construct(\DOMElement $context)
+    public function __construct(DOMElement $context)
     {
         $this->setContextNode($context);
     }
 
-    public function getDom(): \DOMDocument
+    public function dom(): DOMDocument
     {
         return $this->dom;
     }
 
-    public function getTotals(): Totals
+    public function totals(): Totals
     {
-        $totalsContainer = $this->getContextNode()->firstChild;
+        $totalsContainer = $this->contextNode()->firstChild;
 
         if (!$totalsContainer) {
-            $totalsContainer = $this->getContextNode()->appendChild(
+            $totalsContainer = $this->contextNode()->appendChild(
                 $this->dom->createElementNS(
                     'https://schema.phpunit.de/coverage/1.0',
                     'totals'
@@ -49,38 +55,38 @@ abstract class Node
 
     public function addDirectory(string $name): Directory
     {
-        $dirNode = $this->getDom()->createElementNS(
+        $dirNode = $this->dom()->createElementNS(
             'https://schema.phpunit.de/coverage/1.0',
             'directory'
         );
 
         $dirNode->setAttribute('name', $name);
-        $this->getContextNode()->appendChild($dirNode);
+        $this->contextNode()->appendChild($dirNode);
 
         return new Directory($dirNode);
     }
 
     public function addFile(string $name, string $href): File
     {
-        $fileNode = $this->getDom()->createElementNS(
+        $fileNode = $this->dom()->createElementNS(
             'https://schema.phpunit.de/coverage/1.0',
             'file'
         );
 
         $fileNode->setAttribute('name', $name);
         $fileNode->setAttribute('href', $href);
-        $this->getContextNode()->appendChild($fileNode);
+        $this->contextNode()->appendChild($fileNode);
 
         return new File($fileNode);
     }
 
-    protected function setContextNode(\DOMElement $context): void
+    protected function setContextNode(DOMElement $context): void
     {
         $this->dom         = $context->ownerDocument;
         $this->contextNode = $context;
     }
 
-    protected function getContextNode(): \DOMElement
+    protected function contextNode(): DOMElement
     {
         return $this->contextNode;
     }

vendor/phpunit/php-code-coverage/src/Report/Xml/Project.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,6 +9,11 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use DOMDocument;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 final class Project extends Node
 {
     public function __construct(string $directory)
@@ -17,21 +22,21 @@ final class Project extends Node
         $this->setProjectSourceDirectory($directory);
     }
 
-    public function getProjectSourceDirectory(): string
+    public function projectSourceDirectory(): string
     {
-        return $this->getContextNode()->getAttribute('source');
+        return $this->contextNode()->getAttribute('source');
     }
 
-    public function getBuildInformation(): BuildInformation
+    public function buildInformation(): BuildInformation
     {
-        $buildNode = $this->getDom()->getElementsByTagNameNS(
+        $buildNode = $this->dom()->getElementsByTagNameNS(
             'https://schema.phpunit.de/coverage/1.0',
             'build'
         )->item(0);
 
         if (!$buildNode) {
-            $buildNode = $this->getDom()->documentElement->appendChild(
-                $this->getDom()->createElementNS(
+            $buildNode = $this->dom()->documentElement->appendChild(
+                $this->dom()->createElementNS(
                     'https://schema.phpunit.de/coverage/1.0',
                     'build'
                 )
@@ -41,16 +46,16 @@ final class Project extends Node
         return new BuildInformation($buildNode);
     }
 
-    public function getTests(): Tests
+    public function tests(): Tests
     {
-        $testsNode = $this->getContextNode()->getElementsByTagNameNS(
+        $testsNode = $this->contextNode()->getElementsByTagNameNS(
             'https://schema.phpunit.de/coverage/1.0',
             'tests'
         )->item(0);
 
         if (!$testsNode) {
-            $testsNode = $this->getContextNode()->appendChild(
-                $this->getDom()->createElementNS(
+            $testsNode = $this->contextNode()->appendChild(
+                $this->dom()->createElementNS(
                     'https://schema.phpunit.de/coverage/1.0',
                     'tests'
                 )
@@ -60,14 +65,14 @@ final class Project extends Node
         return new Tests($testsNode);
     }
 
-    public function asDom(): \DOMDocument
+    public function asDom(): DOMDocument
     {
-        return $this->getDom();
+        return $this->dom();
     }
 
     private function init(): void
     {
-        $dom = new \DOMDocument;
+        $dom = new DOMDocument;
         $dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="https://schema.phpunit.de/coverage/1.0"><build/><project/></phpunit>');
 
         $this->setContextNode(
@@ -80,6 +85,6 @@ final class Project extends Node
 
     private function setProjectSourceDirectory(string $name): void
     {
-        $this->getContextNode()->setAttribute('source', $name);
+        $this->contextNode()->setAttribute('source', $name);
     }
 }

vendor/phpunit/php-code-coverage/src/Report/Xml/Report.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,11 +9,18 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use function basename;
+use function dirname;
+use DOMDocument;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 final class Report extends File
 {
     public function __construct(string $name)
     {
-        $dom = new \DOMDocument();
+        $dom = new DOMDocument();
         $dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="https://schema.phpunit.de/coverage/1.0"><file /></phpunit>');
 
         $contextNode = $dom->getElementsByTagNameNS(
@@ -26,15 +33,15 @@ final class Report extends File
         $this->setName($name);
     }
 
-    public function asDom(): \DOMDocument
+    public function asDom(): DOMDocument
     {
-        return $this->getDomDocument();
+        return $this->dom();
     }
 
-    public function getFunctionObject($name): Method
+    public function functionObject($name): Method
     {
-        $node = $this->getContextNode()->appendChild(
-            $this->getDomDocument()->createElementNS(
+        $node = $this->contextNode()->appendChild(
+            $this->dom()->createElementNS(
                 'https://schema.phpunit.de/coverage/1.0',
                 'function'
             )
@@ -43,26 +50,26 @@ final class Report extends File
         return new Method($node, $name);
     }
 
-    public function getClassObject($name): Unit
+    public function classObject($name): Unit
     {
-        return $this->getUnitObject('class', $name);
+        return $this->unitObject('class', $name);
     }
 
-    public function getTraitObject($name): Unit
+    public function traitObject($name): Unit
     {
-        return $this->getUnitObject('trait', $name);
+        return $this->unitObject('trait', $name);
     }
 
-    public function getSource(): Source
+    public function source(): Source
     {
-        $source = $this->getContextNode()->getElementsByTagNameNS(
+        $source = $this->contextNode()->getElementsByTagNameNS(
             'https://schema.phpunit.de/coverage/1.0',
             'source'
         )->item(0);
 
         if (!$source) {
-            $source = $this->getContextNode()->appendChild(
-                $this->getDomDocument()->createElementNS(
+            $source = $this->contextNode()->appendChild(
+                $this->dom()->createElementNS(
                     'https://schema.phpunit.de/coverage/1.0',
                     'source'
                 )
@@ -72,16 +79,16 @@ final class Report extends File
         return new Source($source);
     }
 
-    private function setName($name): void
+    private function setName(string $name): void
     {
-        $this->getContextNode()->setAttribute('name', \basename($name));
-        $this->getContextNode()->setAttribute('path', \dirname($name));
+        $this->contextNode()->setAttribute('name', basename($name));
+        $this->contextNode()->setAttribute('path', dirname($name));
     }
 
-    private function getUnitObject($tagName, $name): Unit
+    private function unitObject(string $tagName, $name): Unit
     {
-        $node = $this->getContextNode()->appendChild(
-            $this->getDomDocument()->createElementNS(
+        $node = $this->contextNode()->appendChild(
+            $this->dom()->createElementNS(
                 'https://schema.phpunit.de/coverage/1.0',
                 $tagName
             )

vendor/phpunit/php-code-coverage/src/Report/Xml/Source.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,16 +9,20 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use DOMElement;
 use TheSeer\Tokenizer\NamespaceUri;
 use TheSeer\Tokenizer\Tokenizer;
 use TheSeer\Tokenizer\XMLSerializer;
 
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 final class Source
 {
-    /** @var \DOMElement */
+    /** @var DOMElement */
     private $context;
 
-    public function __construct(\DOMElement $context)
+    public function __construct(DOMElement $context)
     {
         $this->context = $context;
     }

vendor/phpunit/php-code-coverage/src/Report/Xml/Tests.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,6 +9,11 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use DOMElement;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 final class Tests
 {
     private $contextNode;
@@ -24,7 +29,7 @@ final class Tests
         6  => 'WARNING',     // PHPUnit_Runner_BaseTestRunner::STATUS_WARNING
     ];
 
-    public function __construct(\DOMElement $context)
+    public function __construct(DOMElement $context)
     {
         $this->contextNode = $context;
     }

vendor/phpunit/php-code-coverage/src/Report/Xml/Totals.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,41 +9,47 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
-use SebastianBergmann\CodeCoverage\Util;
+use function sprintf;
+use DOMElement;
+use DOMNode;
+use SebastianBergmann\CodeCoverage\Percentage;
 
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 final class Totals
 {
     /**
-     * @var \DOMNode
+     * @var DOMNode
      */
     private $container;
 
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $linesNode;
 
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $methodsNode;
 
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $functionsNode;
 
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $classesNode;
 
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $traitsNode;
 
-    public function __construct(\DOMElement $container)
+    public function __construct(DOMElement $container)
     {
         $this->container = $container;
         $dom             = $container->ownerDocument;
@@ -80,7 +86,7 @@ final class Totals
         $container->appendChild($this->traitsNode);
     }
 
-    public function getContainer(): \DOMNode
+    public function container(): DOMNode
     {
         return $this->container;
     }
@@ -94,7 +100,7 @@ final class Totals
         $this->linesNode->setAttribute('executed', (string) $executed);
         $this->linesNode->setAttribute(
             'percent',
-            $executable === 0 ? '0' : \sprintf('%01.2F', Util::percent($executed, $executable))
+            $executable === 0 ? '0' : sprintf('%01.2F', Percentage::fromFractionAndTotal($executed, $executable)->asFloat())
         );
     }
 
@@ -104,7 +110,7 @@ final class Totals
         $this->classesNode->setAttribute('tested', (string) $tested);
         $this->classesNode->setAttribute(
             'percent',
-            $count === 0 ? '0' : \sprintf('%01.2F', Util::percent($tested, $count))
+            $count === 0 ? '0' : sprintf('%01.2F', Percentage::fromFractionAndTotal($tested, $count)->asFloat())
         );
     }
 
@@ -114,7 +120,7 @@ final class Totals
         $this->traitsNode->setAttribute('tested', (string) $tested);
         $this->traitsNode->setAttribute(
             'percent',
-            $count === 0 ? '0' : \sprintf('%01.2F', Util::percent($tested, $count))
+            $count === 0 ? '0' : sprintf('%01.2F', Percentage::fromFractionAndTotal($tested, $count)->asFloat())
         );
     }
 
@@ -124,7 +130,7 @@ final class Totals
         $this->methodsNode->setAttribute('tested', (string) $tested);
         $this->methodsNode->setAttribute(
             'percent',
-            $count === 0 ? '0' : \sprintf('%01.2F', Util::percent($tested, $count))
+            $count === 0 ? '0' : sprintf('%01.2F', Percentage::fromFractionAndTotal($tested, $count)->asFloat())
         );
     }
 
@@ -134,7 +140,7 @@ final class Totals
         $this->functionsNode->setAttribute('tested', (string) $tested);
         $this->functionsNode->setAttribute(
             'percent',
-            $count === 0 ? '0' : \sprintf('%01.2F', Util::percent($tested, $count))
+            $count === 0 ? '0' : sprintf('%01.2F', Percentage::fromFractionAndTotal($tested, $count)->asFloat())
         );
     }
 }

vendor/phpunit/php-code-coverage/src/Report/Xml/Unit.php

@@ -1,6 +1,6 @@
 <?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>
  *
@@ -9,14 +9,19 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use DOMElement;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
 final class Unit
 {
     /**
-     * @var \DOMElement
+     * @var DOMElement
      */
     private $contextNode;
 
-    public function __construct(\DOMElement $context, string $name)
+    public function __construct(DOMElement $context, string $name)
     {
         $this->contextNode = $context;
 
@@ -35,28 +40,6 @@ final class Unit
         $this->contextNode->setAttribute('crap', (string) $crap);
     }
 
-    public function setPackage(string $full, string $package, string $sub, string $category): void
-    {
-        $node = $this->contextNode->getElementsByTagNameNS(
-            'https://schema.phpunit.de/coverage/1.0',
-            'package'
-        )->item(0);
-
-        if (!$node) {
-            $node = $this->contextNode->appendChild(
-                $this->contextNode->ownerDocument->createElementNS(
-                    'https://schema.phpunit.de/coverage/1.0',
-                    'package'
-                )
-            );
-        }
-
-        $node->setAttribute('full', $full);
-        $node->setAttribute('name', $package);
-        $node->setAttribute('sub', $sub);
-        $node->setAttribute('category', $category);
-    }
-
     public function setNamespace(string $namespace): void
     {
         $node = $this->contextNode->getElementsByTagNameNS(