Pass a context wherever possible

Author: danog

src/Psalm/Codebase.php

@@ -741,14 +741,12 @@ public function fileExists(string $file_path): bool
     public function classOrInterfaceExists(
         string $fq_class_name,
         ?CodeLocation $code_location = null,
-        ?string $calling_fq_class_name = null,
-        ?string $calling_method_id = null,
+        ?Context $context = null,
     ): bool {
         return $this->classlikes->classOrInterfaceExists(
             $fq_class_name,
             $code_location,
-            $calling_fq_class_name,
-            $calling_method_id,
+            $context,
         );
     }
 
@@ -761,14 +759,12 @@ public function classOrInterfaceExists(
     public function classOrInterfaceOrEnumExists(
         string $fq_class_name,
         ?CodeLocation $code_location = null,
-        ?string $calling_fq_class_name = null,
-        ?string $calling_method_id = null,
+        ?Context $context = null,
     ): bool {
         return $this->classlikes->classOrInterfaceOrEnumExists(
             $fq_class_name,
             $code_location,
-            $calling_fq_class_name,
-            $calling_method_id,
+            $context,
         );
     }
 
@@ -787,14 +783,12 @@ public function classExtendsOrImplements(string $fq_class_name, string $possible
     public function classExists(
         string $fq_class_name,
         ?CodeLocation $code_location = null,
-        ?string $calling_fq_class_name = null,
-        ?string $calling_method_id = null,
+        ?Context $context = null,
     ): bool {
         return $this->classlikes->classExists(
             $fq_class_name,
             $code_location,
-            $calling_fq_class_name,
-            $calling_method_id,
+            $context,
         );
     }
 
@@ -826,14 +820,12 @@ public function classImplements(string $fq_class_name, string $interface): bool
     public function interfaceExists(
         string $fq_interface_name,
         ?CodeLocation $code_location = null,
-        ?string $calling_fq_class_name = null,
-        ?string $calling_method_id = null,
+        ?Context $context = null,
     ): bool {
         return $this->classlikes->interfaceExists(
             $fq_interface_name,
             $code_location,
-            $calling_fq_class_name,
-            $calling_method_id,
+            $context,
         );
     }
 

src/Psalm/Internal/Analyzer/AttributesAnalyzer.php

@@ -140,7 +140,6 @@ private static function analyzeAttributeConstruction(
             $fq_attribute_name,
             $attribute_name_location,
             null,
-            null,
             $suppressed_issues,
             new ClassLikeNameOptions(
                 false,

src/Psalm/Internal/Analyzer/ClassAnalyzer.php

@@ -2077,7 +2077,6 @@ private function checkImplementedInterfaces(
                 $fq_interface_name,
                 $interface_location,
                 null,
-                null,
                 $this->getSuppressedIssues(),
             ) === false) {
                 return false;
@@ -2371,7 +2370,6 @@ private function checkParentClass(
             $parent_fq_class_name,
             $parent_reference_location,
             null,
-            null,
             $storage->suppressed_issues + $this->getSuppressedIssues(),
         ) === false) {
             return;

src/Psalm/Internal/Analyzer/ClassLikeAnalyzer.php

@@ -210,8 +210,7 @@ public static function checkFullyQualifiedClassLikeName(
         StatementsSource $statements_source,
         string $fq_class_name,
         CodeLocation $code_location,
-        ?string $calling_fq_class_name,
-        ?string $calling_method_id,
+        ?Context $context,
         array $suppressed_issues,
         ?ClassLikeNameOptions $options = null,
         bool $check_classes = true,
@@ -265,22 +264,19 @@ public static function checkFullyQualifiedClassLikeName(
         $class_exists = $codebase->classlikes->classExists(
             $fq_class_name,
             !$options->inferred ? $code_location : null,
-            $calling_fq_class_name,
-            $calling_method_id,
+            $context,
         );
 
         $interface_exists = $codebase->classlikes->interfaceExists(
             $fq_class_name,
             !$options->inferred ? $code_location : null,
-            $calling_fq_class_name,
-            $calling_method_id,
+            $context,
         );
 
         $enum_exists = $codebase->classlikes->enumExists(
             $fq_class_name,
             !$options->inferred ? $code_location : null,
-            $calling_fq_class_name,
-            $calling_method_id,
+            $context,
         );
 
         if (!$class_exists

src/Psalm/Internal/Analyzer/FileAnalyzer.php

@@ -232,7 +232,6 @@ public function analyze(
                         $fq_source_classlike,
                         $location,
                         null,
-                        null,
                         $this->suppressed_issues,
                         new ClassLikeNameOptions(
                             true,

src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php

@@ -750,8 +750,7 @@ public function analyze(
                     $statements_analyzer,
                     $expected_exception,
                     $storage->throw_locations[$expected_exception],
-                    $context->self,
-                    $context->calling_method_id,
+                    $context,
                     $statements_analyzer->getSuppressedIssues(),
                     new ClassLikeNameOptions(
                         false,

src/Psalm/Internal/Analyzer/Statements/Block/ForeachAnalyzer.php

@@ -610,8 +610,7 @@ public static function checkIteratorType(
                         $statements_analyzer,
                         $iterator_atomic_type->value,
                         new CodeLocation($statements_analyzer->getSource(), $expr),
-                        $context->self,
-                        $context->calling_method_id,
+                        $context,
                         $statements_analyzer->getSuppressedIssues(),
                         new ClassLikeNameOptions(true),
                     ) === false) {

src/Psalm/Internal/Analyzer/Statements/Block/TryAnalyzer.php

@@ -202,8 +202,7 @@ public static function analyze(
                         $statements_analyzer,
                         $fq_catch_class,
                         new CodeLocation($statements_analyzer->getSource(), $catch_type, $context->include_location),
-                        $context->self,
-                        $context->calling_method_id,
+                        $context,
                         $statements_analyzer->getSuppressedIssues(),
                         new ClassLikeNameOptions(true),
                     );

src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php

@@ -2695,7 +2695,6 @@ private static function getGetclassInequalityAssertions(
                 $var_type,
                 new CodeLocation($source, $whichclass_expr),
                 null,
-                null,
                 $source->getSuppressedIssues(),
             ) !== false
         ) {
@@ -3399,7 +3398,6 @@ private static function getGetclassEqualityAssertions(
                     $var_type,
                     new CodeLocation($source, $whichclass_expr),
                     null,
-                    null,
                     $source->getSuppressedIssues(),
                     new ClassLikeNameOptions(true),
                 ) === false

src/Psalm/Internal/Analyzer/Statements/Expression/Call/Method/AtomicMethodCallAnalyzer.php

@@ -180,8 +180,7 @@ public static function analyze(
                 $statements_analyzer,
                 $fq_class_name,
                 new CodeLocation($source, $stmt->var),
-                $context->self,
-                $context->calling_method_id,
+                $context,
                 $statements_analyzer->getSuppressedIssues(),
                 new ClassLikeNameOptions(true, false, true, true, $lhs_type_part->from_docblock),
                 $context->check_classes,