added more type validity checks to reduce possible false positives

AndrolGenhald · Jun 13, 2022 · 507e792 · 507e792
1 parent c7e39e7
commit 507e792
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -68,8 +68,8 @@ public function callMapEntryProvider(): iterable
             if (strpos($function, '::') !== false) {
                 continue;
             }
-            // Skip alternate signatures
-            if (preg_match("/\'\d$/", $function)) {
+            // Skip functions with alternate signatures
+            if (isset($callMap["$function\'1"]) || preg_match("/\'\d$/", $function)) {
                 continue;
             }
             if ($this->skipUndefinedFunctions && !function_exists($function)) {
@@ -181,18 +181,34 @@ private function assertTypeValidity(ReflectionNamedType $reflected, string $spec
     {
         // Trim leading namespace separator
         $specified = ltrim($specified, "\\");
-        if ($reflected->getName() === 'array' && preg_match('/^array<.*>$/', $specified)) {
+        if ($reflected->getName() === 'array' && preg_match('/^(array|list)<.*>$/', $specified)) {
             return;
         }
         if ($reflected->getName() === 'float' && $specified === 'int|float') {
             return;
         }
+        if ($reflected->getName() === 'bool' && in_array($specified, ['true', 'false'])) {
+            return;
+        }
+        if ($reflected->getName() === 'callable' && preg_match('/^callable\(/', $specified)) {
+            return;
+        }
+
+        if ($reflected->getName() === 'string' && $specified === '?string' && $reflected->allowsNull()) {
+            return;
+        }
+        if ($reflected->getName() === 'string' && in_array($specified , ['class-string', 'numeric-string', 'string'])) {
+            return;
+        }
+        if ($reflected->getName() === 'int' && in_array($specified , ['positive-int', 'int'])) {
+            return;
+        }
 
         if ($reflected->allowsNull()) {
             $this->assertMatchesRegularExpression("/^\?{$reflected->getName()}|{$reflected->getName()}\|null|null\|{$reflected->getName()}/", $specified, $message);
             return;
         }
 
-        $this->assertSame($reflected->getName(), $specified, $message);
+        $this->assertEqualsIgnoringCase($reflected->getName(), $specified, $message);
     }
 }