Merge pull request #6979 from orklah/6975

don't accept unresolved literal string as valid callable-strings
vimeo · Nov 23, 2021 · fdf3a8d · fdf3a8d
2 parents 60f0fd1 + 7c6b86c
commit fdf3a8d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Type/Comparator/ScalarTypeComparator.php b/src/Psalm/Internal/Type/Comparator/ScalarTypeComparator.php
@@ -582,6 +582,11 @@ public static function isContainedBy(
                 }
             }
 
+            if (!$input_callable) {
+                //we could not find a callable for the input type, so the input is not contained in the container
+                return false;
+            }
+
             return true;
         }
 

diff --git a/tests/CallableTest.php b/tests/CallableTest.php
@@ -1219,6 +1219,18 @@ function foo(string $c) : void {
                     }',
                 'error_message' => 'InvalidScalarArgument',
             ],
+            'inexistantCallableinCallableString' => [
+                '<?php
+                    /**
+                     * @param callable-string $c
+                     */
+                    function c(string $c): void {
+                        $c();
+                    }
+
+                    c("hii");',
+                'error_message' => 'InvalidArgument',
+            ],
         ];
     }
 }
diff --git a/tests/TypeParseTest.php b/tests/TypeParseTest.php
@@ -973,6 +973,7 @@ function someFunction(string $param, array $param2, ?int $param3 = null) : strin
             }
         }
 
+        /** @psalm-suppress InvalidArgument Psalm couldn't detect the function exists */
         $reflectionFunc = new \ReflectionFunction('Psalm\Tests\someFunction');
         $reflectionParams = $reflectionFunc->getParameters();