Fix nullable params (#3)

DivanteLtd · Mar 23, 2018 · 9eb01c6 · 9eb01c6
1 parent a521e8d
commit 9eb01c6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/PhpDocblockChecker/CheckerCommand.php b/PhpDocblockChecker/CheckerCommand.php
@@ -312,7 +312,23 @@ protected function processFile($file)
                                 'param' => $param,
                             ];
                         } elseif (!empty($type) && $method['docblock']['params'][$param] != $type) {
-                            if ($type == 'array' && substr($method['docblock']['params'][$param], -2) == '[]') {
+                            if (is_array($type)) {
+                                $docblockTypes = explode('|', $method['docblock']['params'][$param]);
+                                sort($docblockTypes);
+                                if ($type != $docblockTypes) {
+                                    $warnings = true;
+                                    $this->warnings[] = [
+                                        'type' => 'param-mismatch',
+                                        'file' => $file,
+                                        'class' => $name,
+                                        'method' => $name,
+                                        'line' => $method['line'],
+                                        'param' => $param,
+                                        'param-type' => implode('|', $type),
+                                        'doc-type' => $method['docblock']['params'][$param],
+                                    ];
+                                }
+                            } elseif ($type == 'array' && substr($method['docblock']['params'][$param], -2) == '[]') {
                                 // Do nothing because this is fine.
                             } else {
                                 $warnings = true;

diff --git a/PhpDocblockChecker/FileProcessor.php b/PhpDocblockChecker/FileProcessor.php
@@ -128,8 +128,12 @@ protected function processStatements(array $statements, $prefix = '')
                     foreach ($method->params as $param) {
                         $type = $param->type;
 
-                        if (!is_null($type)) {
-                            $type = (string)$type;
+                        if (!$param->type instanceof NullableType) {
+                            if (!is_null($type)) {
+                                $type = (string)$type;
+                            }
+                        } else {
+                            $type = (string) $type->type;
                         }
 
                         if (isset($uses[$type])) {
@@ -138,6 +142,11 @@ protected function processStatements(array $statements, $prefix = '')
 
                         $type = substr($type, 0, 1) == '\\' ? substr($type, 1) : $type;
 
+                        if ($param->type instanceof NullableType) {
+                            $type = ['null', $type];
+                            sort($type);
+                        }
+
                         $thisMethod['params']['$'.$param->name] = $type;
                     }