Merge pull request #8723 from weirdan/allow-new-on-objects

Fixes #8355
vimeo · Nov 19, 2022 · 6d03c32 · 6d03c32
2 parents 4e17585 + 6554aa0
commit 6d03c32
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php
@@ -849,7 +849,9 @@ private static function analyzeConstructorExpression(
                 )) {
                     // fall through
                 }
-            } elseif ($lhs_type_part instanceof TMixed) {
+            } elseif ($lhs_type_part instanceof TMixed
+                || $lhs_type_part instanceof TObject
+            ) {
                 IssueBuffer::maybeAdd(
                     new MixedMethodCall(
                         'Cannot call constructor on an unknown class',
@@ -865,6 +867,9 @@ private static function analyzeConstructorExpression(
                 && $stmt_class_type->ignore_nullable_issues
             ) {
                 // do nothing
+            } elseif ($lhs_type_part instanceof TNamedObject) {
+                $new_type = Type::combineUnionTypes($new_type, new Union([$lhs_type_part]));
+                continue;
             } elseif (IssueBuffer::accepts(
                 new UndefinedClass(
                     'Type ' . $lhs_type_part . ' cannot be called as a class',

diff --git a/tests/ClassTest.php b/tests/ClassTest.php
@@ -795,6 +795,53 @@ interface I extends Traversable {}
                     abstract class C implements I {}
                 ',
             ],
+            'newOnNamedObject' => [
+                'code' => '<?php
+                    $o = new stdClass;
+                    $o2 = new $o;
+                ',
+                'assertions' => [
+                    '$o2===' => 'stdClass',
+                ],
+            ],
+            'newOnObjectOfAnonymousClass' => [
+                'code' => '<?php
+                    function f(): object {
+                        $o = new class {};
+                        return new $o;
+                    }
+                ',
+            ],
+            'newOnObjectOfAnonymousExtendingNamed' => [
+                'code' => '<?php
+                    function f(): Exception {
+                        $o = new class extends Exception {};
+                        return new $o;
+                    }
+                ',
+            ],
+            'newOnObjectOfAnonymousClassImplementingNamed' => [
+                'code' => '<?php
+                    interface I {}
+                    function f(): I {
+                        $o = new class implements I {};
+                        return new $o;
+                    }
+                ',
+            ],
+            'throwAnonymousObjects' => [
+                'code' => '<?php
+                    throw new class extends Exception {};
+                ',
+            ],
+            'throwTheResultOfNewOnAnAnonymousClass' => [
+                'code' => '<?php
+                    declare(strict_types=1);
+
+                    $test = new class extends \Exception { };
+                    throw new $test();
+                '
+            ]
         ];
     }
 
@@ -1151,7 +1198,16 @@ class Foo
                 class Bar {}
                 ',
                 'error_message' => 'ReservedWord',
-            ]
+            ],
+            'newOnObject' => [
+                'code' => '<?php
+                    function f(object $o): object
+                    {
+                        return new $o;
+                    }
+                ',
+                'error_message' => 'MixedMethodCall',
+            ],
         ];
     }
 }