[11.x] Fix only number as session key will result in numbered session…

… keys (#51611) * fix: replace array merge with array replace on session store * test: add only integer test case to load session from handler
laravel · May 29, 2024 · 97238d2 · 97238d2
1 parent a79593d
commit 97238d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Illuminate/Session/Store.php b/src/Illuminate/Session/Store.php
@@ -98,7 +98,7 @@ public function start()
      */
     protected function loadSession()
     {
-        $this->attributes = array_merge($this->attributes, $this->readFromHandler());
+        $this->attributes = array_replace($this->attributes, $this->readFromHandler());
 
         $this->marshalErrorBag();
     }

diff --git a/tests/Session/SessionStoreTest.php b/tests/Session/SessionStoreTest.php
@@ -24,12 +24,14 @@ protected function tearDown(): void
     public function testSessionIsLoadedFromHandler()
     {
         $session = $this->getSession();
-        $session->getHandler()->shouldReceive('read')->once()->with($this->getSessionId())->andReturn(serialize(['foo' => 'bar', 'bagged' => ['name' => 'taylor']]));
+        $session->getHandler()->shouldReceive('read')->once()->with($this->getSessionId())->andReturn(serialize(['foo' => 'bar', 'bagged' => ['name' => 'taylor'], '123' => 'bax']));
         $session->start();
 
         $this->assertSame('bar', $session->get('foo'));
+        $this->assertSame('bax', $session->get('123'));
         $this->assertSame('baz', $session->get('bar', 'baz'));
         $this->assertTrue($session->has('foo'));
+        $this->assertTrue($session->has('123'));
         $this->assertFalse($session->has('bar'));
         $this->assertTrue($session->isStarted());