Merge pull request #6824 from orklah/session

Makes $_SESSION possibly undefined at the source
vimeo · Nov 5, 2021 · b783468 · b783468
2 parents 603fa65 + 6e5f3db
commit b783468
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
@@ -284,7 +284,6 @@ public static function scrapeAssertions(
                         && !$var_type->isMixed()
                         && !$var_type->possibly_undefined
                         && !$var_type->possibly_undefined_from_try
-                        && $var_name !== '$_SESSION'
                     ) {
                         $if_types[$var_name] = [['!null']];
                     } else {

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/VariableFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/VariableFetchAnalyzer.php
@@ -557,7 +557,11 @@ public static function getGlobalType(string $var_id) : Type\Union
         }
 
         if (self::isSuperGlobal($var_id)) {
-            return Type::getArray();
+            $type = Type::getArray();
+            if ($var_id === '$_SESSION') {
+                $type->possibly_undefined = true;
+            }
+            return $type;
         }
 
         return Type::getMixed();

diff --git a/src/Psalm/Internal/Type/NegatedAssertionReconciler.php b/src/Psalm/Internal/Type/NegatedAssertionReconciler.php
@@ -86,7 +86,6 @@ public static function reconcile(
                 if (!$existing_var_type->isNullable()
                     && $key
                     && strpos($key, '[') === false
-                    && $key !== '$_SESSION'
                 ) {
                     foreach ($existing_var_type->getAtomicTypes() as $atomic) {
                         if (!$existing_var_type->hasMixed()

diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -460,7 +460,6 @@ private static function reconcileIsset(
         $did_remove_type = ($key && strpos($key, '['))
             || !$existing_var_type->initialized
             || $existing_var_type->possibly_undefined
-            || $key === '$_SESSION'
             || $existing_var_type->ignore_isset;
 
         if ($existing_var_type->isNullable()) {