From 3482ee3b396bf6374a7b2ad509b8bcc25b2bdee2 Mon Sep 17 00:00:00 2001
From: Matthew Brown <github@muglug.com>
Date: Sun, 28 Jan 2018 20:03:47 -0500
Subject: [PATCH] Split UntypedParam into MissingParamType and
 MissingClosureParamType

---
 assets/config_levels/3.xml                  |  3 ++-
 assets/config_levels/4.xml                  |  3 ++-
 assets/config_levels/5.xml                  |  3 ++-
 config.xsd                                  |  2 ++
 src/Psalm/Checker/FunctionLikeChecker.php   | 27 +++++++++++++++------
 src/Psalm/Issue/MissingClosureParamType.php |  6 +++++
 src/Psalm/Issue/MissingParamType.php        |  6 +++++
 src/Psalm/Issue/UntypedParam.php            |  6 -----
 tests/AnnotationTest.php                    | 18 +++++++-------
 tests/FunctionCallTest.php                  | 11 ++++++---
 10 files changed, 56 insertions(+), 29 deletions(-)
 create mode 100644 src/Psalm/Issue/MissingClosureParamType.php
 create mode 100644 src/Psalm/Issue/MissingParamType.php
 delete mode 100644 src/Psalm/Issue/UntypedParam.php

diff --git a/assets/config_levels/3.xml b/assets/config_levels/3.xml
index da06ca861..2d712812f 100644
--- a/assets/config_levels/3.xml
+++ b/assets/config_levels/3.xml
@@ -22,6 +22,7 @@
 
         <PropertyNotSetInConstructor errorLevel="info" />
         <MissingConstructor errorLevel="info" />
-        <UntypedParam errorLevel="info" />
+        <MissingClosureParamType errorLevel="info" />
+        <MissingParamType errorLevel="info" />
     </issueHandlers>
 </psalm>
diff --git a/assets/config_levels/4.xml b/assets/config_levels/4.xml
index 401f26e61..672e5356f 100644
--- a/assets/config_levels/4.xml
+++ b/assets/config_levels/4.xml
@@ -23,7 +23,8 @@
 
         <PropertyNotSetInConstructor errorLevel="info" />
         <MissingConstructor errorLevel="info" />
-        <UntypedParam errorLevel="info" />
+        <MissingClosureParamType errorLevel="info" />
+        <MissingParamType errorLevel="info" />
 
         <!-- level 4 issues - points to possible deficiencies in logic, higher false-positives -->
 
diff --git a/assets/config_levels/5.xml b/assets/config_levels/5.xml
index a611fccd4..b57431b5b 100644
--- a/assets/config_levels/5.xml
+++ b/assets/config_levels/5.xml
@@ -23,7 +23,8 @@
 
         <PropertyNotSetInConstructor errorLevel="info" />
         <MissingConstructor errorLevel="info" />
-        <UntypedParam errorLevel="info" />
+        <MissingClosureParamType errorLevel="info" />
+        <MissingParamType errorLevel="info" />
 
         <!-- level 4 issues - points to possible deficiencies in logic, higher false-positives -->
 
diff --git a/config.xsd b/config.xsd
index 96c2e3180..c42fde1c3 100644
--- a/config.xsd
+++ b/config.xsd
@@ -141,9 +141,11 @@
             <xs:element name="MisplacedRequiredParam" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MismatchingDocblockParamType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MismatchingDocblockReturnType" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="MissingClosureParamType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MissingClosureReturnType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MissingConstructor" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MissingFile" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="MissingParamType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MissingPropertyType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MissingReturnType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MissingDocblockType" type="IssueHandlerType" minOccurs="0" />
diff --git a/src/Psalm/Checker/FunctionLikeChecker.php b/src/Psalm/Checker/FunctionLikeChecker.php
index 0c49d5dfa..4b88ef9de 100644
--- a/src/Psalm/Checker/FunctionLikeChecker.php
+++ b/src/Psalm/Checker/FunctionLikeChecker.php
@@ -22,7 +22,9 @@ use Psalm\Issue\LessSpecificReturnType;
 use Psalm\Issue\MethodSignatureMismatch;
 use Psalm\Issue\MismatchingDocblockParamType;
 use Psalm\Issue\MismatchingDocblockReturnType;
