Allow checking $_SESSION for null without altering type

vimeo · Jan 15, 2020 · c3edbdb · c3edbdb
1 parent 1202ba4
commit c3edbdb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOpAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOpAnalyzer.php
@@ -680,7 +680,9 @@ function (\Psalm\Internal\Clause $c) use ($mixed_var_ids) {
                 ) {
                     $var_id = ExpressionAnalyzer::getVarId($stmt->left, $context->self);
 
-                    if (!$var_id || !isset($changed_var_ids[$var_id])) {
+                    if (!$var_id
+                        || ($var_id !== '$_SESSION' && $var_id !== '$_SERVER' && !isset($changed_var_ids[$var_id]))
+                    ) {
                         if ($naive_type->from_docblock) {
                             if (IssueBuffer::accepts(
                                 new \Psalm\Issue\DocblockTypeContradiction(

diff --git a/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php b/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
@@ -2286,10 +2286,6 @@ public function getGlobalType(string $var_id) : Type\Union
         if ($this->isSuperGlobal($var_id)) {
             $type = Type::getArray();
 
-            if ($var_id === '$_SESSION') {
-                $type->possibly_undefined = true;
-            }
-
             return $type;
         }
 

diff --git a/src/Psalm/Internal/Type/NegatedAssertionReconciler.php b/src/Psalm/Internal/Type/NegatedAssertionReconciler.php
@@ -97,6 +97,7 @@ 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/Type/Reconciler.php b/src/Psalm/Type/Reconciler.php
@@ -310,6 +310,7 @@ public static function reconcileKeyedTypes(
                 && !$result_type->hasType('iterable')
                 && (!$has_isset || substr($key, -1, 1) !== ']')
                 && !($statements_analyzer->getSource()->getSource() instanceof TraitAnalyzer)
+                && $key !== '$_SESSION'
             ) {
                 $reconciled_parts = array_map(
                     function (array $new_type_part_parts): string {

diff --git a/tests/TypeReconciliation/IssetTest.php b/tests/TypeReconciliation/IssetTest.php
@@ -525,6 +525,10 @@ function foo(array $columns, array $options) : void {
                 '<?php
                     $a = $_SESSION ?? [];',
             ],
+            'sessionIssetNull' => [
+                '<?php
+                    $a = isset($_SESSION) ? $_SESSION : [];',
+            ],
             'issetSeparateNegated' => [
                 '<?php
                     function foo(?string $a, ?string $b): string {