Merge pull request #9043 from pilif/fix-9042

fixes #9042
vimeo · Jan 3, 2023 · 7029e76 · 7029e76
2 parents c6cfa86 + bab1756
commit 7029e76
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/DateTimeModifyReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/DateTimeModifyReturnTypeProvider.php
@@ -8,6 +8,7 @@
 use Psalm\Plugin\EventHandler\MethodReturnTypeProviderInterface;
 use Psalm\Type;
 use Psalm\Type\Atomic\TLiteralString;
+use Psalm\Type\Atomic\TNamedObject;
 use Psalm\Type\Union;
 
 /**
@@ -56,7 +57,11 @@ public static function getMethodReturnType(MethodReturnTypeProviderEvent $event)
             return Type::getFalse();
         }
         if ($has_date_time && !$has_false) {
-            return Type::parseString($event->getFqClasslikeName());
+            return Type::intersectUnionTypes(
+                Type::parseString($event->getCalledFqClasslikeName() ?? $event->getFqClasslikeName()),
+                new Union([new TNamedObject('static')]),
+                $statements_source->getCodebase(),
+            );
         }
 
         return null;

diff --git a/tests/DateTimeTest.php b/tests/DateTimeTest.php
@@ -44,8 +44,8 @@ function getString(): string
                     $b = $dateTimeImmutable->modify(getString());
                     ',
                 'assertions' => [
-                    '$a' => 'DateTime',
-                    '$b' => 'DateTimeImmutable',
+                    '$a' => 'DateTime&static',
+                    '$b' => 'DateTimeImmutable&static',
                 ],
             ],
             'modifyWithInvalidConstant' => [
@@ -88,6 +88,20 @@ function getString(): string
                     '$b' => 'DateTimeImmutable|false',
                 ],
             ],
+            'modifyStaticReturn' => [
+                'code' => '<?php
+
+                    class Subclass extends DateTimeImmutable
+                    {
+                    }
+
+                    $foo = new Subclass("2023-01-01 12:12:13");
+                    $mod = $foo->modify("+7 days");
+                    ',
+                'assertions' => [
+                    '$mod' => 'Subclass&static',
+                ],
+            ],
         ];
     }
 }
diff --git a/tests/MethodCallTest.php b/tests/MethodCallTest.php
@@ -263,7 +263,7 @@ final class MyDate extends DateTimeImmutable {}
                     $b = (new DateTimeImmutable())->modify("+3 hours");',
                 'assertions' => [
                     '$yesterday' => 'MyDate',
-                    '$b' => 'DateTimeImmutable',
+                    '$b' => 'DateTimeImmutable&static',
                 ],
             ],
             'magicCall' => [