Merge pull request #251 from bencorlett/feature/deep-sessions

Allowing dot-notation arrays to be used in session data.

Author: taylorotwell

src/Illuminate/Session/Store.php

@@ -177,7 +177,7 @@ protected function isExpired($session)
 
 	/**
 	 * Get the full array of session data, including flash data.
-	 * 
+	 *
 	 * @return array
 	 */
 	public function all()
@@ -210,28 +210,26 @@ public function get($key, $default = null)
 		// First we will check for the value in the general session data and if it
 		// is not present in that array we'll check the session flash datas to
 		// get the data from there. If netiher is there we give the default.
-		if (isset($data[$key]))
-		{
-			return $data[$key];
-		}
-
-		// Session flash data is only persisted for the next request into the app
-		// which makes it convenient for temporary status messages or various
-		// other strings. We'll check all of this flash data for the items.
-		elseif (isset($data[':new:'][$key]))
+		return array_get($data, $key, function() use ($data, $key, $default)
 		{
-			return $data[':new:'][$key];
-		}
-
-		// The "old" flash data are the data flashed during the previous request
-		// while the "new" data is the data flashed during the course of this
-		// current request. Usually developers will be retrieving the olds.
-		elseif (isset($data[':old:'][$key]))
-		{
-			return $data[':old:'][$key];
-		}
+			// Session flash data is only persisted for the next request into the app
+			// which makes it convenient for temporary status messages or various
+			// other strings. We'll check all of this flash data for the items.
+			if ($value = array_get($data, ":new:.$key"))
+			{
+				return $value;
+			}
+
+			// The "old" flash data are the data flashed during the previous request
+			// while the "new" data is the data flashed during the course of this
+			// current request. Usually developers will be retrieving the olds.
+			if ($value = array_get($data, ":old:.$key"))
+			{
+				return $value;
+			}
 
-		return $default instanceof Closure ? $default() : $default;
+			return $default instanceof Closure ? $default() : $default;
+		});
 	}
 
 	/**
@@ -252,14 +250,8 @@ public function getOldInput($key = null, $default = null)
 		{
 			return $input;
 		}
-		elseif (array_key_exists($key, $input))
-		{
-			return $input[$key];
-		}
-		else
-		{
-			return $default instanceof Closure ? $default() : $default;
-		}
+
+		return array_get($input, $key, $default);
 	}
 
 	/**
@@ -281,7 +273,7 @@ public function getToken()
 	 */
 	public function put($key, $value)
 	{
-		$this->session['data'][$key] = $value;
+		array_set($this->session['data'], $key, $value);
 	}
 
 	/**
@@ -343,7 +335,7 @@ public function keep($keys)
 	 */
 	public function forget($key)
 	{
-		unset($this->session['data'][$key]);
+		array_forget($this->session['data'], $key);
 	}
 
 	/**
@@ -636,4 +628,4 @@ public function offsetUnset($key)
 		$this->forget($key);
 	}
 
-}
+}

tests/Session/SessionStoreTest.php

@@ -181,7 +181,7 @@ public function testFinishMethodCallsCreateMethodAndAgesFlashData()
 		$store->setExists(false);
 		$response = new Response;
 		$cookie = $this->getCookieJarMock();
-		$store->finish($response, $cookie, 0);	
+		$store->finish($response, $cookie, 0);
 	}
 
 
@@ -236,6 +236,26 @@ public function testFlashInputFlashesInput()
 	}
 
 
+	public function testComplexArrayPayloadManipulation()
+	{
+		$store = $this->storeMock('isInvalid');
+		$cookies = m::mock('Illuminate\Cookie\CookieJar');
+		$cookies->shouldReceive('get')->once()->with('illuminate_session')->andReturn('foo');
+		$store->start($cookies);
+
+		$store->put('foo.bar', 'baz');
+		$this->assertEquals('baz', $store->get('foo.bar'));
+		$this->assertEquals(array('bar' => 'baz'), $store->get('foo'));
+		$store->put('foo.bat', 'qux');
+		$this->assertCount(2, $store->get('foo'));
+		$this->assertEquals(array('bar' => 'baz', 'bat' => 'qux'), $store->get('foo'));
+		$this->assertTrue($store->has('foo.bat'));
+		$store->forget('foo.bat');
+		$this->assertEquals(array('bar' => 'baz'), $store->get('foo'));
+		$this->assertFalse($store->has('foo.bat'));
+	}
+
+
 	protected function dummySession()
 	{
 		return array('id' => '123', 'data' => array(':old:' => array(), ':new:' => array()), 'last_activity' => '9999999999');
@@ -287,4 +307,4 @@ public function sweep($expiration)
 		//
 	}
 
-}
+}