Merge pull request #9338 from weirdan/forbid-first-class-callables-in…

…-new
vimeo · Feb 19, 2023 · 538b4c8 · 538b4c8
2 parents 075e97a + 73bad89
commit 538b4c8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php
@@ -29,6 +29,7 @@
 use Psalm\Issue\InternalMethod;
 use Psalm\Issue\InvalidStringClass;
 use Psalm\Issue\MixedMethodCall;
+use Psalm\Issue\ParseError;
 use Psalm\Issue\TooManyArguments;
 use Psalm\Issue\UndefinedClass;
 use Psalm\Issue\UnsafeGenericInstantiation;
@@ -84,6 +85,14 @@ public static function analyze(
 
         $from_static = false;
 
+        if ($stmt->isFirstClassCallable()) {
+            IssueBuffer::maybeAdd(new ParseError(
+                'First-class callables cannot be used in new',
+                new CodeLocation($statements_analyzer->getSource(), $stmt),
+            ));
+            return false;
+        }
+
         if ($stmt->class instanceof PhpParser\Node\Name) {
             if (!in_array(strtolower($stmt->class->parts[0]), ['self', 'static', 'parent'], true)) {
                 $aliases = $statements_analyzer->getAliases();

diff --git a/tests/ClosureTest.php b/tests/ClosureTest.php
@@ -1419,6 +1419,15 @@ public function f(): int {
                 'ignored_issues' => [],
                 'php_version' => '7.4',
             ],
+            'FirstClassCallable:WithNew' => [
+                'code' => <<<'PHP'
+                    <?php
+                        new stdClass(...);
+                    PHP,
+                'error_message' => 'ParseError',
+                'ignored_issues' => [],
+                'php_version' => '8.1',
+            ],
         ];
     }
 }