Fix(FeatureVariable): Resolves variable value type cast issue (#165)

Author: rashidsp

src/Optimizely/Optimizely.php

@@ -684,6 +684,10 @@ public function getFeatureVariableValueForType(
             }
         }
 
+        if (!is_null($variableValue)) {
+            $variableValue = VariableTypeUtils::castStringToType($variableValue, $variableType, $this->_logger);
+        }
+
         $attributes = $attributes ?: [];
         $this->notificationCenter->sendNotifications(
             NotificationType::DECISION,
@@ -719,19 +723,13 @@ public function getFeatureVariableValueForType(
      */
     public function getFeatureVariableBoolean($featureFlagKey, $variableKey, $userId, $attributes = null)
     {
-        $variableValue = $this->getFeatureVariableValueForType(
+        return $this->getFeatureVariableValueForType(
             $featureFlagKey,
             $variableKey,
             $userId,
             $attributes,
             FeatureVariable::BOOLEAN_TYPE
         );
-
-        if (!is_null($variableValue)) {
-            return VariableTypeUtils::castStringToType($variableValue, FeatureVariable::BOOLEAN_TYPE, $this->_logger);
-        }
-
-        return $variableValue;
     }
 
     /**
@@ -746,19 +744,13 @@ public function getFeatureVariableBoolean($featureFlagKey, $variableKey, $userId
      */
     public function getFeatureVariableInteger($featureFlagKey, $variableKey, $userId, $attributes = null)
     {
-        $variableValue = $this->getFeatureVariableValueForType(
+        return $this->getFeatureVariableValueForType(
             $featureFlagKey,
             $variableKey,
             $userId,
             $attributes,
             FeatureVariable::INTEGER_TYPE
         );
-
-        if (!is_null($variableValue)) {
-            return VariableTypeUtils::castStringToType($variableValue, FeatureVariable::INTEGER_TYPE, $this->_logger);
-        }
-
-        return $variableValue;
     }
 
     /**
@@ -773,19 +765,13 @@ public function getFeatureVariableInteger($featureFlagKey, $variableKey, $userId
      */
     public function getFeatureVariableDouble($featureFlagKey, $variableKey, $userId, $attributes = null)
     {
-        $variableValue = $this->getFeatureVariableValueForType(
+        return $this->getFeatureVariableValueForType(
             $featureFlagKey,
             $variableKey,
             $userId,
             $attributes,
             FeatureVariable::DOUBLE_TYPE
         );
-
-        if (!is_null($variableValue)) {
-            return VariableTypeUtils::castStringToType($variableValue, FeatureVariable::DOUBLE_TYPE, $this->_logger);
-        }
-
-        return $variableValue;
     }
 
     /**
@@ -800,15 +786,13 @@ public function getFeatureVariableDouble($featureFlagKey, $variableKey, $userId,
      */
     public function getFeatureVariableString($featureFlagKey, $variableKey, $userId, $attributes = null)
     {
-        $variableValue = $this->getFeatureVariableValueForType(
+        return $this->getFeatureVariableValueForType(
             $featureFlagKey,
             $variableKey,
             $userId,
             $attributes,
             FeatureVariable::STRING_TYPE
         );
-
-        return $variableValue;
     }
 
     /**