Fixed an issue with setting multiple forced variation values (#55)

* Added test for multiple setForcedVariation calls.

* Fixed an issue with setting multiple forced variation values.

Author: alda-optimizely

src/Optimizely/ProjectConfig.php

@@ -411,7 +411,7 @@ public function setForcedVariation($experimentKey, $userId, $variationKey)
         }
 
         if (empty($variationKey)) {
-            unset($this->_forcedVariationMap[$userId]);
+            unset($this->_forcedVariationMap[$userId][$experimentId]);
             $this->_logger->log(Logger::DEBUG, sprintf('Variation mapped to experiment "%s" has been removed for user "%s".', $experimentKey, $userId));
             return TRUE;
         }
@@ -422,7 +422,8 @@ public function setForcedVariation($experimentKey, $userId, $variationKey)
             return FALSE;
         }
 
-        $this->_forcedVariationMap[$userId] = array($experimentId => $variationId);
+        $this->_forcedVariationMap[$userId][$experimentId] = $variationId;
+
         $this->_logger->log(Logger::DEBUG, sprintf('Set variation "%s" for experiment "%s" and user "%s" in the forced variation map.', $variationId, $experimentId, $userId));
 
         return TRUE;   

tests/ProjectConfigTest.php

@@ -630,11 +630,13 @@ public function testSetGetForcedVariation()
         $userId = 'test_user';
         $invalidUserId = 'invalid_user';
         $experimentKey = 'test_experiment';
+        $experimentKey2 = 'group_experiment_1';
         $invalidExperimentKey = 'invalid_experiment';        
         $variationKey = 'control';
+        $variationKey2 = 'group_exp_1_var_1';
         $invalidVariationKey = 'invalid_variation';
-
-        $optlyObject = new Optimizely(DATAFILE, new ValidEventDispatcher(), $this->loggerMock);
+        
+        $optlyObject = new Optimizely(DATAFILE, new ValidEventDispatcher(), $this->loggerMock );
         $userAttributes = [
             'device_type' => 'iPhone',
             'location' => 'San Francisco'
@@ -661,6 +663,19 @@ public function testSetGetForcedVariation()
         $forcedVariation = $this->config->getForcedVariation($experimentKey, $userId);
         $this->assertEquals($variationKey, $forcedVariation->getKey());
 
+        // check multiple sets
+        $this->assertTrue($this->config->setForcedVariation($experimentKey2, $userId, $variationKey2));
+        $forcedVariation2 = $this->config->getForcedVariation($experimentKey2, $userId);
+        $this->assertEquals($variationKey2, $forcedVariation2->getKey());
+        // make sure the second set does not overwrite the first set
+        $forcedVariation = $this->config->getForcedVariation($experimentKey, $userId);
+        $this->assertEquals($variationKey, $forcedVariation->getKey());
+        // make sure unsetting the second experiment-to-variation mapping does not unset the
+        // first experiment-to-variation mapping
+        $this->assertTrue($this->config->setForcedVariation($experimentKey2, $userId, null));
+        $forcedVariation = $this->config->getForcedVariation($experimentKey, $userId);
+        $this->assertEquals($variationKey, $forcedVariation->getKey());
+
         // an invalid user ID should return a null variation
         $this->assertNull($this->config->getForcedVariation($experimentKey, $invalidUserId));
     }