Merge pull request codeigniter4#2697 from michalsn/session_bug

Fix session bug when the request is ajax call
arif-rh · Mar 13, 2020 · 9506609 · 9506609
2 parents a1411ab + 1583981
commit 9506609
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/system/Session/Session.php b/system/Session/Session.php
@@ -503,7 +503,7 @@ public function get(string $key = null)
 		}
 		elseif (empty($_SESSION))
 		{
-			return [];
+			return $key === null ? [] : null;
 		}
 
 		if (! empty($key))

diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
@@ -129,6 +129,28 @@ public function testGetReturnsNullWhenNotFound()
 		$this->assertNull($session->get('foo'));
 	}
 
+	public function testGetReturnsNullWhenNotFoundWithXmlHttpRequest()
+	{
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
+		$_SESSION                         = [];
+
+		$session = $this->getInstance();
+		$session->start();
+
+		$this->assertNull($session->get('foo'));
+	}
+
+	public function testGetReturnsEmptyArrayWhenWithXmlHttpRequest()
+	{
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
+		$_SESSION                         = [];
+
+		$session = $this->getInstance();
+		$session->start();
+
+		$this->assertEquals([], $session->get());
+	}
+
 	public function testGetReturnsItemValueisZero()
 	{
 		$_SESSION = [];