Merge branch '9.2'

Author: sebastianbergmann

src/CodeCoverage.php

@@ -398,10 +398,12 @@ private function applyExecutableLinesFilter(RawCodeCoverageData $data): void
             }
 
             $linesToBranchMap = $this->analyser()->executableLinesIn($filename);
+
             $data->keepLineCoverageDataOnlyForLines(
                 $filename,
                 array_keys($linesToBranchMap)
             );
+
             $data->markExecutableLineByBranch(
                 $filename,
                 $linesToBranchMap

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -69,8 +69,7 @@ public function enterNode(Node $node): void
         }
 
         if ($node instanceof Node\Scalar\String_ ||
-            $node instanceof Node\Scalar\EncapsedStringPart
-        ) {
+            $node instanceof Node\Scalar\EncapsedStringPart) {
             $startLine = $node->getStartLine() + 1;
             $endLine   = $node->getEndLine() - 1;
 
@@ -102,17 +101,15 @@ public function enterNode(Node $node): void
             $node instanceof Node\Identifier ||
             $node instanceof Node\Name ||
             $node instanceof Node\Param ||
-            $node instanceof Node\Scalar
-        ) {
+            $node instanceof Node\Scalar) {
             return;
         }
 
         if ($node instanceof Node\Stmt\Function_ ||
             $node instanceof Node\Stmt\Class_ ||
             $node instanceof Node\Stmt\ClassMethod ||
             $node instanceof Node\Expr\Closure ||
-            $node instanceof Node\Stmt\Trait_
-        ) {
+            $node instanceof Node\Stmt\Trait_) {
             $isConcreteClassLike = $node instanceof Node\Stmt\Class_ || $node instanceof Node\Stmt\Trait_;
 
             if (null !== $node->stmts) {
@@ -163,6 +160,7 @@ public function enterNode(Node $node): void
                 $node->getStartLine() + 1,
                 $node->expr->getStartLine()
             );
+
             $endLine = $node->expr->getEndLine();
 
             if ($endLine < $startLine) {
@@ -176,8 +174,7 @@ public function enterNode(Node $node): void
 
         if ($node instanceof Node\Expr\Ternary) {
             if (null !== $node->if &&
-                $node->getStartLine() !== $node->if->getEndLine()
-            ) {
+                $node->getStartLine() !== $node->if->getEndLine()) {
                 $this->setLineBranch($node->if->getStartLine(), $node->if->getEndLine(), ++$this->nextBranch);
             }
 
@@ -198,8 +195,7 @@ public function enterNode(Node $node): void
 
         if ($node instanceof Node\Stmt\If_ ||
             $node instanceof Node\Stmt\ElseIf_ ||
-            $node instanceof Node\Stmt\Case_
-        ) {
+            $node instanceof Node\Stmt\Case_) {
             if (null === $node->cond) {
                 return;
             }
@@ -219,26 +215,35 @@ public function enterNode(Node $node): void
 
             if ([] !== $node->init) {
                 $startLine = $node->init[0]->getStartLine();
+
                 end($node->init);
+
                 $endLine = current($node->init)->getEndLine();
+
                 reset($node->init);
             }
 
             if ([] !== $node->cond) {
                 if (null === $startLine) {
                     $startLine = $node->cond[0]->getStartLine();
                 }
+
                 end($node->cond);
+
                 $endLine = current($node->cond)->getEndLine();
+
                 reset($node->cond);
             }
 
             if ([] !== $node->loop) {
                 if (null === $startLine) {
                     $startLine = $node->loop[0]->getStartLine();
                 }
+
                 end($node->loop);
+
                 $endLine = current($node->loop)->getEndLine();
+
                 reset($node->loop);
             }
 
@@ -266,8 +271,7 @@ public function enterNode(Node $node): void
         }
 
         if ($node instanceof Node\Stmt\While_ ||
-            $node instanceof Node\Stmt\Do_
-        ) {
+            $node instanceof Node\Stmt\Do_) {
             $this->setLineBranch(
                 $node->cond->getStartLine(),
                 $node->cond->getEndLine(),
@@ -322,8 +326,7 @@ public function afterTraverse(array $nodes): void
                 (
                     isset($this->commentsToCheckForUnset[$lineNumber]) &&
                     1 === preg_match(sprintf('/^\s*%s\s*$/', preg_quote($this->commentsToCheckForUnset[$lineNumber], '/')), $line)
-                )
-            ) {
+                )) {
                 unset($this->executableLinesGroupedByBranch[$lineNumber]);
             }
         }

src/StaticAnalysis/ParsingFileAnalyser.php

@@ -196,8 +196,7 @@ private function findLinesIgnoredByLineBasedAnnotations(string $filename, string
 
         foreach (token_get_all($source) as $token) {
             if (!is_array($token) ||
-                !(T_COMMENT === $token[0] || T_DOC_COMMENT === $token[0])
-            ) {
+                !(T_COMMENT === $token[0] || T_DOC_COMMENT === $token[0])) {
                 continue;
             }