Lines ignored by annotations: cover entire range

Author: Slamdunk

src/StaticAnalysis/ParsingFileAnalyser.php

@@ -15,6 +15,7 @@
 use function file_get_contents;
 use function is_array;
 use function max;
+use function range;
 use function sort;
 use function sprintf;
 use function substr_count;
@@ -208,45 +209,45 @@ private function analyse(string $filename): void
 
     private function findLinesIgnoredByLineBasedAnnotations(string $filename, string $source, bool $useAnnotationsForIgnoringCode): void
     {
-        $ignore = false;
-        $stop   = false;
+        if (!$useAnnotationsForIgnoringCode) {
+            return;
+        }
+
+        $start = false;
 
         foreach (token_get_all($source) as $token) {
-            if (!is_array($token)) {
+            if (!is_array($token) ||
+                !(T_COMMENT === $token[0] || T_DOC_COMMENT === $token[0])
+            ) {
                 continue;
             }
 
-            switch ($token[0]) {
-                case T_COMMENT:
-                case T_DOC_COMMENT:
-                    if (!$useAnnotationsForIgnoringCode) {
-                        break;
-                    }
-
-                    $comment = trim($token[1]);
-
-                    if ($comment === '// @codeCoverageIgnore' ||
-                        $comment === '//@codeCoverageIgnore') {
-                        $ignore = true;
-                        $stop   = true;
-                    } elseif ($comment === '// @codeCoverageIgnoreStart' ||
-                        $comment === '//@codeCoverageIgnoreStart') {
-                        $ignore = true;
-                    } elseif ($comment === '// @codeCoverageIgnoreEnd' ||
-                        $comment === '//@codeCoverageIgnoreEnd') {
-                        $stop = true;
-                    }
-
-                    break;
-            }
+            $comment = trim($token[1]);
 
-            if ($ignore) {
+            if ($comment === '// @codeCoverageIgnore' ||
+                $comment === '//@codeCoverageIgnore') {
                 $this->ignoredLines[$filename][] = $token[2];
 
-                if ($stop) {
-                    $ignore = false;
-                    $stop   = false;
+                continue;
+            }
+
+            if ($comment === '// @codeCoverageIgnoreStart' ||
+                $comment === '//@codeCoverageIgnoreStart') {
+                $start = $token[2];
+
+                continue;
+            }
+
+            if ($comment === '// @codeCoverageIgnoreEnd' ||
+                $comment === '//@codeCoverageIgnoreEnd') {
+                if (false === $start) {
+                    $start = $token[2];
                 }
+
+                $this->ignoredLines[$filename] = array_merge(
+                    $this->ignoredLines[$filename],
+                    range($start, $token[2])
+                );
             }
         }
     }

tests/_files/source_with_ignore.php

@@ -33,5 +33,10 @@ function baz()
 interface Bor
 {
     public function foo();
-
 }
+
+// @codeCoverageIgnoreStart
+print '
+Multiline
+';
+// @codeCoverageIgnoreEnd

tests/tests/StaticAnalysis/ParsingFileAnalyserTest.php

@@ -37,6 +37,11 @@ public function testGetLinesToBeIgnored(): void
                 25,
                 30,
                 33,
+                38,
+                39,
+                40,
+                41,
+                42,
             ],
             (new ParsingFileAnalyser(true, true))->ignoredLinesFor(
                 TEST_FILES_PATH . 'source_with_ignore.php'