Merge bd23ce0 into c687e53

optimizely · Jan 22, 2021 · 42cfd24 · 42cfd24
2 parents c687e53 + bd23ce0
commit 42cfd24
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 25 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^4.8|^5.0",
-    "php-coveralls/php-coveralls": "v2.3.0",
+    "php-coveralls/php-coveralls": "v2.0.0",
     "squizlabs/php_codesniffer": "3.*",
     "icecave/parity": "^1.0 || ^2.0"
   },

diff --git a/src/Optimizely/Optimizely.php b/src/Optimizely/Optimizely.php
@@ -375,9 +375,9 @@ public function decide(OptimizelyUserContext $userContext, $key, array $decideOp
                 $this->sendImpressionEvent(
                     $config,
                     $ruleKey,
-                    $variationKey === null ? '' : $variationKey,
+                    $variationKey,
                     $flagKey,
-                    $ruleKey === null ? '' : $ruleKey,
+                    $ruleKey,
                     $source,
                     $featureEnabled,
                     $userId,
@@ -415,7 +415,7 @@ public function decide(OptimizelyUserContext $userContext, $key, array $decideOp
                     'flagKey'=> $flagKey,
                     'enabled'=> $featureEnabled,
                     'variables' => $allVariables,
-                    'variationKey' => $variationKey,
+                    'variation' => $variationKey,
                     'ruleKey' => $ruleKey,
                     'reasons' => $shouldIncludeReasons ? $decideReasons:[],
                     'decisionEventDispatched' => $decisionEventDispatched

diff --git a/src/Optimizely/OptimizelyUserContext.php b/src/Optimizely/OptimizelyUserContext.php
@@ -31,24 +31,29 @@ public function __construct(Optimizely $optimizelyClient, $userId, array $attrib
         $this->attributes = $attributes;
     }
 
+    protected function replicate()
+    {
+        return new OptimizelyUserContext($this->optimizelyClient, $this->userId, $this->attributes);
+    }
+
     public function setAttribute($key, $value)
     {
         $this->attributes[$key] = $value;
     }
 
     public function decide($key, array $options = [])
     {
-        return $this->optimizelyClient->decide($this, $key, $options);
+        return $this->optimizelyClient->decide($this->replicate(), $key, $options);
     }
 
     public function decideForKeys(array $keys, array $options = [])
     {
-        return $this->optimizelyClient->decideForKeys($this, $keys, $options);
+        return $this->optimizelyClient->decideForKeys($this->replicate(), $keys, $options);
     }
 
     public function decideAll(array $options = [])
     {
-        return $this->optimizelyClient->decideAll($this, $options);
+        return $this->optimizelyClient->decideAll($this->replicate(), $options);
     }
 
     public function trackEvent($eventKey, array $eventTags = [])

diff --git a/tests/OptimizelyTest.php b/tests/OptimizelyTest.php
@@ -430,7 +430,7 @@ public function testDecide()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> ["double_variable" => 42.42],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -590,7 +590,7 @@ public function testDecidewhenUserIsBucketedIntoFeatureExperiment()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> ["double_variable" => 42.42],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -681,7 +681,7 @@ public function testDecidewhenUserIsBucketedIntoRolloutAndSendFlagDecisionIsTrue
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> ["double_variable" => 42.42],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -772,7 +772,7 @@ public function testDecidewhenUserIsBucketedIntoRolloutAndSendFlagDecisionIsFals
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> ["double_variable" => 42.42],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => false
@@ -852,7 +852,7 @@ public function testDecidewhenDecisionServiceReturnsNullAndSendFlagDecisionIsTru
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> false,
                 'variables'=> ["double_variable" => 14.99],
-                'variationKey' => null,
+                'variation' => null,
                 'ruleKey' => null,
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -936,7 +936,7 @@ public function testwhenDecisionServiceReturnNullAndSendFlagDecisionIsFalse()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> false,
                 'variables'=> ["double_variable" => 14.99],
-                'variationKey' => null,
+                'variation' => null,
                 'ruleKey' => null,
                 'reasons' => [],
                 'decisionEventDispatched' => false
@@ -1012,7 +1012,7 @@ public function testDecideOptionDisableDecisionEvent()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> ["double_variable" => 42.42],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => false
@@ -1078,7 +1078,7 @@ public function testDecideOptionDisableDecisionEventWhenPassedInDefaultOptions()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> ["double_variable" => 42.42],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => false
@@ -1140,7 +1140,7 @@ public function testDecideRespectsUserProfileServiceLookup()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> false,
                 'variables'=> ["double_variable" => 14.99],
-                'variationKey' => 'variation',
+                'variation' => 'variation',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -1214,7 +1214,7 @@ public function testDecideRespectsUserProfileServiceSave()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> ["double_variable" => 42.42],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -1288,7 +1288,7 @@ public function testDecideOptionIgnoreUserProfileService()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> ["double_variable" => 42.42],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -1364,7 +1364,7 @@ public function testDecideOptionIgnoreUserProfileServiceWhenPassedInDefaultOptio
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> ["double_variable" => 42.42],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -1439,7 +1439,7 @@ public function testDecideOptionExcludeVariables()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> [],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -1527,7 +1527,7 @@ public function testDecideOptionExcludeVariablesWhenPassedInDefaultOptions()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> [],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -1667,7 +1667,7 @@ public function testDecideOptionIncludeReasons()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> ["double_variable" => 42.42],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => $expectedReasons,
                 'decisionEventDispatched' => true
@@ -1762,7 +1762,7 @@ public function testDecideOptionIncludeReasonsWhenPassedInDefaultOptions()
                 'flagKey'=>'empty_feature',
                 'enabled'=> false,
                 'variables'=> [],
-                'variationKey' => null,
+                'variation' => null,
                 'ruleKey' => null,
                 'reasons' => $expectedReasons,
                 'decisionEventDispatched' => false
@@ -1840,7 +1840,7 @@ public function testDecideParamOptionsWorkTogetherWithDefaultOptions()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> [],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => false
@@ -1951,7 +1951,7 @@ public function testDecidewithAllDecideOptionsSet()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> [],
-                'variationKey' => 'control',
+                'variation' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => false

diff --git a/tests/OptimizelyUserContextTests.php b/tests/OptimizelyUserContextTests.php
@@ -137,6 +137,22 @@ public function testDecideCallsAndReturnsOptimizelyDecideAPI()
         );
     }
 
+    public function testDecideResponseUserContextNotEqualCalledUserContext()
+    {
+        $userId = 'test_user';
+        $attributes = [ "browser" => "chrome"];
+
+        $optlyObject = new Optimizely($this->datafile);
+
+        $optUserContext = new OptimizelyUserContext($optlyObject, $userId, $attributes);
+        $decision = $optUserContext->decide('test_feature', ['DISABLE_DECISION_EVENT', 'ENABLED_FLAGS_ONLY']);
+        $optUserContext->setAttribute("test_key", "test_value");
+        $this->assertNotEquals(
+            $optUserContext->getAttributes(),
+            $decision->getUserContext()->getAttributes()
+        );
+    }
+
     public function testDecideAllCallsAndReturnsOptimizelyDecideAllAPI()
     {
         $userId = 'test_user';