Merge pull request #10610 from theodorejb/context-types

Author: weirdan

src/Psalm/Context.php

@@ -85,7 +85,7 @@ final class Context
     /**
      * A set of references that might still be in scope from a scope likely to cause confusion. This applies
      * to references set inside a loop or if statement, since it's easy to forget about PHP's weird scope
-     * rules, and assinging to a reference will change the referenced variable rather than shadowing it.
+     * rules, and assigning to a reference will change the referenced variable rather than shadowing it.
      *
      * @var array<string, CodeLocation>
      */
@@ -112,7 +112,7 @@ final class Context
     public bool $inside_unset = false;
 
     /**
-     * Whether or not we're inside an class_exists call, where
+     * Whether or not we're inside a class_exists call, where
      * we don't care about possibly undefined classes
      */
     public bool $inside_class_exists = false;
@@ -207,9 +207,9 @@ final class Context
     /**
      * Stored to prevent re-analysing methods when checking for initialised properties
      *
-     * @var array<string, bool>|null
+     * @var array<string, bool>
      */
-    public ?array $initialized_methods = null;
+    public array $initialized_methods = [];
 
     /**
      * @var array<string, Union>

src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/ExistingAtomicStaticCallAnalyzer.php

@@ -126,10 +126,6 @@ public static function analyze(
                     }
 
                     if (!isset($context->initialized_methods[(string) $appearing_method_id])) {
-                        if ($context->initialized_methods === null) {
-                            $context->initialized_methods = [];
-                        }
-
                         $context->initialized_methods[(string) $appearing_method_id] = true;
 
                         $file_analyzer->getMethodMutations($appearing_method_id, $context);

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

@@ -110,10 +110,6 @@ public static function collectSpecialInformation(
                         return;
                     }
 
-                    if ($context->initialized_methods === null) {
-                        $context->initialized_methods = [];
-                    }
-
                     $context->initialized_methods[(string) $method_id] = true;
                 }
 
@@ -193,10 +189,6 @@ public static function collectSpecialInformation(
                 return;
             }
 
-            if ($context->initialized_methods === null) {
-                $context->initialized_methods = [];
-            }
-
             $context->initialized_methods[(string) $declaring_method_id] = true;
 
             $method_storage = $codebase->methods->getStorage($declaring_method_id);

tests/Config/ConfigFileTest.php

@@ -285,8 +285,9 @@ protected static function compareContentWithTemplateAndTrailingLineEnding(string
         $passed = false;
 
         foreach ([PHP_EOL, "\n", "\r", "\r\n"] as $eol) {
-            if (!$passed && $contents === ($expected_template . $eol)) {
+            if ($contents === ($expected_template . $eol)) {
                 $passed = true;
+                break;
             }
         }