From 6e5f3db06c376e3692123815eee8c41ad955c7a5 Mon Sep 17 00:00:00 2001 From: orklah Date: Thu, 4 Nov 2021 22:45:46 +0100 Subject: [PATCH] makes $_SESSION possibly undefined --- .../Internal/Analyzer/Statements/Expression/AssertionFinder.php | 1 - src/Psalm/Internal/Type/NegatedAssertionReconciler.php | 1 - src/Psalm/Internal/Type/SimpleAssertionReconciler.php | 1 - 3 files changed, 3 deletions(-) diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php index ef3d48c458b..8d1db7db577 100644 --- 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/Type/NegatedAssertionReconciler.php b/src/Psalm/Internal/Type/NegatedAssertionReconciler.php index e801477e4d0..2e397e31abc 100644 --- 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 index fd4cb775c53..9f78143ed95 100644 --- 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()) {