removed unnesecary checks and moved getVariationFromExperiment above …

…and then checking $variation = $config->getFlagVariationByKey($flagKey, $variationKey);
optimizely · msohailhussain · Dec 22, 2021 · Dec 13, 2021 · Dec 15, 2021 · Dec 15, 2021
commit bcb8eea9bb606fb940deebfe84c8894ad8aec114
diff --git a/src/Optimizely/Event/Builder/EventBuilder.php b/src/Optimizely/Event/Builder/EventBuilder.php
@@ -252,17 +252,13 @@ public function createImpressionEvent($config, $experimentId, $variationKey, $fl
         $eventParams = $this->getCommonParams($config, $userId, $attributes);
         $experiment = $config->getExperimentFromId($experimentId);
 
-        $variation = "";
+        // When variation is not mapped to any flagKey
+        $variation = $config->getVariationFromKeyByExperimentId($experimentId, $variationKey);
+
         // Mapped flagKey can be directly used in variation in that case no experimentKey exist
-        if (!empty($flagKey)) {
+        if ($variation && !$variation->getKey()){
             $variation = $config->getFlagVariationByKey($flagKey, $variationKey);
         }
-
-        // When variation is not mapped to any flagKey
-        if (!$variation && !empty($experimentId)) {
-            $variation = $config->getVariationFromKeyByExperimentId($experimentId, $variationKey);
-        }
-
         $impressionParams = $this->getImpressionParams($experiment, $variation, $flagKey, $ruleKey, $ruleType, $enabled);
 
         $eventParams[VISITORS][0][SNAPSHOTS][] = $impressionParams;