Comply with latest test data

Author: emyller

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "tests/Engine/EngineTests/EngineTestData"]
 	path = tests/Engine/EngineTests/EngineTestData
 	url = [email protected]:Flagsmith/engine-test-data.git
-	tag = v2.1.0
+	tag = v2.3.0

src/Engine/Engine.php

@@ -9,7 +9,6 @@
 use Flagsmith\Engine\Utils\Exceptions\FeatureStateNotFound;
 use Flagsmith\Engine\Utils\Hashing;
 use Flagsmith\Engine\Utils\Semver;
-use Flagsmith\Engine\Utils\StringValue;
 use Flagsmith\Engine\Utils\Types\Context\EvaluationContext;
 use Flagsmith\Engine\Utils\Types\Context\FeatureContext;
 use Flagsmith\Engine\Utils\Types\Context\SegmentRuleType;
@@ -28,6 +27,8 @@ class Engine
     public const STRONGEST_PRIORITY = -INF;
     public const WEAKEST_PRIORITY = +INF;
 
+    private const VALID_CONTEXT_VALUE_TYPES = ['string', 'integer', 'boolean', 'double'];
+
     /**
      * Get the evaluation result for a given context.
      *
@@ -247,6 +248,7 @@ private static function _contextMatchesCondition(
         $segmentKey,
     ): bool {
         $contextValue = self::_getContextValue($context, $condition->property);
+        $cast = self::_getCaster($contextValue);
 
         switch ($condition->operator) {
             case SegmentConditionOperator::IN:
@@ -269,8 +271,7 @@ private static function _contextMatchesCondition(
                         $inValues = explode(',', $condition->value);
                     }
                 }
-                $inValues = array_map(fn ($value) => StringValue::from($value), $inValues);
-                $contextValue = StringValue::from($contextValue);
+                $inValues = array_map($cast, $inValues);
                 return in_array($contextValue, $inValues, strict: true);
 
             case SegmentConditionOperator::PERCENTAGE_SPLIT:
@@ -317,10 +318,12 @@ private static function _contextMatchesCondition(
                 return $contextValue !== null;
 
             case SegmentConditionOperator::CONTAINS:
-                return str_contains($contextValue, $condition->value);
+                return is_string($contextValue) && is_string($condition->value)
+                    && str_contains($contextValue, $condition->value);
 
             case SegmentConditionOperator::NOT_CONTAINS:
-                return !str_contains($contextValue, $condition->value);
+                return is_string($contextValue) && is_string($condition->value)
+                    && !str_contains($contextValue, $condition->value);
 
             case SegmentConditionOperator::REGEX:
                 return (bool) preg_match("/{$condition->value}/", (string) $contextValue);
@@ -350,12 +353,12 @@ private static function _contextMatchesCondition(
         }
 
         return match ($operator) {
-            '==' => $contextValue == $condition->value,
-            '!=' => $contextValue != $condition->value,
-            '>' => $contextValue > $condition->value,
-            '>=' => $contextValue >= $condition->value,
-            '<' => $contextValue < $condition->value,
-            '<=' => $contextValue <= $condition->value,
+            '==' => $contextValue === $cast($condition->value),
+            '!=' => $contextValue !== $cast($condition->value),
+            '>' => $contextValue > $cast($condition->value),
+            '>=' => $contextValue >= $cast($condition->value),
+            '<' => $contextValue < $cast($condition->value),
+            '<=' => $contextValue <= $cast($condition->value),
         };
     }
 
@@ -386,12 +389,33 @@ private static function _getContextValue($context, $property)
                 return null;
             }
 
-            return $results[0];
+            if (in_array(gettype($results[0]), self::VALID_CONTEXT_VALUE_TYPES)) {
+                return $results[0];
+            };
         }
 
         return null;
     }
 
+    /**
+     * Get a condition value type caster according to a context value
+     * @param mixed $contextValue
+     * @return ?callable
+     */
+    private static function _getCaster($contextValue): ?callable
+    {
+        if (!in_array(gettype($contextValue), self::VALID_CONTEXT_VALUE_TYPES)) {
+            return null;
+        }
+
+        return match (gettype($contextValue)) {
+            'boolean' => fn ($v) => !in_array($v, ['False', 'false']),
+            'string' => 'strval',
+            'integer' => fn ($v) => is_numeric($v) ? (int) $v : $v,
+            'double' => fn ($v) => is_numeric($v) ? (float) $v : $v,
+        };
+    }
+
     /**
      * Get the environment feature states.
      * @param EnvironmentModel $environment