Fix CS/WS issues

sebastianbergmann · sebastianbergmann · commit 069c83f1b3ef · 2023-01-15T14:57:47.000+01:00
diff --git a/src/CodeCoverage.php b/src/CodeCoverage.php
@@ -39,37 +39,24 @@
 final class CodeCoverage
 {
     private const UNCOVERED_FILES = 'UNCOVERED_FILES';
-
     private Driver $driver;
-
     private Filter $filter;
-
     private Wizard $wizard;
-
     private bool $checkForUnintentionallyCoveredCode = false;
-
-    private bool $includeUncoveredFiles = true;
-
-    private bool $ignoreDeprecatedCode = false;
-
-    private ?string $currentId = null;
-
-    private ?TestSize $currentSize = null;
-
+    private bool $includeUncoveredFiles              = true;
+    private bool $ignoreDeprecatedCode               = false;
+    private ?string $currentId                       = null;
+    private ?TestSize $currentSize                   = null;
     private ProcessedCodeCoverageData $data;
-
     private bool $useAnnotationsForIgnoringCode = true;
-
-    private array $tests = [];
+    private array $tests                        = [];
 
     /**
      * @psalm-var list<class-string>
      */
     private array $parentClassesExcludedFromUnintentionallyCoveredCodeCheck = [];
-
-    private ?FileAnalyser $analyser = null;
-
-    private ?string $cacheDirectory = null;
+    private ?FileAnalyser $analyser                                         = null;
+    private ?string $cacheDirectory                                         = null;
 
     public function __construct(Driver $driver, Filter $filter)
     {
diff --git a/src/Driver/Driver.php b/src/Driver/Driver.php
@@ -52,11 +52,9 @@ abstract class Driver
      *
      * @see http://xdebug.org/docs/code_coverage
      */
-    public const BRANCH_HIT = 1;
-
+    public const BRANCH_HIT                    = 1;
     private bool $collectBranchAndPathCoverage = false;
-
-    private bool $detectDeadCode = false;
+    private bool $detectDeadCode               = false;
 
     public function canCollectBranchAndPathCoverage(): bool
     {
diff --git a/src/Node/AbstractNode.php b/src/Node/AbstractNode.php
@@ -23,13 +23,9 @@
 abstract class AbstractNode implements Countable
 {
     private string $name;
-
     private string $pathAsString;
-
     private array $pathAsArray;
-
     private ?AbstractNode $parent;
-
     private string $id;
 
     public function __construct(string $name, self $parent = null)
diff --git a/src/Node/CrapIndex.php b/src/Node/CrapIndex.php
@@ -17,7 +17,6 @@
 final class CrapIndex
 {
     private int $cyclomaticComplexity;
-
     private float $codeCoverage;
 
     public function __construct(int $cyclomaticComplexity, float $codeCoverage)
diff --git a/src/Node/Directory.php b/src/Node/Directory.php
@@ -32,48 +32,30 @@ final class Directory extends AbstractNode implements IteratorAggregate
     /**
      * @var list<File>
      */
-    private array $files = [];
-
-    private ?array $classes = null;
-
-    private ?array $traits = null;
-
+    private array $files      = [];
+    private ?array $classes   = null;
+    private ?array $traits    = null;
     private ?array $functions = null;
 
     /**
      * @psalm-var null|array{linesOfCode: int, commentLinesOfCode: int, nonCommentLinesOfCode: int}
      */
-    private ?array $linesOfCode = null;
-
-    private int $numFiles = -1;
-
-    private int $numExecutableLines = -1;
-
-    private int $numExecutedLines = -1;
-
+    private ?array $linesOfCode        = null;
+    private int $numFiles              = -1;
+    private int $numExecutableLines    = -1;
+    private int $numExecutedLines      = -1;
     private int $numExecutableBranches = -1;
-
-    private int $numExecutedBranches = -1;
-
-    private int $numExecutablePaths = -1;
-
-    private int $numExecutedPaths = -1;
-
-    private int $numClasses = -1;
-
-    private int $numTestedClasses = -1;
-
-    private int $numTraits = -1;
-
-    private int $numTestedTraits = -1;
-
-    private int $numMethods = -1;
-
-    private int $numTestedMethods = -1;
-
-    private int $numFunctions = -1;
-
-    private int $numTestedFunctions = -1;
+    private int $numExecutedBranches   = -1;
+    private int $numExecutablePaths    = -1;
+    private int $numExecutedPaths      = -1;
+    private int $numClasses            = -1;
+    private int $numTestedClasses      = -1;
+    private int $numTraits             = -1;
+    private int $numTestedTraits       = -1;
+    private int $numMethods            = -1;
+    private int $numTestedMethods      = -1;
+    private int $numFunctions          = -1;
+    private int $numTestedFunctions    = -1;
 
     public function count(): int
     {
diff --git a/src/Node/File.php b/src/Node/File.php
@@ -19,49 +19,30 @@
 final class File extends AbstractNode
 {
     private array $lineCoverageData;
-
     private array $functionCoverageData;
-
     private array $testData;
-
-    private int $numExecutableLines = 0;
-
-    private int $numExecutedLines = 0;
-
+    private int $numExecutableLines    = 0;
+    private int $numExecutedLines      = 0;
     private int $numExecutableBranches = 0;
-
-    private int $numExecutedBranches = 0;
-
-    private int $numExecutablePaths = 0;
-
-    private int $numExecutedPaths = 0;
-
-    private array $classes = [];
-
-    private array $traits = [];
-
-    private array $functions = [];
+    private int $numExecutedBranches   = 0;
+    private int $numExecutablePaths    = 0;
+    private int $numExecutedPaths      = 0;
+    private array $classes             = [];
+    private array $traits              = [];
+    private array $functions           = [];
 
     /**
      * @psalm-return array{linesOfCode: int, commentLinesOfCode: int, nonCommentLinesOfCode: int}
      */
     private array $linesOfCode;
-
-    private ?int $numClasses = null;
-
-    private int $numTestedClasses = 0;
-
-    private ?int $numTraits = null;
-
-    private int $numTestedTraits = 0;
-
-    private ?int $numMethods = null;
-
-    private ?int $numTestedMethods = null;
-
+    private ?int $numClasses         = null;
+    private int $numTestedClasses    = 0;
+    private ?int $numTraits          = null;
+    private int $numTestedTraits     = 0;
+    private ?int $numMethods         = null;
+    private ?int $numTestedMethods   = null;
     private ?int $numTestedFunctions = null;
-
-    private array $codeUnitsByLine = [];
+    private array $codeUnitsByLine   = [];
 
     /**
      * @psalm-param array{linesOfCode: int, commentLinesOfCode: int, nonCommentLinesOfCode: int} $linesOfCode
diff --git a/src/Report/Html/Colors.php b/src/Report/Html/Colors.php
@@ -15,13 +15,9 @@
 final class Colors
 {
     private string $successLow;
-
     private string $successMedium;
-
     private string $successHigh;
-
     private string $warning;
-
     private string $danger;
 
     public static function default(): self
diff --git a/src/Report/Html/Facade.php b/src/Report/Html/Facade.php
@@ -23,13 +23,9 @@
 final class Facade
 {
     private string $templatePath;
-
     private string $generator;
-
     private Colors $colors;
-
     private Thresholds $thresholds;
-
     private CustomCssFile $customCssFile;
 
     public function __construct(string $generator = '', ?Colors $colors = null, ?Thresholds $thresholds = null, ?CustomCssFile $customCssFile = null)
diff --git a/src/Report/Html/Renderer.php b/src/Report/Html/Renderer.php
@@ -28,15 +28,10 @@
 abstract class Renderer
 {
     protected string $templatePath;
-
     protected string $generator;
-
     protected string $date;
-
     protected Thresholds $thresholds;
-
     protected bool $hasBranchCoverage;
-
     protected string $version;
 
     public function __construct(string $templatePath, string $generator, string $date, Thresholds $thresholds, bool $hasBranchCoverage)
diff --git a/src/Report/Html/Renderer/File.php b/src/Report/Html/Renderer/File.php
@@ -111,11 +111,9 @@ final class File extends Renderer
     /**
      * @psalm-var array<int,true>
      */
-    private static array $keywordTokens = [];
-
+    private static array $keywordTokens        = [];
     private static array $formattedSourceCache = [];
-
-    private int $htmlSpecialCharsFlags = ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE;
+    private int $htmlSpecialCharsFlags         = ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE;
 
     public function render(FileNode $node, string $file): void
     {
diff --git a/src/Report/Text.php b/src/Report/Text.php
@@ -47,11 +47,8 @@ final class Text
      * @var string
      */
     private const COLOR_RESET = "\x1b[0m";
-
     private Thresholds $thresholds;
-
     private bool $showUncoveredFiles;
-
     private bool $showOnlySummary;
 
     public function __construct(Thresholds $thresholds, bool $showUncoveredFiles = false, bool $showOnlySummary = false)
diff --git a/src/Report/Thresholds.php b/src/Report/Thresholds.php
@@ -17,7 +17,6 @@
 final class Thresholds
 {
     private int $lowUpperBound;
-
     private int $highLowerBound;
 
     public static function default(): self
diff --git a/src/Report/Xml/Coverage.php b/src/Report/Xml/Coverage.php
@@ -19,9 +19,7 @@
 final class Coverage
 {
     private XMLWriter $writer;
-
     private DOMElement $contextNode;
-
     private bool $finalized = false;
 
     public function __construct(DOMElement $context, string $line)
diff --git a/src/Report/Xml/Facade.php b/src/Report/Xml/Facade.php
@@ -41,9 +41,7 @@
 final class Facade
 {
     private string $target;
-
     private Project $project;
-
     private string $phpUnitVersion;
 
     public function __construct(string $version)
diff --git a/src/Report/Xml/File.php b/src/Report/Xml/File.php
@@ -18,7 +18,6 @@
 class File
 {
     private DOMDocument $dom;
-
     private DOMElement $contextNode;
 
     public function __construct(DOMElement $context)
diff --git a/src/Report/Xml/Node.php b/src/Report/Xml/Node.php
@@ -18,7 +18,6 @@
 abstract class Node
 {
     private DOMDocument $dom;
-
     private DOMElement $contextNode;
 
     public function __construct(DOMElement $context)
diff --git a/src/Report/Xml/Totals.php b/src/Report/Xml/Totals.php
@@ -20,15 +20,10 @@
 final class Totals
 {
     private DOMNode $container;
-
     private DOMElement $linesNode;
-
     private DOMElement $methodsNode;
-
     private DOMElement $functionsNode;
-
     private DOMElement $classesNode;
-
     private DOMElement $traitsNode;
 
     public function __construct(DOMElement $container)
diff --git a/src/StaticAnalysis/CachingFileAnalyser.php b/src/StaticAnalysis/CachingFileAnalyser.php
@@ -25,11 +25,8 @@
 final class CachingFileAnalyser implements FileAnalyser
 {
     private static ?string $cacheVersion = null;
-
     private FileAnalyser $analyser;
-
     private array $cache = [];
-
     private string $directory;
 
     public function __construct(string $directory, FileAnalyser $analyser)
diff --git a/src/StaticAnalysis/ExecutableLinesFindingVisitor.php b/src/StaticAnalysis/ExecutableLinesFindingVisitor.php
@@ -30,7 +30,6 @@
 final class ExecutableLinesFindingVisitor extends NodeVisitorAbstract
 {
     private int $nextBranch = 0;
-
     private string $source;
 
     /**
diff --git a/src/StaticAnalysis/IgnoredLinesFindingVisitor.php b/src/StaticAnalysis/IgnoredLinesFindingVisitor.php
@@ -29,9 +29,7 @@ final class IgnoredLinesFindingVisitor extends NodeVisitorAbstract
      * @psalm-var array<int>
      */
     private array $ignoredLines = [];
-
     private bool $useAnnotationsForIgnoringCode;
-
     private bool $ignoreDeprecated;
 
     public function __construct(bool $useAnnotationsForIgnoringCode, bool $ignoreDeprecated)
diff --git a/src/StaticAnalysis/ParsingFileAnalyser.php b/src/StaticAnalysis/ParsingFileAnalyser.php
diff --git a/src/Util/Percentage.php b/src/Util/Percentage.php

Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,9 @@ abstract class Driver`
`52`	`52`	`*`
`53`	`53`	`* @see http://xdebug.org/docs/code_coverage`
`54`	`54`	`*/`
`55`		`- public const BRANCH_HIT = 1;`
`56`		`-`
	`55`	`+ public const BRANCH_HIT = 1;`
`57`	`56`	`private bool $collectBranchAndPathCoverage = false;`
`58`		`-`
`59`		`- private bool $detectDeadCode = false;`
	`57`	`+ private bool $detectDeadCode = false;`
`60`	`58`
`61`	`59`	`public function canCollectBranchAndPathCoverage(): bool`
`62`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`final class CrapIndex`
`18`	`18`	`{`
`19`	`19`	`private int $cyclomaticComplexity;`
`20`		`-`
`21`	`20`	`private float $codeCoverage;`
`22`	`21`
`23`	`22`	`public function __construct(int $cyclomaticComplexity, float $codeCoverage)`