fix: Fix conditions according to example tests

Author: Greg0

composer.json

@@ -43,7 +43,8 @@
     "ext-mbstring": "*",
     "psr/log": "^1.1",
     "symfony/polyfill-php80": "^1.32",
-    "symfony/yaml": "^5.4"
+    "symfony/yaml": "^5.4",
+    "symfony/polyfill-php81": "^1.33"
   },
   "require-dev": {
     "phpunit/phpunit": "^9",

composer.lock

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Featurevisor\Datafile;
+
+
+final class AttributeException extends \LogicException
+{
+    public static function createForNotFoundAttribute(string $name): self
+    {
+        return new self("Attribute '$name' not found");
+    }
+
+    public static function createForInvalidType(string $attribute, array $allowedTypes, string $givenType): self
+    {
+        $allowedTypesMsg = implode(', ', $allowedTypes);
+        return new self("Attribute '$attribute' expected one of '$allowedTypesMsg'. Given '$givenType'");
+    }
+}

src/Datafile/AttributeException.php

@@ -44,6 +44,10 @@ public function __construct(ConditionInterface $expression)
 
     public function isSatisfiedBy(array $context): bool
     {
-        return $this->expression->isSatisfiedBy($context);
+        try {
+            return $this->expression->isSatisfiedBy($context);
+        } catch (AttributeException $e) {
+            return false;
+        }
     }
 }

src/Datafile/Conditions.php

@@ -5,6 +5,8 @@
 namespace Featurevisor\Datafile\Conditions;
 
 
+use Featurevisor\Datafile\AttributeException;
+
 final class AndCondition implements ConditionInterface
 {
     /** @var array<ConditionInterface> */
@@ -18,7 +20,11 @@ public function __construct(ConditionInterface ...$conditions)
     public function isSatisfiedBy(array $context): bool
     {
         foreach ($this->conditions as $condition) {
-            if ($condition->isSatisfiedBy($context) === false) {
+            try {
+                if ($condition->isSatisfiedBy($context) === false) {
+                    return false;
+                }
+            } catch (AttributeException $e) {
                 return false;
             }
         }

src/Datafile/Conditions/AndCondition.php

@@ -12,8 +12,8 @@ final class ConditionFactory
 {
     public function create(array $conditions): ConditionInterface
     {
-        if (array_key_exists('attribute', $conditions)) {
-            return $this->createCondition($conditions);
+        if (array_is_list($conditions) === false) {
+            return $this->map($conditions);
         }
 
         $mappedConditions = array_map(fn ($condition) => $this->map($condition), $conditions);

src/Datafile/Conditions/ConditionFactory.php

@@ -2,7 +2,12 @@
 
 namespace Featurevisor\Datafile\Conditions;
 
+use Featurevisor\Datafile\AttributeException;
+
 interface ConditionInterface
 {
+    /**
+     * @throws AttributeException
+     */
     public function isSatisfiedBy(array $context): bool;
 }

src/Datafile/Conditions/ConditionInterface.php

@@ -5,27 +5,46 @@
 namespace Featurevisor\Datafile\Conditions;
 
 
+use Featurevisor\Datafile\AttributeException;
+
 trait ContextLookup
 {
     /**
      * @return mixed|null
+     * @throws AttributeException
      */
     public function getValueFromContext(array $context, string $attribute)
     {
         if (strpos($attribute, '.') === false) {
-            return $context[$attribute] ?? null;
+            if (array_key_exists($attribute, $context) === false) {
+                throw AttributeException::createForNotFoundAttribute($attribute);
+            }
+
+            return $context[$attribute];
         }
 
         $keys = explode('.', $attribute);
         $current = $context;
 
         foreach ($keys as $key) {
-            if (!is_array($current) || !isset($current[$key])) {
-                return null;
+            if (is_array($current) === false || array_key_exists($key, $current) === false) {
+                throw AttributeException::createForNotFoundAttribute($attribute);
             }
             $current = $current[$key];
         }
 
         return $current;
     }
+
+    /**
+     * @param array<string> $allowedTypes
+     * @param mixed $value
+     * @throws AttributeException
+     */
+    private function validateType(array $allowedTypes, string $attribute, $value): void
+    {
+        if ($value !== null && in_array(gettype($value), $allowedTypes, true) === false) {
+            throw AttributeException::createForInvalidType($attribute, $allowedTypes, gettype($value));
+        }
+    }
 }

src/Datafile/Conditions/ContextLookup.php

@@ -5,10 +5,13 @@
 namespace Featurevisor\Datafile\Conditions;
 
 
+use Featurevisor\Datafile\AttributeException;
+
 final class InCondition implements ConditionInterface
 {
     use ContextLookup;
 
+    private const ALLOWED_TYPES = ['string', 'integer'];
     private string $attribute;
     /** @var array<string> */
     private array $value;
@@ -30,6 +33,9 @@ public function __construct(string $attribute, array $value)
 
     public function isSatisfiedBy(array $context): bool
     {
-        return in_array($this->getValueFromContext($context, $this->attribute), $this->value, true);
+        $valueFromContext = $this->getValueFromContext($context, $this->attribute);
+        $this->validateType(self::ALLOWED_TYPES, $this->attribute, $valueFromContext);
+
+        return in_array($valueFromContext, $this->value, true);
     }
 }

src/Datafile/Conditions/InCondition.php

@@ -5,6 +5,8 @@
 namespace Featurevisor\Datafile\Conditions;
 
 
+use Featurevisor\Datafile\AttributeException;
+
 final class NotCondition implements ConditionInterface
 {
     private ConditionInterface $specification;
@@ -16,6 +18,10 @@ public function __construct(ConditionInterface $specification)
 
     public function isSatisfiedBy(array $context): bool
     {
-        return $this->specification->isSatisfiedBy($context) === false;
+        try {
+            return $this->specification->isSatisfiedBy($context) === false;
+        } catch (AttributeException $e) {
+            return false;
+        }
     }
 }