+use Psalm\Issue\MissingClosureParamType;
 use Psalm\Issue\MissingClosureReturnType;
+use Psalm\Issue\MissingParamType;
 use Psalm\Issue\MissingReturnType;
 use Psalm\Issue\MixedInferredReturnType;
 use Psalm\Issue\MoreSpecificImplementedParamType;
@@ -30,7 +32,6 @@ use Psalm\Issue\MoreSpecificImplementedReturnType;
 use Psalm\Issue\MoreSpecificReturnType;
 use Psalm\Issue\OverriddenMethodAccess;
 use Psalm\Issue\ReservedWord;
-use Psalm\Issue\UntypedParam;
 use Psalm\Issue\UnusedParam;
 use Psalm\IssueBuffer;
 use Psalm\StatementsSource;
@@ -525,13 +526,23 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
                     ? ', ' . ($possible_type ? 'should be ' . $possible_type : 'could not infer type')
                     : '';
 
-                IssueBuffer::accepts(
-                    new UntypedParam(
-                        'Parameter $' . $function_param->name . ' has no provided type' . $infer_text,
-                        $function_param->location
-                    ),
-                    $storage->suppressed_issues
-                );
+                if ($this->function instanceof Closure) {
+                    IssueBuffer::accepts(
+                        new MissingClosureParamType(
+                            'Parameter $' . $function_param->name . ' has no provided type' . $infer_text,
+                            $function_param->location
+                        ),
+                        $storage->suppressed_issues
+                    );
+                } else {
+                    IssueBuffer::accepts(
+                        new MissingParamType(
+                            'Parameter $' . $function_param->name . ' has no provided type' . $infer_text,
+                            $function_param->location
+                        ),
+                        $storage->suppressed_issues
+                    );
+                }
             }
         }
 
diff --git a/src/Psalm/Issue/MissingClosureParamType.php b/src/Psalm/Issue/MissingClosureParamType.php
new file mode 100644
index 000000000..d22654d6f
--- /dev/null
+++ b/src/Psalm/Issue/MissingClosureParamType.php
@@ -0,0 +1,6 @@
+<?php
+namespace Psalm\Issue;
+
+class MissingClosureParamType extends CodeIssue
+{
+}
diff --git a/src/Psalm/Issue/MissingParamType.php b/src/Psalm/Issue/MissingParamType.php
new file mode 100644
index 000000000..0982a224b
--- /dev/null
+++ b/src/Psalm/Issue/MissingParamType.php
@@ -0,0 +1,6 @@
+<?php
+namespace Psalm\Issue;
+
+class MissingParamType extends CodeIssue
+{
+}
diff --git a/src/Psalm/Issue/UntypedParam.php b/src/Psalm/Issue/UntypedParam.php
deleted file mode 100644
index 298c706cd..000000000
--- a/src/Psalm/Issue/UntypedParam.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-namespace Psalm\Issue;
-
-class UntypedParam extends CodeIssue
-{
-}
diff --git a/tests/AnnotationTest.php b/tests/AnnotationTest.php
index 2df13bea3..db506ff71 100644
--- a/tests/AnnotationTest.php
+++ b/tests/AnnotationTest.php
@@ -558,7 +558,7 @@ class AnnotationTest extends TestCase
                     function fooFoo($a): void {
                         echo substr($a, 4, 2);
                     }',
-                'error_message' => 'UntypedParam - src/somefile.php:2 - Parameter $a has no provided type,'
+                'error_message' => 'MissingParamType - src/somefile.php:2 - Parameter $a has no provided type,'
                     . ' should be string',
                 'error_levels' => ['MixedArgument'],
             ],
@@ -567,7 +567,7 @@ class AnnotationTest extends TestCase
                     function fooFoo($a): void {
                         echo $a . "foo";
                     }',
-                'error_message' => 'UntypedParam - src/somefile.php:2 - Parameter $a has no provided type,'
+                'error_message' => 'MissingParamType - src/somefile.php:2 - Parameter $a has no provided type,'
                     . ' should be string',
                 'error_levels' => ['MixedOperand'],
             ],
@@ -576,7 +576,7 @@ class AnnotationTest extends TestCase
                     function fooFoo($a): void {
                         echo $a + 5;
                     }',
