comments addressed

Author: ozayr-zaviar

Diff for: src/Optimizely/Config/DatafileProjectConfig.php

@@ -389,14 +389,20 @@ public function __construct($datafile, $logger, $errorHandler)
             $flagRules = $this->getAllRulesForFlag($flag);
 
             foreach ($flagRules as $rule) {
-                $flagVariations = array_merge($flagVariations, array_filter(array_values($rule->getVariations()), function ($variation) use ($flagVariations) {
+                $filtered_variations = [];
+                foreach (array_values($rule->getVariations()) as $variation) {
+                    $exist = false;
                     foreach ($flagVariations as $flagVariation) {
                         if ($flagVariation->getId() == $variation->getId()) {
-                            return false;
+                            $exist = true;
+                            break;
                         }
                     }
-                    return true;
-                }));
+                    if (!$exist) {
+                        array_push($filtered_variations, $variation);
+                    }
+                }
+                $flagVariations = array_merge($flagVariations, $filtered_variations);
             }
 
             $this->_flagVariationsMap[$flag->getKey()] = $flagVariations;

Diff for: src/Optimizely/Optimizely.php

@@ -1267,7 +1267,7 @@ public function isValid()
         if (!$this->getConfig()) {
             $this->_logger->log(
                 Logger::ERROR,
-                "Optimizely SDK not configured properly yet."
+                Errors::NO_CONFIG
             );
             return false;
         }

Diff for: src/Optimizely/OptimizelyUserContext.php

@@ -125,7 +125,7 @@ private function findExistingRuleAndFlagKey($context)
     public function findForcedDecision($context)
     {
         $foundVariationKey = null;
-        if (!$this->forcedDecisions) {
+        if (!isset($this->forcedDecisions)) {
             return null;
         }
         if (count($this->forcedDecisions) == 0) {

Diff for: src/Optimizely/Utils/Errors.php

@@ -20,4 +20,5 @@ class Errors
 {
     const INVALID_FORMAT = 'Provided %s is in an invalid format.';
     const INVALID_DATAFILE = 'Datafile has invalid format. Failing "%s".';
+    const NO_CONFIG = 'Optimizely SDK not configured properly yet.';
 }