Better ReturnTypeDeclaration nullable returns compat

Author: gmazzap

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Not released
+- Fix false positive in `ReturnTypeDeclarationSniff` with nullable types.
+
 ## 0.10.0
 - Renamed sniffs namespace (**breaking change**).
   Sniff are now referenced via `Inpsyde.CodeQuality...` instead of `InpsydeCodingStandard.CodeQuality...`

Inpsyde/Sniffs/CodeQuality/ReturnTypeDeclarationSniff.php

@@ -51,16 +51,22 @@ public function process(File $file, $position)
             return;
         }
 
-        list($hasNonVoidReturnType, $hasVoidReturnType, $hasNoReturnType) = $this->returnTypeInfo(
-            $file,
-            $position
-        );
+        list(
+            $hasNonVoidReturnType,
+            $hasVoidReturnType,
+            $hasNoReturnType,
+            $hasNullable
+            ) = $this->returnTypeInfo($file, $position);
 
         list($nonVoidReturnCount, $voidReturnCount, $nullReturnCount) = PhpcsHelpers::countReturns(
             $file,
             $position
         );
 
+        if ($hasNullable) {
+            $voidReturnCount -= $nullReturnCount;
+        }
+
         $this->maybeErrors(
             $hasNonVoidReturnType,
             $hasVoidReturnType,
@@ -151,15 +157,27 @@ private function returnTypeInfo(File $file, int $functionPosition): array
         );
 
         $returnType = $tokens[$returnTypeToken] ?? null;
-        if ($returnType && $returnType['type'] !== "T_RETURN_TYPE") {
-            $returnType = null;
+        if ($returnType && $returnType['code'] !== T_RETURN_TYPE) {
+            return [false, false, true, false];
+        }
+
+        $start = $tokens[$functionPosition]['parenthesis_closer'] + 1;
+        $end = $tokens[$functionPosition]['scope_opener'];
+        $hasNullable = false;
+        for ($i = $start; $i < $end; $i++) {
+            if ($tokens[$i]['code'] === T_NULLABLE) {
+                $hasNullable = true;
+                break;
+            }
+            if ($tokens[$i]['code'] === T_WHITESPACE) {
+                continue;
+            }
         }
 
-        $hasNonVoidReturnType = $returnType && $returnType['content'] !== 'void';
-        $hasVoidReturnType = $returnType && $returnType['content'] === 'void';
-        $hasNoReturnType = !$returnType;
+        $hasNonVoidReturnType = $returnType['content'] !== 'void';
+        $hasVoidReturnType = $returnType['content'] === 'void';
 
-        return [$hasNonVoidReturnType, $hasVoidReturnType, $hasNoReturnType];
+        return [$hasNonVoidReturnType, $hasVoidReturnType, false, $hasNullable];
     }
 
     /**