-                'error_message' => 'UntypedParam - src/somefile.php:2 - Parameter $a has no provided type,'
+                'error_message' => 'MissingParamType - src/somefile.php:2 - Parameter $a has no provided type,'
                     . ' should be int|float',
                 'error_levels' => ['MixedOperand', 'MixedArgument'],
             ],
@@ -585,7 +585,7 @@ class AnnotationTest extends TestCase
                     function fooFoo($a): void {
                         echo $a / 5;
                     }',
-                'error_message' => 'UntypedParam - src/somefile.php:2 - Parameter $a has no provided type,'
+                'error_message' => 'MissingParamType - src/somefile.php:2 - Parameter $a has no provided type,'
                     . ' should be int|float',
                 'error_levels' => ['MixedOperand', 'MixedArgument'],
             ],
@@ -594,7 +594,7 @@ class AnnotationTest extends TestCase
                     function fooFoo($a): void {
                         echo "$a";
                     }',
-                'error_message' => 'UntypedParam - src/somefile.php:2 - Parameter $a has no provided type,'
+                'error_message' => 'MissingParamType - src/somefile.php:2 - Parameter $a has no provided type,'
                     . ' should be string',
                 'error_levels' => ['MixedOperand'],
             ],
@@ -607,7 +607,7 @@ class AnnotationTest extends TestCase
                             echo substr("hello", $a, 2);
                         }
                     }',
-                'error_message' => 'UntypedParam - src/somefile.php:2 - Parameter $a has no provided type,'
+                'error_message' => 'MissingParamType - src/somefile.php:2 - Parameter $a has no provided type,'
                     . ' should be int|string',
                 'error_levels' => ['MixedArgument'],
             ],
@@ -620,7 +620,7 @@ class AnnotationTest extends TestCase
                     class B extends A {
                         public function foo($a): void {}
                     }',
-                'error_message' => 'UntypedParam',
+                'error_message' => 'MissingParamType',
                 'error_levels' => ['MethodSignatureMismatch'],
             ],
             'alreadyHasCheck' => [
@@ -630,7 +630,7 @@ class AnnotationTest extends TestCase
                     function shouldTakeString($s): void {
                       if (is_string($s)) takesString($s);
                     }',
-                'error_message' => 'UntypedParam - src/somefile.php:4 - Parameter $s has no provided type,'
+                'error_message' => 'MissingParamType - src/somefile.php:4 - Parameter $s has no provided type,'
                     . ' could not infer',
                 'error_levels' => ['MixedArgument'],
             ],
@@ -645,7 +645,7 @@ class AnnotationTest extends TestCase
                       $s = returnsMixed();
                       takesString($s);
                     }',
-                'error_message' => 'UntypedParam - src/somefile.php:7 - Parameter $s has no provided type,'
+                'error_message' => 'MissingParamType - src/somefile.php:7 - Parameter $s has no provided type,'
                     . ' could not infer',
                 'error_levels' => ['MixedArgument', 'InvalidReturnType', 'MixedAssignment'],
             ],
diff --git a/tests/FunctionCallTest.php b/tests/FunctionCallTest.php
index d7886fe71..d629ff719 100644
--- a/tests/FunctionCallTest.php
+++ b/tests/FunctionCallTest.php
@@ -195,7 +195,12 @@ class FunctionCallTest extends TestCase
                       }
                     );',
                 'assertions' => [],
-                'error_levels' => ['MixedArrayAccess', 'MixedArgument', 'UntypedParam', 'MissingClosureReturnType'],
+                'error_levels' => [
+                    'MixedArrayAccess',
+                    'MixedArgument',
+                    'MissingClosureParamType',
+                    'MissingClosureReturnType',
+                ],
             ],
             'byRefAfterCallable' => [
                 '<?php
@@ -393,7 +398,7 @@ class FunctionCallTest extends TestCase
                     '$a' => 'array<int, string>',
                 ],
                 'error_levels' => [
-                    'UntypedParam',
+                    'MissingClosureParamType',
                 ],
             ],
             'arrayFilterUseKey' => [
@@ -535,7 +540,7 @@ class FunctionCallTest extends TestCase
                      */
                     function f($p, $p) {}',
                 'error_message' => 'DuplicateParam',
-                'error_levels' => ['UntypedParam'],
+                'error_levels' => ['MissingParamType'],
             ],
             'invalidParamDefault' => [
                 '<?php