Fix bug in ReturnTypeDeclarationSniff

which caused wrong return type detection

Author: gmazzap

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.7.2
+- Fix bug in `ReturnTypeDeclarationSniff` which caused wrong return type detection.
+
 ## 0.7.1
 - Exclude `NeutronStandard.MagicMethods.RiskyMagicMethod`
 - Add `.gitattributes`

Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php

@@ -48,8 +48,7 @@ public function process(File $file, $position)
 
         list($hasNonVoidReturnType, $hasVoidReturnType, $hasNoReturnType) = $this->returnTypeInfo(
             $file,
-            $position,
-            $functionEnd
+            $position
         );
 
         list($nonVoidReturnCount, $voidReturnCount) = Helpers::countReturns($file, $position);
@@ -116,18 +115,20 @@ private function maybeErrors(
     /**
      * @param File $file
      * @param int $functionPosition
-     * @param int $functionEnd
      * @return array
      */
-    private function returnTypeInfo(File $file, int $functionPosition, int $functionEnd): array
+    private function returnTypeInfo(File $file, int $functionPosition): array
     {
+        $tokens = $file->getTokens();
+        $functionToken = $tokens[$functionPosition];
+
         $returnTypeToken = $file->findNext(
             [T_RETURN_TYPE],
             $functionPosition + 3, // 3: open parenthesis, close parenthesis, colon
-            $functionEnd - 1
+            ($functionToken['scope_opener'] ?? 0) - 1
         );
 
-        $returnType = $file->getTokens()[$returnTypeToken] ?? null;
+        $returnType = $tokens[$returnTypeToken] ?? null;
         if ($returnType && $returnType['type'] !== "T_RETURN_TYPE") {
             $returnType = null;
         }

tests/fixtures/return-type-declaration.php

@@ -121,20 +121,36 @@ function noHookCallback() {
 
 class WrapperHookWrapper {
 
-    function filterWrapper(): bool {
+    function filterWrapper(string $x, int $y): bool {
 
         // @phpcsWarningCodeOnNextLine NoReturnType
         foo('x', function() {
             return '';
         });
 
-        add_filter('x', function() {
-            return '';
+        add_filter('x', function() use($x, $y) {
+            return "$x, $y";
         });
 
         return true;
     }
 
+    public function register()
+    {
+        add_filter('foo_bar', function (array $a): array {
+            return array_merge($a, ['x' => 'y']);
+        });
+
+        add_action(
+            'foo_bar_baz',
+            function ($x, $y) {
+                $this->filterWrapper((string)$x, (int)$y);
+            },
+            10,
+            2
+        );
+    }
+
     // @phpcsWarningCodeOnNextLine NoReturnType
     function problematicMethod() {
         return 'x';