Merge pull request #10812 from issidorov/bug-10807

vimeo · Mar 11, 2024 · 8471a89 · 8471a89
2 parents 005e318 + fe42e88
commit 8471a89
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/...lm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/AtomicStaticCallAnalyzer.php b/...lm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/AtomicStaticCallAnalyzer.php
@@ -789,7 +789,7 @@ private static function handleNamedCall(
             }
         }
 
-        if (!$callstatic_method_exists || $class_storage->hasSealedMethods($config)) {
+        if ($naive_method_exists || !$callstatic_method_exists || $class_storage->hasSealedMethods($config)) {
             $does_method_exist = MethodAnalyzer::checkMethodExists(
                 $codebase,
                 $method_id,

diff --git a/tests/AssertAnnotationTest.php b/tests/AssertAnnotationTest.php
@@ -90,6 +90,36 @@ function requiresString(string $_str): void {}
         $this->analyzeFile('somefile.php', new Context());
     }
 
+    public function testAssertsAllongCallStaticMethodWork(): void
+    {
+        $this->addFile(
+            'somefile.php',
+            '<?php
+
+            class ImportedAssert
+            {
+                /** @psalm-assert non-empty-string $b */
+                public static function notEmptyStrOnly(string $b): void
+                {
+                    if ("" === $b) throw new \Exception("");
+                }
+
+                public function __callStatic() {}
+            }
+
+            /** @return non-empty-string */
+            function returnNonEmpty(string $b): string
+            {
+                ImportedAssert::notEmptyStrOnly($b);
+
+                return $b;
+            }
+            ',
+        );
+
+        $this->analyzeFile('somefile.php', new Context());
+    }
+
     public function testAssertInvalidDocblockMessageDoesNotIncludeTrace(): void
     {
         $this->expectException(CodeException::class);