Improve #12

Author: widoz

Inpsyde/PhpcsHelpers.php

@@ -501,11 +501,7 @@ public static function isVoidReturn(File $file, int $returnPosition): bool
         $returnPosition = $nextToReturn + 1;
         $followedBySemicolon = ($tokens[$returnPosition]['code'] ?? '') === T_SEMICOLON;
 
-        if (!$followedBySemicolon) {
-            return false;
-        }
-
-        return true;
+        return $followedBySemicolon;
     }
 
     /**
@@ -522,21 +518,9 @@ public static function isNullReturn(File $file, int $returnPosition): bool
         }
 
         $returnPosition++;
-        $nextToReturn = $file->findNext([T_WHITESPACE], $returnPosition, null, true, null, true);
-        $nextToReturnType = $tokens[$nextToReturn]['code'] ?? '';
-
-        if ($nextToReturnType !== T_NULL) {
-            return false;
-        }
-
-        $returnPosition = $nextToReturn + 1;
-        $followedBySemicolon = ($tokens[$returnPosition]['code'] ?? '') === T_SEMICOLON;
-
-        if (!$followedBySemicolon) {
-            return false;
-        }
+        $nextToReturn = $file->findNext([T_WHITESPACE, T_NULL], $returnPosition, null, true, null, true);
 
-        return true;
+        return ($tokens[$nextToReturn]['code'] ?? '') === T_SEMICOLON;
     }
 
     /**

tests/fixtures/return-type-declaration.php

@@ -63,6 +63,10 @@ function h(): void
     return null === true;
 }
 
+function hh(): void {
+    return null;
+}
+
 function gen(string $content): \Generator
 {
     $line = strtok($content, "\n");