comments addressed

ozayr-zaviar · ozayr-zaviar · commit 32122b7185e5 · 2021-11-04T13:29:27.000+05:00
diff --git a/src/Optimizely/Config/DatafileProjectConfig.php b/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 --git a/src/Optimizely/Optimizely.php b/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 --git a/src/Optimizely/OptimizelyUserContext.php b/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 --git a/src/Optimizely/Utils/Errors.php b/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.';
 }

Original file line number	Diff line number	Diff line change
`@@ -1267,7 +1267,7 @@ public function isValid()`
`1267`	`1267`	`if (!$this->getConfig()) {`
`1268`	`1268`	`$this->_logger->log(`
`1269`	`1269`	`Logger::ERROR,`
`1270`		`- "Optimizely SDK not configured properly yet."`
	`1270`	`+ Errors::NO_CONFIG`
`1271`	`1271`	`);`
`1272`	`1272`	`return false;`
`1273`	`1273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ private function findExistingRuleAndFlagKey($context)`
`125`	`125`	`public function findForcedDecision($context)`
`126`	`126`	`{`
`127`	`127`	`$foundVariationKey = null;`
`128`		`- if (!$this->forcedDecisions) {`
	`128`	`+ if (!isset($this->forcedDecisions)) {`
`129`	`129`	`return null;`
`130`	`130`	`}`
`131`	`131`	`if (count($this->forcedDecisions) == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,5 @@ class Errors`
`20`	`20`	`{`
`21`	`21`	`const INVALID_FORMAT = 'Provided %s is in an invalid format.';`
`22`	`22`	`const INVALID_DATAFILE = 'Datafile has invalid format. Failing "%s".';`
	`23`	`+ const NO_CONFIG = 'Optimizely SDK not configured properly yet.';`
`23`	`24`	`}`