feat: Replace conditions evaluation with new implementation

Author: Greg0

src/Conditions.php

@@ -13,6 +13,10 @@ final class Conditions implements ConditionInterface
 {
     private ConditionInterface $expression;
 
+    /**
+     * @param string|list<array<string, list<array{attribute: string, operator: string, value?: mixed, regexFlags?: string}>>|array{attribute: string, operator: string, value?: mixed, regexFlags?: string}> $conditions
+     * @return self
+     */
     public static function createFromMixed($conditions): self
     {
         if ($conditions === '*') {

src/Datafile/Conditions.php

@@ -19,11 +19,16 @@ final class Content
      */
     public static function createFromPath(string $path): self
     {
-        if (file_exists($path)) {
-            $content = file_get_contents($path);
+        if (file_exists($path) === false) {
+            throw new \InvalidArgumentException("File '$path' not found");
         }
 
-        return self::createFromArray(json_decode($content, true, 512, JSON_THROW_ON_ERROR));
+        return self::createFromJson(file_get_contents($path));
+    }
+
+    public static function createFromJson(string $json): self
+    {
+        return self::createFromArray(json_decode($json, true, 512, JSON_THROW_ON_ERROR));
     }
 
     /**
@@ -35,7 +40,7 @@ public static function createFromPath(string $path): self
      *  }>
      * } $data
      */
-    private static function createFromArray(array $data): self
+    public static function createFromArray(array $data): self
     {
         return new self(
             $data['schemaVersion'],

src/Datafile/Content.php

@@ -10,16 +10,13 @@
 final class Segment
 {
     private bool $archived;
-    /**
-     * @var Condition|array<Condition>|string
-     */
-    private $conditions; // Can be Condition, List<Condition>, or String
+    private Conditions $conditions;
     private string $description;
 
     /**
      * @param array<array{
      *      archived: bool,
-     *      conditions: array{}|list<array{}>|string,
+     *      conditions: list<array<string, mixed>>|string,
      *      description: string
      *  }> $segments
      * @return array<Segment>
@@ -35,7 +32,7 @@ public static function createManyFromArray(array $segments): array
     /**
      * @param array{
      *     archived: bool,
-     *     conditions: array{}|list<array{}>|string,
+     *     conditions: list<array<string, mixed>>|string,
      *     description: string
      * } $data
      */
@@ -50,7 +47,7 @@ public static function createFromArray(array $data): self
 
     public function __construct(
         string $description,
-        ConditionInterface $conditions,
+        Conditions $conditions,
         bool $archived = false
     )
     {
@@ -64,15 +61,7 @@ public function isArchived(): bool
         return $this->archived;
     }
 
-    public function getKey(): string
-    {
-        return $this->key;
-    }
-
-    /**
-     * @return Condition|array<Condition>|string
-     */
-    public function getConditions()
+    public function getConditions(): Conditions
     {
         return $this->conditions;
     }

src/Datafile/Segment.php

@@ -2,6 +2,7 @@
 
 namespace Featurevisor;
 
+use Featurevisor\Datafile\Conditions;
 use Psr\Log\LoggerInterface;
 
 class DatafileReader
@@ -93,77 +94,7 @@ public function getRegex(string $regexString, string $regexFlags = ''): string
 
     public function allConditionsAreMatched($conditions, array $context): bool
     {
-        if (is_string($conditions)) {
-            if ($conditions === '*') {
-                return true;
-            }
-            // Try to parse as JSON
-            $parsed = json_decode($conditions, true);
-            if (json_last_error() === JSON_ERROR_NONE) {
-                $conditions = $parsed;
-            } else {
-                return false;
-            }
-        }
-
-        $getRegex = function(string $regexString, string $regexFlags) {
-            return $this->getRegex($regexString, $regexFlags);
-        };
-
-        if (is_array($conditions)) {
-            // If it's an empty array, always match (true)
-            if (count($conditions) === 0) {
-                return true;
-            }
-            // Logical operators
-            if (isset($conditions['and']) && is_array($conditions['and'])) {
-                foreach ($conditions['and'] as $subCondition) {
-                    if (!$this->allConditionsAreMatched($subCondition, $context)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            if (isset($conditions['or']) && is_array($conditions['or'])) {
-                foreach ($conditions['or'] as $subCondition) {
-                    if ($this->allConditionsAreMatched($subCondition, $context)) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            if (isset($conditions['not']) && is_array($conditions['not'])) {
-                foreach ($conditions['not'] as $subCondition) {
-                    if ($this->allConditionsAreMatched($subCondition, $context)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            // If it's a plain array, treat as AND (all must match)
-            if (array_keys($conditions) === range(0, count($conditions) - 1)) {
-                foreach ($conditions as $subCondition) {
-                    if (!$this->allConditionsAreMatched($subCondition, $context)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            // If it's a single condition (associative array)
-            if (isset($conditions['attribute'])) {
-                try {
-                    return Conditions::conditionIsMatched($conditions, $context, $getRegex);
-                } catch (\Exception $e) {
-                    $this->logger->warning($e->getMessage(), [
-                        'exception' => $e,
-                        'condition' => $conditions,
-                        'context' => $context,
-                    ]);
-                    return false;
-                }
-            }
-        }
-        return false;
+        return Conditions::createFromMixed($conditions)->isSatisfiedBy($context);
     }
 
     public function segmentIsMatched(array $segment, array $context): bool
@@ -173,6 +104,7 @@ public function segmentIsMatched(array $segment, array $context): bool
 
     public function allSegmentsAreMatched($groupSegments, array $context): bool
     {
+        var_dump($groupSegments);
         if ($groupSegments === '*') {
             return true;
         }