StaticLambdaFixer - fix for arrow function used in class with $this

Author: kubawerlos

src/Fixer/FunctionNotation/StaticLambdaFixer.php

@@ -64,8 +64,8 @@ public function isRisky()
     protected function applyFix(\SplFileInfo $file, Tokens $tokens)
     {
         $analyzer = new TokensAnalyzer($tokens);
-
         $expectedFunctionKinds = [T_FUNCTION];
+
         if (\PHP_VERSION_ID >= 70400) {
             $expectedFunctionKinds[] = T_FN;
         }
@@ -76,21 +76,22 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             }
 
             $prev = $tokens->getPrevMeaningfulToken($index);
+
             if ($tokens[$prev]->isGivenKind(T_STATIC)) {
                 continue; // lambda is already 'static'
             }
 
             $argumentsStartIndex = $tokens->getNextTokenOfKind($index, ['(']);
             $argumentsEndIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_PARENTHESIS_BRACE, $argumentsStartIndex);
 
-            // figure out where the lambda starts ...
-            $lambdaOpenIndex = $tokens->getNextTokenOfKind($argumentsEndIndex, ['{', [T_DOUBLE_ARROW]]);
+            // figure out where the lambda starts and ends
 
-            // ... and where it ends
-            if ($tokens[$lambdaOpenIndex]->isGivenKind(T_DOUBLE_ARROW)) {
-                $lambdaEndIndex = $tokens->getNextTokenOfKind($lambdaOpenIndex, [';']);
-            } else {
+            if ($tokens[$index]->isGivenKind(T_FUNCTION)) {
+                $lambdaOpenIndex = $tokens->getNextTokenOfKind($argumentsEndIndex, ['{']);
                 $lambdaEndIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $lambdaOpenIndex);
+            } else { // T_FN
+                $lambdaOpenIndex = $tokens->getNextTokenOfKind($argumentsEndIndex, [[T_DOUBLE_ARROW]]);
+                $lambdaEndIndex = $this->findExpressionEnd($tokens, $lambdaOpenIndex);
             }
 
             if ($this->hasPossibleReferenceToThis($tokens, $lambdaOpenIndex, $lambdaEndIndex)) {
@@ -110,6 +111,37 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
         }
     }
 
+    /**
+     * @param int $index
+     *
+     * @return int
+     */
+    private function findExpressionEnd(Tokens $tokens, $index)
+    {
+        $nextIndex = $tokens->getNextMeaningfulToken($index);
+
+        while (null !== $nextIndex) {
+            /** @var Token $nextToken */
+            $nextToken = $tokens[$nextIndex];
+
+            if ($nextToken->equalsAny([',', ';', [T_CLOSE_TAG]])) {
+                break;
+            }
+
+            /** @var null|array{isStart: bool, type: int} $blockType */
+            $blockType = Tokens::detectBlockType($nextToken);
+
+            if (null !== $blockType && $blockType['isStart']) {
+                $nextIndex = $tokens->findBlockEnd($blockType['type'], $nextIndex);
+            }
+
+            $index = $nextIndex;
+            $nextIndex = $tokens->getNextMeaningfulToken($index);
+        }
+
+        return $index;
+    }
+
     /**
      * Returns 'true' if there is a possible reference to '$this' within the given tokens index range.
      *
@@ -138,6 +170,7 @@ private function hasPossibleReferenceToThis(Tokens $tokens, $startIndex, $endInd
 
             if ($tokens[$i]->equals('$')) {
                 $nextIndex = $tokens->getNextMeaningfulToken($i);
+
                 if ($tokens[$nextIndex]->isGivenKind(T_VARIABLE)) {
                     return true; // "$$a" case
                 }

tests/Fixer/FunctionNotation/StaticLambdaFixerTest.php

@@ -258,8 +258,12 @@ public function provideFixPhp74Cases()
                 '<?php $a  /**/  =   /**/ fn() => null;',
             ],
             [
-                '<?php $a  /**/  =   /**/static fn() => null;',
-                '<?php $a  /**/  =   /**/fn() => null;',
+                '<?php $a  /**/  =   /**/static fn() => null; echo $this->foo();',
+                '<?php $a  /**/  =   /**/fn() => null; echo $this->foo();',
+            ],
+            [
+                '<?php $a  /**/  =   /**/ static fn() => null ?> <?php echo $this->foo();',
+                '<?php $a  /**/  =   /**/ fn() => null ?> <?php echo $this->foo();',
             ],
             [
                 '<?php
@@ -277,6 +281,37 @@ public function C()
                 '<?php static fn($a = ["foo" => "bar"]) => [];',
                 '<?php fn($a = ["foo" => "bar"]) => [];',
             ],
+            [
+                '<?php class Foo {
+                    public function getNames()
+                    {
+                        return \array_map(
+                            static fn ($item) => $item->getName(),
+                            $this->getItems()
+                        );
+                    }
+                }',
+                '<?php class Foo {
+                    public function getNames()
+                    {
+                        return \array_map(
+                            fn ($item) => $item->getName(),
+                            $this->getItems()
+                        );
+                    }
+                }',
+            ],
+            [
+                '<?php class Foo {
+                    public function getNames()
+                    {
+                        return \array_map(
+                            fn ($item) => $item->getName(1, $this->foo()),
+                            $this->getItems()
+                        );
+                    }
+                }',
+            ],
         ];
     }
 }