fix: variation and rule keys

optimizely · Jan 15, 2021 · 4562445 · 4562445
1 parent c319f7a
commit 4562445
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
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,
+                    $variationKey === null ? '' : $variationKey,
                     $flagKey,
-                    $ruleKey,
+                    $ruleKey === null ? '' : $ruleKey,
                     $source,
                     $featureEnabled,
                     $userId,
@@ -415,7 +415,7 @@ public function decide(OptimizelyUserContext $userContext, $key, array $decideOp
                     'flagKey'=> $flagKey,
                     'enabled'=> $featureEnabled,
                     'variables' => $allVariables,
-                    'variation' => $variationKey,
+                    'variationKey' => $variationKey,
                     'ruleKey' => $ruleKey,
                     'reasons' => $shouldIncludeReasons ? $decideReasons:[],
                     'decisionEventDispatched' => $decisionEventDispatched

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],
-                'variation' => 'control',
+                'variationKey' => '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],
-                'variation' => 'control',
+                'variationKey' => '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],
-                'variation' => 'control',
+                'variationKey' => '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],
-                'variation' => 'control',
+                'variationKey' => '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],
-                'variation' => null,
+                'variationKey' => 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],
-                'variation' => null,
+                'variationKey' => 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],
-                'variation' => 'control',
+                'variationKey' => '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],
-                'variation' => 'control',
+                'variationKey' => '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],
-                'variation' => 'variation',
+                'variationKey' => '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],
-                'variation' => 'control',
+                'variationKey' => '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],
-                'variation' => 'control',
+                'variationKey' => '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],
-                'variation' => 'control',
+                'variationKey' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -1439,7 +1439,7 @@ public function testDecideOptionExcludeVariables()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> [],
-                'variation' => 'control',
+                'variationKey' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => true
@@ -1527,7 +1527,7 @@ public function testDecideOptionExcludeVariablesWhenPassedInDefaultOptions()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> [],
-                'variation' => 'control',
+                'variationKey' => '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],
-                'variation' => 'control',
+                'variationKey' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => $expectedReasons,
                 'decisionEventDispatched' => true
@@ -1762,7 +1762,7 @@ public function testDecideOptionIncludeReasonsWhenPassedInDefaultOptions()
                 'flagKey'=>'empty_feature',
                 'enabled'=> false,
                 'variables'=> [],
-                'variation' => null,
+                'variationKey' => null,
                 'ruleKey' => null,
                 'reasons' => $expectedReasons,
                 'decisionEventDispatched' => false
@@ -1840,7 +1840,7 @@ public function testDecideParamOptionsWorkTogetherWithDefaultOptions()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> [],
-                'variation' => 'control',
+                'variationKey' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => false
@@ -1951,7 +1951,7 @@ public function testDecidewithAllDecideOptionsSet()
                 'flagKey'=>'double_single_variable_feature',
                 'enabled'=> true,
                 'variables'=> [],
-                'variation' => 'control',
+                'variationKey' => 'control',
                 'ruleKey' => 'test_experiment_double_feature',
                 'reasons' => [],
                 'decisionEventDispatched' => false