[HttpFoundation] Fix TypeError on null $_SESSION in NativeSessionStorage::save()

chalasr · chalasr · commit 05f3e77193e5 · 2022-06-29T20:39:28.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -256,7 +256,7 @@ public function save()
                 unset($_SESSION[$key]);
             }
         }
-        if ([$key = $this->metadataBag->getStorageKey()] === array_keys($_SESSION)) {
+        if ($_SESSION && [$key = $this->metadataBag->getStorageKey()] === array_keys($_SESSION)) {
             unset($_SESSION[$key]);
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -321,4 +321,13 @@ public function testRegenerateInvalidSessionIdForNativeFileSessionHandler()
         $this->assertTrue($started);
         $this->assertSame('&~[', session_id());
     }
+
+    public function testSaveHandlesNullSessionGracefully()
+    {
+        $storage = $this->getStorage();
+        $_SESSION = null;
+        $storage->save();
+
+        $this->addToAssertionCount(1);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ public function save()`
`256`	`256`	`unset($_SESSION[$key]);`
`257`	`257`	`}`
`258`	`258`	`}`
`259`		`- if ([$key = $this->metadataBag->getStorageKey()] === array_keys($_SESSION)) {`
	`259`	`+ if ($_SESSION && [$key = $this->metadataBag->getStorageKey()] === array_keys($_SESSION)) {`
`260`	`260`	`unset($_SESSION[$key]);`
`261`	`261`	`}`
`262`	`262`
Original file line number	Diff line number	Diff line change
`@@ -321,4 +321,13 @@ public function testRegenerateInvalidSessionIdForNativeFileSessionHandler()`
`321`	`321`	`$this->assertTrue($started);`
`322`	`322`	`$this->assertSame('&~[', session_id());`
`323`	`323`	`}`
	`324`	`+`
	`325`	`+ public function testSaveHandlesNullSessionGracefully()`
	`326`	`+ {`
	`327`	`+ $storage = $this->getStorage();`
	`328`	`+ $_SESSION = null;`
	`329`	`+ $storage->save();`
	`330`	`+`
	`331`	`+ $this->addToAssertionCount(1);`
	`332`	`+ }`
`324`	`333`	`}`