Reorganize

.psalm/baseline.xml

@@ -43,6 +43,17 @@
  <code>waiting()</code>
  </UndefinedFunction>
  </file>
+ <file src="src/Data/ProcessedCodeCoverageData.php">
+ <PossiblyNullArgument occurrences="1">
+ <code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
+ </PossiblyNullArgument>
+ <PossiblyNullArrayAccess occurrences="1">
+ <code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
+ </PossiblyNullArrayAccess>
+ <PossiblyNullArrayAssignment occurrences="1">
+ <code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
+ </PossiblyNullArrayAssignment>
+ </file>
  <file src="src/Driver/Xdebug2Driver.php">
  <UndefinedConstant occurrences="3">
  <code>XDEBUG_CC_BRANCH_CHECK</code>
@@ -131,17 +142,6 @@
  <code>$position</code>
  </PropertyNotSetInConstructor>
  </file>
- <file src="src/ProcessedCodeCoverageData.php">
- <PossiblyNullArgument occurrences="1">
- <code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
- </PossiblyNullArgument>
- <PossiblyNullArrayAccess occurrences="1">
- <code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
- </PossiblyNullArrayAccess>
- <PossiblyNullArrayAssignment occurrences="1">
- <code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
- </PossiblyNullArrayAssignment>
- </file>
  <file src="src/Report/Html/Renderer/File.php">
  <InternalClass occurrences="7">
  <code>BaseTestRunner::STATUS_ERROR</code>

src/CodeCoverage.php

@@ -26,6 +26,8 @@
 use PHPUnit\Runner\PhptTestCase;
 use PHPUnit\Util\Test;
 use ReflectionClass;
+use SebastianBergmann\CodeCoverage\Data\ProcessedCodeCoverageData;
+use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
 use SebastianBergmann\CodeCoverage\Driver\Driver;
 use SebastianBergmann\CodeCoverage\Node\Builder;
 use SebastianBergmann\CodeCoverage\Node\Directory;

src/ProcessedCodeCoverageData.php → src/Data/ProcessedCodeCoverageData.php

@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace SebastianBergmann\CodeCoverage;
+namespace SebastianBergmann\CodeCoverage\Data;
 
 use function array_key_exists;
 use function array_keys;

src/RawCodeCoverageData.php → src/Data/RawCodeCoverageData.php

@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace SebastianBergmann\CodeCoverage;
+namespace SebastianBergmann\CodeCoverage\Data;
 
 use function array_diff;
 use function array_diff_key;

src/Driver/Driver.php

@@ -11,11 +11,11 @@
 
 use function sprintf;
 use SebastianBergmann\CodeCoverage\BranchAndPathCoverageNotSupportedException;
+use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
 use SebastianBergmann\CodeCoverage\DeadCodeDetectionNotSupportedException;
 use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\NoCodeCoverageDriverAvailableException;
 use SebastianBergmann\CodeCoverage\NoCodeCoverageDriverWithPathCoverageSupportAvailableException;
-use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Driver/PcovDriver.php

@@ -18,8 +18,8 @@
 use function pcov\stop;
 use function pcov\waiting;
 use function phpversion;
+use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
 use SebastianBergmann\CodeCoverage\Filter;
-use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Driver/PhpdbgDriver.php

@@ -18,7 +18,7 @@
 use function phpdbg_end_oplog;
 use function phpdbg_get_executable;
 use function phpdbg_start_oplog;
-use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
+use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Driver/Xdebug2Driver.php

@@ -25,8 +25,8 @@
 use function xdebug_set_filter;
 use function xdebug_start_code_coverage;
 use function xdebug_stop_code_coverage;
+use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
 use SebastianBergmann\CodeCoverage\Filter;
-use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Driver/Xdebug3Driver.php

@@ -26,8 +26,8 @@
 use function xdebug_set_filter;
 use function xdebug_start_code_coverage;
 use function xdebug_stop_code_coverage;
+use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
 use SebastianBergmann\CodeCoverage\Filter;
-use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Exception/DirectoryCouldNotBeCreatedException.php

@@ -7,9 +7,10 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace SebastianBergmann\CodeCoverage;
+namespace SebastianBergmann\CodeCoverage\Util;
 
 use RuntimeException;
