Final test coverage sweep (#42)

* test: drop redundancy to avoid coverage gymnastics

* test: suppressed native warning

* test: added coverage for UpstreamResolver

* test: added early return

* test: increased coverage

* test: increased edge case coverage

* test: added cwd fallback

* test: added fixer mapping coverage

* test: removed obsolete todos

ref #33 (comment)

* test: simplified simpara source matching

* test: covered declaration masking

* test: covered valid indentation styles

* test: covered exception name mismatch

* test: covered report edge cases

* test: covered input all paths

* test: covered diff edge cases

* test: covered scope edge cases

* test: covered noop fix edge cases

* test: covered fixer input edge cases

* test: academics

* test: academics

* test: covered processing failure paths

* test: removed @api; now covered by tests

* review: removed yoda style

Author: NickSdot

src/Diff/UpstreamResolver.php

@@ -48,8 +48,9 @@ public function resolve(string $repoRoot, string $repoName): ?string
         }
 
         try {
+            // filesystem or OS edge cases
             if (!flock($lock, LOCK_EX)) {
-                return null;
+                return null; // @codeCoverageIgnore
             }
 
             return $this->refreshAndResolve($repoRoot, $repoName);

src/Path/EntityResolver.php

@@ -123,16 +123,16 @@ private function scanDirectory(string $directory): array
      */
     private function resolveFile(string $filePath, array &$visited, array &$paths, ?string $originEntity = null): array
     {
-        if (isset($visited[$filePath]) || !is_readable($filePath)) {
+        if (isset($visited[$filePath])) {
             return [];
         }
 
         $visited[$filePath] = true;
 
-        $content = file_get_contents($filePath);
+        $content = @file_get_contents($filePath);
 
         if ($content === false) {
-            return []; // @codeCoverageIgnore
+            return [];
         }
 
         $entities = $this->extractEntities($content, $filePath, $visited, $paths);

src/Process/NativeProcessRunner.php

@@ -8,7 +8,7 @@ final class NativeProcessRunner implements ProcessRunnerInterface
 {
     public function run(array $command, string $workingDirectory, array $environment = []): ProcessResult
     {
-        $process = proc_open(
+        $process = @proc_open(
             $command,
             [
                 ['pipe', 'r'],

src/Progress/ConsoleProgress.php

@@ -67,13 +67,14 @@ public function finish(): void
 
     private function drawBar(int $current, string $filePath, int $violations = 0): void
     {
-        $percent = $this->totalFiles > 0
-            ? (int)floor(($current / $this->totalFiles) * 100)
-            : 0; // @codeCoverageIgnore
+        if ($this->totalFiles === 0) {
+            // prevented by public methods
+            return; // @codeCoverageIgnore
+        }
 
-        $filled = $this->totalFiles > 0
-            ? (int)floor(($current / $this->totalFiles) * self::BAR_WIDTH)
-            : 0; // @codeCoverageIgnore
+        $ratio = $current / $this->totalFiles;
+        $percent = (int)floor($ratio * 100);
+        $filled = (int)floor($ratio * self::BAR_WIDTH);
 
         $empty = self::BAR_WIDTH - $filled;
 

src/RelativePath.php

@@ -8,11 +8,7 @@ final class RelativePath
 {
     public static function fromWorkingDirectory(string $filePath): string
     {
-        $workingDirectory = getcwd();
-        if ($workingDirectory === false) {
-            return $filePath; // @codeCoverageIgnore
-        }
-
+        $workingDirectory = getcwd() ?: '.';
         $prefix = rtrim(str_replace('\\', '/', $workingDirectory), '/') . '/';
         $normalisedPath = str_replace('\\', '/', $filePath);
 

src/Report/Report.php

@@ -187,7 +187,7 @@ public function getTotalWarningLevelViolationCount(): int
         ));
     }
 
-    /** @api not implemented */
+    // not implemented
     public function getTotalInfoLevelViolationCount(): int
     {
         return array_sum(array_map(

src/Report/Reporter/ConsoleReporter.php

@@ -152,11 +152,11 @@ private function collectPerformanceRows(Report $report): array
 
     private function formatSeverity(Severity $severity): string
     {
-        return match ($severity) { // @codeCoverageIgnore
+        return match ($severity) {
             Severity::ERROR => $this->red(str_pad(Severity::ERROR->name, 7)),
             Severity::WARNING => $this->yellow(str_pad(Severity::WARNING->name, 7)),
             default => $this->dim(str_pad(strtoupper($severity->name), 7)),
-        }; // @codeCoverageIgnore
+        };
     }
 
     private function formatPerformanceCell(?float $time, float $totalTime): string

src/Runner/RunScopeResolver.php

@@ -105,17 +105,10 @@ private function absolutePaths(array $paths): array
     private function expandReferencedTargets(array &$targets): void
     {
         $pending = array_keys($targets);
-        $visitedFiles = [];
         $visitedEntityPaths = [];
 
         for ($i = 0; isset($pending[$i]); $i++) {
             $file = $pending[$i];
-
-            if (isset($visitedFiles[$file])) {
-                continue;
-            }
-
-            $visitedFiles[$file] = true;
             $content = @file_get_contents($file);
 
             if ($content === false) {

src/Sniff/SimparaSniff.php

@@ -144,7 +144,8 @@ public function process(\DOMDocument $document, File $file): array
                 throw new \LogicException('Could not map simpara violation to source content.');
             }
 
-            if ($match['selfClosing']) {
+            $closingOffset = $match['closingOffset'];
+            if (null === $closingOffset) {
                 continue;
             }
 
@@ -160,11 +161,6 @@ public function process(\DOMDocument $document, File $file): array
                 continue;
             }
 
-            $closingOffset = $match['closingOffset'];
-            if ($closingOffset === null) {
-                throw new \LogicException('Could not map simpara violation to source content.');
-            }
-
             $affectedRanges = $this->elementNameRanges(
                 $file,
                 $match['beginOffset'],
@@ -219,13 +215,7 @@ private function getAllowedElements(): array
                 |> array_values(...);
     }
 
-    /**
-     * @return list<array{
-     *     beginOffset: int,
-     *     selfClosing: bool,
-     *     closingOffset: int|null
-     * }>
-     */
+    /**  @return list<array{beginOffset: int, closingOffset: int|null}> */
     private function sourceMatches(File $file): array
     {
         preg_match_all(
@@ -245,7 +235,6 @@ private function sourceMatches(File $file): array
             if (str_ends_with(rtrim($tag), '/>')) {
                 $sourceMatches[] = [
                     'beginOffset' => $offset,
-                    'selfClosing' => true,
                     'closingOffset' => null,
                 ];
                 continue;
@@ -262,7 +251,6 @@ private function sourceMatches(File $file): array
 
             $sourceMatches[] = [
                 'beginOffset' => $opening,
-                'selfClosing' => false,
                 'closingOffset' => $offset,
             ];
         }

tests/Support/Sniff/ExposedAbstractSniff.php

@@ -29,4 +29,9 @@ public function exposeSeverity(): Severity
     {
         return $this->severity;
     }
+
+    public function exposeMaskNonElementMarkup(string $source): string
+    {
+        return $this->maskNonElementMarkup($source);
+    }
 }