Fixing an issue where strategies were applied to incorrect session co…

…nfigurations
UnionOfRAD · May 31, 2012 · 606d376 · 606d376
1 parent 9511c05
commit 606d376
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 12 deletions.
diff --git a/storage/Session.php b/storage/Session.php
@@ -147,16 +147,17 @@ public static function write($key, $value = null, array $options = array()) {
 			}
 		}
 		$result = false;
-		$settings = static::_config($name);
 
-		if ($options['strategies']) {
+		$original = $value;
-			$options += array('key' => $key, 'class' => __CLASS__);
-			$value = static::applyStrategies(__FUNCTION__, $name, $value, $options);
-		}
-		$params = compact('key', 'value', 'options');
 
 		foreach ($methods as $name => $method) {
+			$settings = static::_config($name);
 			$filters = $settings['filters'];
+			if ($options['strategies']) {
+				$options += array('key' => $key, 'class' => __CLASS__);
+				$value = static::applyStrategies(__FUNCTION__, $name, $original, $options);
+			}
+			$params = compact('key', 'value', 'options');
 			$result = static::_filter(__FUNCTION__, $params, $method, $filters) || $result;
 		}
 		return $result;
@@ -192,15 +193,15 @@ public static function delete($key, array $options = array()) {
 		}
 		$result = false;
 		$options += array('key' => $key, 'class' => __CLASS__);
-
+		$original = $key;
-		if ($options['strategies']) {
-			$options += array('key' => $key, 'class' => __CLASS__);
-			$key = static::applyStrategies(__FUNCTION__, $name, $key, $options);
-		}
-		$params = compact('key', 'options');
 
 		foreach ($methods as $name => $method) {
 			$settings = static::_config($name);
+			if ($options['strategies']) {
+				$options += array('key' => $key, 'class' => __CLASS__);
+				$key = static::applyStrategies(__FUNCTION__, $name, $original, $options);
+			}
+			$params = compact('key', 'options');
 			$filters = $settings['filters'];
 			$result = static::_filter(__FUNCTION__, $params, $method, $filters) || $result;
 		}

diff --git a/tests/cases/storage/SessionTest.php b/tests/cases/storage/SessionTest.php
@@ -246,6 +246,31 @@ public function testStrategies() {
 		$this->assertFalse(Session::check('test', array('strategies' => false)));
 	}
 
+	public function testMultipleStrategies() {
+		Session::config(array(
+			'primary' => array(
+				'adapter' => new Memory(),
+				'filters' => array(),
+				'strategies' => array()
+			),
+			'secondary' => array(
+				'adapter' => new Memory(),
+				'filters' => array(),
+				'strategies' => array('lithium\storage\cache\strategy\Json')
+			)
+		));
+
+		Session::write('test', array('foo' => 'bar'));
+		$result = Session::read('test');
+		$this->assertEqual(array('foo' => 'bar'), $result);
+
+		$result = Session::read('test', array('name' => 'primary', 'strategies' => false));
+		$this->assertEqual(array('foo' => 'bar'), $result);
+
+		$result = Session::read('test', array('name' => 'secondary', 'strategies' => false));
+		$this->assertEqual('{"foo":"bar"}', $result);
+	}
+
 	public function testEncryptedStrategy() {
 		$this->skipIf(!MockEncrypt::enabled(), 'The Mcrypt extension is not installed or enabled.');