Handle anonymous functions in the type hint order fixer

contao · Jan 29, 2024 · 3d84859 · 3d84859
1 parent b80439d
commit 3d84859
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/Fixer/TypeHintOrderFixer.php b/src/Fixer/TypeHintOrderFixer.php
@@ -61,7 +61,7 @@ public function __construct(
 
     public function isCandidate(Tokens $tokens): bool
     {
-        return $tokens->isAnyTokenKindsFound([T_PUBLIC, T_PROTECTED, T_PRIVATE]);
+        return $tokens->isAnyTokenKindsFound([T_PUBLIC, T_PROTECTED, T_PRIVATE, T_FUNCTION, T_FN]);
     }
 
     /**
@@ -75,7 +75,13 @@ public function getPriority(): int
     protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
     {
         for ($index = 1, $count = \count($tokens); $index < $count; ++$index) {
-            if (!$tokens[$index]->isGivenKind([T_PUBLIC, T_PROTECTED, T_PRIVATE])) {
+            if (!$tokens[$index]->isGivenKind([T_PUBLIC, T_PROTECTED, T_PRIVATE, T_FUNCTION, T_FN])) {
+                continue;
+            }
+
+            // Anonymous functions
+            if ($tokens[$index]->isGivenKind([T_FUNCTION, T_FN])) {
+                $index = $this->handleFunction($tokens, $index);
                 continue;
             }
 

diff --git a/tests/Fixer/TypeHintOrderFixerTest.php b/tests/Fixer/TypeHintOrderFixerTest.php
@@ -52,6 +52,13 @@ public function __construct(
 
                     public function bar(object|FooService|BarService $service, iterable|int $count): null|string|int
                     {
+                        $foo = function (string|int $id): ?FooService {
+                        };
+
+                        $foo = function (string|int $id) use ($count): ?FooService {
+                        };
+
+                        $bar = fn (string|int $id): ?FooService => null;
                     }
                 }
                 EOT,
@@ -73,6 +80,13 @@ public function __construct(
 
                     public function bar(BarService|FooService|object $service, int|iterable $count): int|string|null
                     {
+                        $foo = function (int|string $id): FooService|null {
+                        };
+
+                        $foo = function (int|string $id) use ($count): FooService|null {
+                        };
+
+                        $bar = fn (int|string $id): FooService|null => null;
                     }
                 }
                 EOT,