Merge pull request #10603 from weirdan/fix-existing_whatever-references

vimeo · Feb 5, 2024 · ddb02b9 · ddb02b9
2 parents 9ac2383 + e63db9c
commit ddb02b9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/Psalm/Codebase.php b/src/Psalm/Codebase.php
@@ -2406,7 +2406,6 @@ public function getKeyValueParamsForTraversableObject(Atomic $type): array
 
     /**
      * @param array<string, mixed> $phantom_classes
-     * @psalm-suppress PossiblyUnusedMethod part of the public API
      */
     public function queueClassLikeForScanning(
         string $fq_classlike_name,

diff --git a/src/Psalm/Internal/Codebase/ClassLikes.php b/src/Psalm/Internal/Codebase/ClassLikes.php
@@ -356,6 +356,7 @@ public function hasFullyQualifiedClassName(
             }
         }
 
+        // fixme: this looks like a crazy caching hack
         if (!isset($this->existing_classes_lc[$fq_class_name_lc])
             || !$this->existing_classes_lc[$fq_class_name_lc]
             || !$this->classlike_storage_provider->has($fq_class_name_lc)
@@ -396,13 +397,14 @@ public function hasFullyQualifiedInterfaceName(
     ): bool {
         $fq_class_name_lc = strtolower($this->getUnAliasedName($fq_class_name));
 
+        // fixme: this looks like a crazy caching hack
         if (!isset($this->existing_interfaces_lc[$fq_class_name_lc])
             || !$this->existing_interfaces_lc[$fq_class_name_lc]
             || !$this->classlike_storage_provider->has($fq_class_name_lc)
         ) {
             if ((
-                !isset($this->existing_classes_lc[$fq_class_name_lc])
-                    || $this->existing_classes_lc[$fq_class_name_lc]
+                !isset($this->existing_interfaces_lc[$fq_class_name_lc])
+                    || $this->existing_interfaces_lc[$fq_class_name_lc]
                 )
                 && !$this->classlike_storage_provider->has($fq_class_name_lc)
             ) {
@@ -463,13 +465,14 @@ public function hasFullyQualifiedEnumName(
     ): bool {
         $fq_class_name_lc = strtolower($this->getUnAliasedName($fq_class_name));
 
+        // fixme: this looks like a crazy caching hack
         if (!isset($this->existing_enums_lc[$fq_class_name_lc])
             || !$this->existing_enums_lc[$fq_class_name_lc]
             || !$this->classlike_storage_provider->has($fq_class_name_lc)
         ) {
             if ((
-                !isset($this->existing_classes_lc[$fq_class_name_lc])
-                    || $this->existing_classes_lc[$fq_class_name_lc]
+                !isset($this->existing_enums_lc[$fq_class_name_lc])
+                    || $this->existing_enums_lc[$fq_class_name_lc]
                 )
                 && !$this->classlike_storage_provider->has($fq_class_name_lc)
             ) {

diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -26,9 +26,11 @@
 use function array_shift;
 use function class_exists;
 use function count;
+use function enum_exists;
 use function explode;
 use function function_exists;
 use function in_array;
+use function interface_exists;
 use function is_array;
 use function is_int;
 use function json_encode;
@@ -140,7 +142,6 @@ class InternalCallMapHandlerTest extends TestCase
         'oci_result',
         'ocigetbufferinglob',
         'ocisetbufferinglob',
-        'recursiveiteratoriterator::__construct', // Class used in CallMap does not exist: recursiveiterator
         'sqlsrv_fetch_array',
         'sqlsrv_fetch_object',
         'sqlsrv_get_field',
@@ -173,7 +174,6 @@ class InternalCallMapHandlerTest extends TestCase
     private static array $ignoredReturnTypeOnlyFunctions = [
         'appenditerator::getinneriterator' => ['8.1', '8.2', '8.3'],
         'appenditerator::getiteratorindex' => ['8.1', '8.2', '8.3'],
-        'arrayobject::getiterator' => ['8.1', '8.2', '8.3'],
         'cachingiterator::getinneriterator' => ['8.1', '8.2', '8.3'],
         'callbackfilteriterator::getinneriterator' => ['8.1', '8.2', '8.3'],
         'curl_multi_getcontent',
@@ -631,6 +631,8 @@ private function assertTypeValidity(ReflectionType $reflected, string $specified
         } catch (InvalidArgumentException $e) {
             if (preg_match('/^Could not get class storage for (.*)$/', $e->getMessage(), $matches)
                 && !class_exists($matches[1])
+                && !interface_exists($matches[1])
+                && !enum_exists($matches[1])
             ) {
                 $this->fail("Class used in CallMap does not exist: {$matches[1]}");
             }

diff --git a/tests/TypeReconciliation/ReconcilerTest.php b/tests/TypeReconciliation/ReconcilerTest.php
@@ -61,6 +61,7 @@ class A {}
             class B {}
             interface SomeInterface {}
         ');
+        $this->project_analyzer->getCodebase()->queueClassLikeForScanning('Countable');
         $this->project_analyzer->getCodebase()->scanFiles();
     }