Merge branch '9.2'

Author: sebastianbergmann

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -16,15 +16,19 @@
 use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\Cast;
 use PhpParser\Node\Expr\Closure;
+use PhpParser\Node\Expr\Match_;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\NullsafePropertyFetch;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Expr\Ternary;
+use PhpParser\Node\MatchArm;
 use PhpParser\Node\Scalar\Encapsed;
 use PhpParser\Node\Stmt\Break_;
 use PhpParser\Node\Stmt\Case_;
 use PhpParser\Node\Stmt\Catch_;
+use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Continue_;
 use PhpParser\Node\Stmt\Do_;
 use PhpParser\Node\Stmt\Echo_;
@@ -118,6 +122,30 @@ private function getLines(Node $node): array
             return [$node->dim->getStartLine()];
         }
 
+        if ($node instanceof ClassMethod) {
+            if ($node->name->name !== '__construct') {
+                return [];
+            }
+
+            $existsAPromotedProperty = false;
+
+            foreach ($node->getParams() as $param) {
+                if (0 !== ($param->flags & Class_::VISIBILITY_MODIFIER_MASK)) {
+                    $existsAPromotedProperty = true;
+
+                    break;
+                }
+            }
+
+            if ($existsAPromotedProperty) {
+                // Only the line with `function` keyword should be listed here
+                // but `nikic/php-parser` doesn't provide a way to fetch it
+                return range($node->getStartLine(), $node->name->getEndLine());
+            }
+
+            return [];
+        }
+
         if ($node instanceof MethodCall) {
             return [$node->name->getStartLine()];
         }
@@ -134,6 +162,22 @@ private function getLines(Node $node): array
             return $lines;
         }
 
+        if ($node instanceof Match_) {
+            return [$node->cond->getStartLine()];
+        }
+
+        if ($node instanceof MatchArm) {
+            return [$node->body->getStartLine()];
+        }
+
+        if ($node instanceof Expression && (
+            $node->expr instanceof Cast ||
+            $node->expr instanceof Match_ ||
+            $node->expr instanceof MethodCall
+        )) {
+            return [];
+        }
+
         return [$node->getStartLine()];
     }
 
@@ -147,6 +191,7 @@ private function isExecutable(Node $node): bool
                $node instanceof Case_ ||
                $node instanceof Cast ||
                $node instanceof Catch_ ||
+               $node instanceof ClassMethod ||
                $node instanceof Closure ||
                $node instanceof Continue_ ||
                $node instanceof Do_ ||
@@ -160,6 +205,8 @@ private function isExecutable(Node $node): bool
                $node instanceof Foreach_ ||
                $node instanceof Goto_ ||
                $node instanceof If_ ||
+               $node instanceof Match_ ||
+               $node instanceof MatchArm ||
                $node instanceof MethodCall ||
                $node instanceof NullsafePropertyFetch ||
                $node instanceof PropertyFetch ||

tests/_files/source_with_empty_constructor.php

@@ -0,0 +1,32 @@
+<?php
+
+class Foo
+{
+    public 
+        function 
+            __construct
+    (
+        public
+        $var
+        =
+        1
+    )
+    {
+        
+    }
+}
+
+class Bar
+{
+    public 
+        function 
+            __construct
+    (
+        $var
+        =
+        1
+    )
+    {
+        $var = 1;
+    }
+}

tests/_files/source_with_heavy_indentation.php

@@ -155,9 +155,6 @@ function
                 )
             ;
 
-            $var[]
-            ;
-
             (string)
             $var
             ;

tests/_files/source_with_match_expression.php

@@ -0,0 +1,30 @@
+<?php
+
+class Foo
+{
+    public
+        function
+            __construct(
+                string
+                $bar
+    )
+    {
+        match
+        (
+            $bar
+        )
+        {
+            'a',
+            'b'
+            =>
+            1
+        ,
+            // Some comments
+            default
+            =>
+            throw new Exception()
+        ,
+        }
+        ;
+    }
+}

tests/tests/Data/RawCodeCoverageDataTest.php

@@ -323,12 +323,41 @@ public function testHeavyIndentationIsHandledCorrectly(): void
                 135,
                 139,
                 143,
-                147,
                 149,
                 153,
-                158,
-                161,
-                162,
+                159,
+            ],
+            array_keys(RawCodeCoverageData::fromUncoveredFile($file, new ParsingFileAnalyser(true, true))->lineCoverage()[$file])
+        );
+    }
+
+    public function testEmtpyConstructorIsMarkedAsExecutable(): void
+    {
+        $file = TEST_FILES_PATH . 'source_with_empty_constructor.php';
+
+        $this->assertEquals(
+            [
+                5,
+                6,
+                7,
+                30,
+            ],
+            array_keys(RawCodeCoverageData::fromUncoveredFile($file, new ParsingFileAnalyser(true, true))->lineCoverage()[$file])
+        );
+    }
+
+    /**
+     * @requires PHP 8.0
+     */
+    public function testEachCaseInMatchExpressionIsMarkedAsExecutable(): void
+    {
+        $file = TEST_FILES_PATH . 'source_with_match_expression.php';
+
+        $this->assertEquals(
+            [
+                14,
+                20,
+                25,
             ],
             array_keys(RawCodeCoverageData::fromUncoveredFile($file, new ParsingFileAnalyser(true, true))->lineCoverage()[$file])
         );