+use SebastianBergmann\CodeCoverage\Exception;
 
 final class DirectoryCouldNotBeCreatedException extends RuntimeException implements Exception
 {

src/Node/AbstractNode.php

@@ -14,7 +14,7 @@
 use function str_replace;
 use function substr;
 use Countable;
-use SebastianBergmann\CodeCoverage\Percentage;
+use SebastianBergmann\CodeCoverage\Util\Percentage;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Node/Builder.php

@@ -21,7 +21,7 @@
 use function strpos;
 use function substr;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
-use SebastianBergmann\CodeCoverage\ProcessedCodeCoverageData;
+use SebastianBergmann\CodeCoverage\Data\ProcessedCodeCoverageData;
 use SebastianBergmann\CodeCoverage\StaticAnalysis\FileAnalyser;
 
 /**

src/CrapIndex.php → src/Node/CrapIndex.php

@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace SebastianBergmann\CodeCoverage;
+namespace SebastianBergmann\CodeCoverage\Node;
 
 use function sprintf;
 
@@ -26,11 +26,6 @@ final class CrapIndex
  */
  private $codeCoverage;
 
- public static function fromCyclomaticComplexityAndCoveragePercentage(int $cyclomaticComplexity, float $codeCoverage): self
- {
- return new self($cyclomaticComplexity, $codeCoverage);
- }
-
  public function __construct(int $cyclomaticComplexity, float $codeCoverage)
  {
  $this->cyclomaticComplexity = $cyclomaticComplexity;

src/Node/File.php

@@ -12,7 +12,6 @@
 use function array_filter;
 use function count;
 use function range;
-use SebastianBergmann\CodeCoverage\CrapIndex;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Report/Clover.php

@@ -19,9 +19,9 @@
 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\Util\Filesystem;
 
 final class Clover
 {
@@ -243,7 +243,7 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
  $buffer = $xmlDocument->saveXML();
 
  if ($target !== null) {
- Directory::create(dirname($target));
+ Filesystem::createDirectory(dirname($target));
 
  if (@file_put_contents($target, $buffer) === false) {
  throw new WriteOperationFailedException($target);

src/Report/Cobertura.php

@@ -16,9 +16,9 @@
 use function time;
 use DOMImplementation;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
-use SebastianBergmann\CodeCoverage\Directory;
 use SebastianBergmann\CodeCoverage\Driver\WriteOperationFailedException;
 use SebastianBergmann\CodeCoverage\Node\File;
+use SebastianBergmann\CodeCoverage\Util\Filesystem;
 
 final class Cobertura
 {
@@ -292,7 +292,7 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
  $buffer = $document->saveXML();
 
  if ($target !== null) {
- Directory::create(dirname($target));
+ Filesystem::createDirectory(dirname($target));
 
  if (@file_put_contents($target, $buffer) === false) {
  throw new WriteOperationFailedException($target);

src/Report/Crap4j.php

@@ -17,9 +17,9 @@
 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\Util\Filesystem;
 
 final class Crap4j
 {
@@ -124,7 +124,7 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
  $buffer = $document->saveXML();
 
  if ($target !== null) {
- Directory::create(dirname($target));
+ Filesystem::createDirectory(dirname($target));
 
  if (@file_put_contents($target, $buffer) === false) {
  throw new WriteOperationFailedException($target);

src/Report/Html/Facade.php

@@ -15,9 +15,9 @@
 use function dirname;
 use function substr;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
-use SebastianBergmann\CodeCoverage\Directory as DirectoryUtil;
 use SebastianBergmann\CodeCoverage\InvalidArgumentException;
 use SebastianBergmann\CodeCoverage\Node\Directory as DirectoryNode;
+use SebastianBergmann\CodeCoverage\Util\Filesystem;
 
 final class Facade
 {
@@ -95,14 +95,14 @@ public function process(CodeCoverage $coverage, string $target): void
  $id = $node->id();
 
  if ($node instanceof DirectoryNode) {
- DirectoryUtil::create($target . $id);
+ Filesystem::createDirectory($target . $id);
 
  $directory->render($node, $target . $id . '/index.html');
  $dashboard->render($node, $target . $id . '/dashboard.html');
  } else {
  $dir = dirname($target . $id);
 
- DirectoryUtil::create($dir);
+ Filesystem::createDirectory($dir);
 
  $file->render($node, $target . $id);
  }
@@ -140,7 +140,7 @@ private function directory(string $directory): string
  $directory .= DIRECTORY_SEPARATOR;
  }
 
- DirectoryUtil::create($directory);
+ Filesystem::createDirectory($directory);
 
  return $directory;
  }

src/Report/Html/Renderer/File.php

@@ -96,7 +96,7 @@
 use function trim;
 use PHPUnit\Runner\BaseTestRunner;
 use SebastianBergmann\CodeCoverage\Node\File as FileNode;
-use SebastianBergmann\CodeCoverage\Percentage;
+use SebastianBergmann\CodeCoverage\Util\Percentage;
 use SebastianBergmann\Template\Template;
 
 /**

src/Report/PHP.php

@@ -14,8 +14,8 @@
 use function serialize;
 use function sprintf;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
-use SebastianBergmann\CodeCoverage\Directory;
 use SebastianBergmann\CodeCoverage\Driver\WriteOperationFailedException;
+use SebastianBergmann\CodeCoverage\Util\Filesystem;
 
 final class PHP
 {
@@ -31,7 +31,7 @@ public function process(CodeCoverage $coverage, ?string $target = null): string
  );
 
  if ($target !== null) {
- Directory::create(dirname($target));
+ Filesystem::createDirectory(dirname($target));
 
  if (@file_put_contents($target, $buffer) === false) {
  throw new WriteOperationFailedException($target);

src/Report/Text.php

@@ -19,7 +19,7 @@
 use function strlen;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Node\File;
-use SebastianBergmann\CodeCoverage\Percentage;
+use SebastianBergmann\CodeCoverage\Util\Percentage;
 
 final class Text
 {

src/Report/Xml/Facade.php

@@ -28,12 +28,12 @@
 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\Util\Filesystem as DirectoryUtil;
 use SebastianBergmann\CodeCoverage\Version;
 use SebastianBergmann\CodeCoverage\XmlException;
 use SebastianBergmann\Environment\Runtime;
@@ -109,7 +109,7 @@ private function initTargetDirectory(string $directory): void
  }
  }
 
- DirectoryUtil::create($directory);
+ DirectoryUtil::createDirectory($directory);
  }
 
  /**

src/Report/Xml/Totals.php

@@ -12,7 +12,7 @@
 use function sprintf;
 use DOMElement;
 use DOMNode;
-use SebastianBergmann\CodeCoverage\Percentage;
+use SebastianBergmann\CodeCoverage\Util\Percentage;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/StaticAnalysis/CachingFileAnalyser.php

@@ -14,7 +14,7 @@
 use function file_put_contents;
 use function is_file;
 use function serialize;
-use SebastianBergmann\CodeCoverage\Directory;
+use SebastianBergmann\CodeCoverage\Util\Filesystem;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
@@ -40,7 +40,7 @@ final class CachingFileAnalyser implements FileAnalyser
 
  public function __construct(string $directory, FileAnalyser $analyser)
  {
- Directory::create($directory);
+ Filesystem::createDirectory($directory);
 
  $this->analyser = $analyser;
  $this->directory = $directory;

src/Directory.php → src/Util/Filesystem.php

@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace SebastianBergmann\CodeCoverage;
+namespace SebastianBergmann\CodeCoverage\Util;
 
 use function is_dir;
 use function mkdir;
@@ -16,12 +16,12 @@
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
  */
-final class Directory
+final class Filesystem
 {
  /**
  * @throws DirectoryCouldNotBeCreatedException
  */
- public static function create(string $directory): void
+ public static function createDirectory(string $directory): void
  {
  $success = !(!is_dir($directory) && !@mkdir($directory, 0777, true) && !is_dir($directory));
 

src/Percentage.php → src/Util/Percentage.php

@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace SebastianBergmann\CodeCoverage;
+namespace SebastianBergmann\CodeCoverage\Util;
 
 use function sprintf;
 

tests/TestCase.php

@@ -9,6 +9,7 @@
  */
 namespace SebastianBergmann\CodeCoverage;
 
+use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
 use function array_merge;
 use function range;
 use function rmdir;