Merge pull request vimeo#10289 from ging-dev/add-fix

Additional caching fixes
zoonru · Oct 17, 2023 · 5a86278 · 5a86278
2 parents 1cdef40 + 18c037e
commit 5a86278
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Diff/FileStatementsDiffer.php b/src/Psalm/Internal/Diff/FileStatementsDiffer.php
@@ -118,7 +118,7 @@ static function (
                     if ($diff_elem->old->getDocComment() === $diff_elem->new->getDocComment()) {
                         $keep = [...$keep, ...$class_keep[0]];
                     } else {
-                        $keep_signature = [...$keep_signature, ...$class_keep[0]];
+                        $add_or_delete = [...$add_or_delete, ...$class_keep[0]];
                     }
                     $keep_signature = [...$keep_signature, ...$class_keep[1]];
                     $add_or_delete = [...$add_or_delete, ...$class_keep[2]];

diff --git a/tests/Cache/CacheTest.php b/tests/Cache/CacheTest.php
@@ -219,6 +219,16 @@ public function foo($baz): void
                                 }
                             }
                         PHP,
+                        '/src/B.php' => <<<'PHP'
+                            <?php
+
+                            class B {
+                                public function foo(): void
+                                {
+                                    (new A)->foo(1);
+                                }
+                            }
+                        PHP,
                     ],
                     'issues' => [],
                 ],
@@ -244,6 +254,9 @@ public function foo($baz): void
                         '/src/A.php' => [
                             "UndefinedDocblockClass: Docblock-defined class, interface or enum named T does not exist",
                         ],
+                        '/src/B.php' => [
+                            "InvalidArgument: Argument 1 of A::foo expects T, but 1 provided",
+                        ],
                     ],
                 ],
             ],