Merge pull request #14 from widoz/12-missing-return-type

Fix wrong detection of void  return type

Author: gmazzap

Inpsyde/PhpcsHelpers.php

@@ -490,7 +490,18 @@ public static function isVoidReturn(File $file, int $returnPosition): bool
         $nextToReturn = $file->findNext([T_WHITESPACE], $returnPosition, null, true, null, true);
         $nextToReturnType = $tokens[$nextToReturn]['code'] ?? '';
 
-        return in_array($nextToReturnType, [T_SEMICOLON, T_NULL], true);
+        if ($nextToReturnType === T_SEMICOLON) {
+            return true;
+        }
+
+        if ($nextToReturnType !== T_NULL) {
+            return false;
+        }
+
+        $returnPosition = $nextToReturn + 1;
+        $followedBySemicolon = ($tokens[$returnPosition]['code'] ?? '') === T_SEMICOLON;
+
+        return $followedBySemicolon;
     }
 
     /**
@@ -507,10 +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'] ?? '';
+        $nextToReturn = $file->findNext([T_WHITESPACE, T_NULL], $returnPosition, null, true, null, true);
 
-        return $nextToReturnType === T_NULL;
+        return ($tokens[$nextToReturn]['code'] ?? '') === T_SEMICOLON;
     }
 
     /**

tests/fixtures/return-type-declaration.php

@@ -57,7 +57,18 @@ function g(): bool
     return false;
 }
 
-function gen(string $content): \Generator {
+// @phpcsErrorCodeOnNextLine IncorrectVoidReturnType
+function h(): void
+{
+    return null === true;
+}
+
+function hh(): void {
+    return null;
+}
+
+function gen(string $content): \Generator
+{
     $line = strtok($content, "\n");
     while ($line !== false) {
         $line = strtok("\n");
@@ -66,7 +77,8 @@ function gen(string $content): \Generator {
 }
 
 // @phpcsErrorCodeOnNextLine GeneratorReturnTypeWithoutYield
-function genNoYield(string $content): \Generator {
+function genNoYield(string $content): \Generator
+{
     $line = strtok($content, "\n");
     while ($line !== false) {
         $line = strtok("\n");
@@ -77,7 +89,8 @@ function genNoYield(string $content): \Generator {
 }
 
 // @phpcsWarningCodeOnNextLine NoGeneratorReturnType
-function yieldNoGen(string $content) {
+function yieldNoGen(string $content)
+{
     $line = strtok($content, "\n");
     while ($line !== false) {
         $line = strtok("\n");
@@ -86,7 +99,8 @@ function yieldNoGen(string $content) {
 }
 
 // @phpcsErrorCodeOnNextLine IncorrectReturnTypeForGenerator
-function yieldWrongReturn(string $content): int {
+function yieldWrongReturn(string $content): int
+{
     $line = strtok($content, "\n");
     while ($line !== false) {
         $line = strtok("\n");
@@ -96,7 +110,8 @@ function yieldWrongReturn(string $content): int {
     return 1;
 }
 
-function yieldIteratorReturn(string $content): \Iterator {
+function yieldIteratorReturn(string $content): \Iterator
+{
     $line = strtok($content, "\n");
     while ($line !== false) {
         $line = strtok("\n");
@@ -107,9 +122,10 @@ function yieldIteratorReturn(string $content): \Iterator {
 }
 
 
-function genFrom(): \Generator {
+function genFrom(): \Generator
+{
 
-    $gen = function(int $x): int {
+    $gen = function (int $x): int {
         if ($x < 0) {
             return 0;
         }
@@ -126,12 +142,13 @@ function genFrom(): \Generator {
 }
 
 // @phpcsWarningCodeOnNextLine InvalidGeneratorManyReturns
-function genMultiReturn(): \Generator {
+function genMultiReturn(): \Generator
+{
     if (defined('MEH_MEH')) {
         return 1;
     }
 
-    yield from [1,2];
+    yield from [1, 2];
 
     if (defined('MEH')) {
         return 1;
@@ -369,7 +386,7 @@ public function iReturnALotOfStuff() // @phpcsWarningCodeOnThisLine NoReturnType
     }
 
     // @phpcsErrorCodeOnNextLine IncorrectVoidReturn
-    public function iReturnWrongNull() : \ArrayAccess
+    public function iReturnWrongNull(): \ArrayAccess
     {
         if (rand(1, 4) > 2) {
             return null;