bug PHP-CS-Fixer#5014 PhpdocToParamTypeFixer - fix for void as param …

…(kubawerlos) This PR was squashed before being merged into the 2.16 branch. Discussion ---------- PhpdocToParamTypeFixer - fix for void as param Is the test correct? Commits ------- a373054 PhpdocToParamTypeFixer - fix for void as param
nutshellcrm · Jun 27, 2020 · e1d06c5 · e1d06c5
2 parents a4e94a9 + a373054
commit e1d06c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/Fixer/FunctionNotation/PhpdocToParamTypeFixer.php b/src/Fixer/FunctionNotation/PhpdocToParamTypeFixer.php
@@ -52,6 +52,7 @@ final class PhpdocToParamTypeFixer extends AbstractFixer implements Configuratio
         'mixed' => true,
         'resource' => true,
         'static' => true,
+        'void' => true,
     ];
 
     /**
@@ -157,7 +158,6 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
 
                 $hasIterable = false;
                 $hasNull = false;
-                $hasVoid = false;
                 $hasArray = false;
                 $hasString = false;
                 $hasInt = false;
@@ -189,11 +189,6 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
                         $minimumTokenPhpVersion = 70100;
                     }
 
-                    if ('void' === $type) {
-                        $hasVoid = true;
-                        unset($types[$key]);
-                    }
-
                     if ('string' === $type) {
                         $hasString = true;
                         unset($types[$key]);
@@ -270,7 +265,6 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
                     $hasNull,
                     $hasArray,
                     $hasIterable,
-                    $hasVoid,
                     $hasString,
                     $hasInt,
                     $hasFloat,
@@ -358,7 +352,6 @@ private function hasParamTypeHint(Tokens $tokens, $index)
      * @param bool   $hasNull
      * @param bool   $hasArray
      * @param bool   $hasIterable
-     * @param bool   $hasVoid
      * @param bool   $hasString
      * @param bool   $hasInt
      * @param bool   $hasFloat
@@ -373,7 +366,6 @@ private function fixFunctionDefinition(
         $hasNull,
         $hasArray,
         $hasIterable,
-        $hasVoid,
         $hasString,
         $hasInt,
         $hasFloat,
@@ -383,9 +375,7 @@ private function fixFunctionDefinition(
     ) {
         $newTokens = [];
 
-        if (true === $hasVoid) {
-            $newTokens[] = new Token('void');
-        } elseif (true === $hasIterable && true === $hasArray) {
+        if (true === $hasIterable && true === $hasArray) {
             $newTokens[] = new Token([CT::T_ARRAY_TYPEHINT, 'array']);
         } elseif (true === $hasIterable) {
             $newTokens[] = new Token([T_STRING, 'iterable']);

diff --git a/tests/Fixer/FunctionNotation/PhpdocToParamTypeFixerTest.php b/tests/Fixer/FunctionNotation/PhpdocToParamTypeFixerTest.php
@@ -328,6 +328,9 @@ class Foo {
                 '<?php /** @param null|string[] $matches */ function matchAll(&$matches) {}',
                 70100,
             ],
+            'void as type in phpdoc' => [
+                '<?php /** @param void $bar */ function foo($bar) {}',
+            ],
         ];
     }
 }