fix: updates to support 8.1 and errors

open-feature · Dec 4, 2023 · fb44796 · fb44796
1 parent a8a160b
commit fb44796
Show file tree

Hide file tree

Showing 21 changed files with 54 additions and 110 deletions.
diff --git a/src/OpenFeatureClient.php b/src/OpenFeatureClient.php
@@ -4,7 +4,6 @@
 
 namespace OpenFeature;
 
-use DateTime;
 use OpenFeature\implementation\common\Metadata;
 use OpenFeature\implementation\common\ValueTypeValidator;
 use OpenFeature\implementation\errors\InvalidResolutionValueError;
@@ -16,7 +15,6 @@
 use OpenFeature\implementation\hooks\HookContextFactory;
 use OpenFeature\implementation\hooks\HookExecutor;
 use OpenFeature\implementation\hooks\HookHints;
-use OpenFeature\implementation\provider\Reason;
 use OpenFeature\implementation\provider\ResolutionError;
 use OpenFeature\interfaces\common\LoggerAwareTrait;
 use OpenFeature\interfaces\common\Metadata as MetadataInterface;
@@ -30,6 +28,7 @@
 use OpenFeature\interfaces\hooks\HooksAwareTrait;
 use OpenFeature\interfaces\provider\ErrorCode;
 use OpenFeature\interfaces\provider\Provider;
+use OpenFeature\interfaces\provider\Reason;
 use OpenFeature\interfaces\provider\ResolutionDetails;
 use OpenFeature\interfaces\provider\ThrowableWithResolutionError;
 use Psr\Log\LoggerAwareInterface;
@@ -282,12 +281,12 @@ public function getObjectDetails(string $flagKey, $defaultValue, ?EvaluationCont
      * -----------------
      * Methods, functions, or operations on the client MUST NOT throw exceptions, or otherwise abnormally terminate. Flag evaluation calls must always return the default value in the event of abnormal execution. Exceptions include functions or methods for the purposes for configuration or setup.
      *
-     * @param bool|string|int|float|DateTime|mixed[]|null $defaultValue
+     * @param bool|string|int|float|mixed[]|null $defaultValue
      */
     private function evaluateFlag(
         FlagValueType $flagValueType,
         string $flagKey,
-        bool | string | int | float | DateTime | array | null $defaultValue,
+        bool | string | int | float | array | null $defaultValue,
         ?EvaluationContextInterface $invocationContext = null,
         ?EvaluationOptionsInterface $options = null,
     ): EvaluationDetailsInterface {
@@ -383,6 +382,9 @@ private function evaluateFlag(
         return $details;
     }
 
+    /**
+     * @param bool|string|int|float|mixed[]|null $defaultValue
+     */
     private function createProviderEvaluation(
         FlagValueType $type,
         string $key,
@@ -394,35 +396,28 @@ private function createProviderEvaluation(
             case FlagValueType::Boolean->value:
                 /** @var bool $defaultValue */;
                 $defaultValue = $defaultValue;
-                $resolver = $provider->resolveBooleanValue(...);
 
-                break;
+                return $provider->resolveBooleanValue($key, $defaultValue, $context);
             case FlagValueType::String->value:
                 /** @var string $defaultValue */;
                 $defaultValue = $defaultValue;
-                $resolver = $provider->resolveStringValue(...);
 
-                break;
+                return $provider->resolveStringValue($key, $defaultValue, $context);
             case FlagValueType::Integer->value:
                 /** @var int $defaultValue */;
                 $defaultValue = $defaultValue;
-                $resolver = $provider->resolveIntegerValue(...);
 
-                break;
+                return $provider->resolveIntegerValue($key, $defaultValue, $context);
             case FlagValueType::Float->value:
                 /** @var float $defaultValue */;
                 $defaultValue = $defaultValue;
-                $resolver = $provider->resolveFloatValue(...);
 
-                break;
+                return $provider->resolveFloatValue($key, $defaultValue, $context);
             case FlagValueType::Object->value:
-                /** @var object $defaultValue */;
+                /** @var mixed[] $defaultValue */;
                 $defaultValue = $defaultValue;
-                $resolver = $provider->resolveObjectValue(...);
 
-                break;
+                return $provider->resolveObjectValue($key, $defaultValue, $context);
         }
-
-        return $resolver($key, $defaultValue, $context);
     }
 }
diff --git a/src/implementation/common/ValueTypeValidator.php b/src/implementation/common/ValueTypeValidator.php
@@ -82,7 +82,6 @@ public static function is(FlagValueType $type, mixed $value): bool
             FlagValueType::Integer => self::isInteger($value),
             FlagValueType::String => self::isString($value),
             FlagValueType::Object => self::isStructure($value) || self::isArray($value),
-            default => false,
         };
     }
 }
diff --git a/src/implementation/flags/EvaluationDetails.php b/src/implementation/flags/EvaluationDetails.php
@@ -4,16 +4,15 @@
 
 namespace OpenFeature\implementation\flags;
 
-use DateTime;
 use OpenFeature\interfaces\flags\EvaluationDetails as EvaluationDetailsInterface;
 use OpenFeature\interfaces\provider\ResolutionError;
 
 class EvaluationDetails implements EvaluationDetailsInterface
 {
     private string $flagKey = '';
 
-    /** @var bool|string|int|float|DateTime|mixed[]|null $value */
-    private bool | string | int | float | DateTime | array | null $value = null;
+    /** @var bool|string|int|float|mixed[]|null $value */
+    private bool | string | int | float | array | null $value = null;
     private ?ResolutionError $error = null;
     private ?string $reason = null;
     private ?string $variant = null;
@@ -38,17 +37,17 @@ public function setFlagKey(string $flagKey): void
      * -----------------
      * The evaluation details structure's value field MUST contain the evaluated flag value.
      *
-     * @return bool|string|int|float|DateTime|mixed[]|null
+     * @return bool|string|int|float|mixed[]|null
      */
-    public function getValue(): bool | string | int | float | DateTime | array | null
+    public function getValue(): bool | string | int | float | array | null
     {
         return $this->value;
     }
 
     /**
-     * @param bool|string|int|float|DateTime|mixed[]|null $value
+     * @param bool|string|int|float|mixed[]|null $value
      */
-    public function setValue(bool | string | int | float | DateTime | array | null $value): void
+    public function setValue(bool | string | int | float | array | null $value): void
     {
         $this->value = $value;
     }

diff --git a/src/implementation/flags/EvaluationDetailsBuilder.php b/src/implementation/flags/EvaluationDetailsBuilder.php
@@ -4,7 +4,6 @@
 
 namespace OpenFeature\implementation\flags;
 
-use DateTime;
 use OpenFeature\interfaces\flags\EvaluationDetails as EvaluationDetailsInterface;
 use OpenFeature\interfaces\provider\ResolutionError;
 
@@ -25,9 +24,9 @@ public function withFlagKey(string $flagKey): EvaluationDetailsBuilder
     }
 
     /**
-     * @param bool|string|int|float|DateTime|mixed[]|null $value
+     * @param bool|string|int|float|mixed[]|null $value
      */
-    public function withValue(bool | string | int | float | DateTime | array | null $value): EvaluationDetailsBuilder
+    public function withValue(bool | string | int | float | array | null $value): EvaluationDetailsBuilder
     {
         $this->details->setValue($value);
 

diff --git a/src/implementation/flags/EvaluationDetailsFactory.php b/src/implementation/flags/EvaluationDetailsFactory.php
@@ -4,7 +4,6 @@
 
 namespace OpenFeature\implementation\flags;
 
-use DateTime;
 use OpenFeature\interfaces\flags\EvaluationDetails;
 use OpenFeature\interfaces\provider\ResolutionDetails;
 
@@ -13,9 +12,9 @@ class EvaluationDetailsFactory
     /**
      * Provides a simple method for building EvaluationDetails from a given value\
      *
-     * @param bool|string|int|float|DateTime|mixed[]|null $value
+     * @param bool|string|int|float|mixed[]|null $value
      */
-    public static function from(string $flagKey, bool | string | int | float | DateTime | array | null $value): EvaluationDetails
+    public static function from(string $flagKey, bool | string | int | float | array | null $value): EvaluationDetails
     {
         return (new EvaluationDetailsBuilder())
                     ->withFlagKey($flagKey)

diff --git a/src/implementation/flags/NoOpClient.php b/src/implementation/flags/NoOpClient.php
@@ -4,7 +4,6 @@
 
 namespace OpenFeature\implementation\flags;
 
-use DateTime;
 use OpenFeature\implementation\common\Metadata;
 use OpenFeature\interfaces\flags\Client;
 use OpenFeature\interfaces\flags\EvaluationContext as EvaluationContextInterface;
@@ -69,7 +68,7 @@ public function getObjectValue(
         return $defaultValue;
     }
 
-    public function getObjectDetails(string $flagKey, bool | string | int | float | DateTime | array | null $defaultValue, ?EvaluationContextInterface $context = null, ?EvaluationOptions $options = null): EvaluationDetails
+    public function getObjectDetails(string $flagKey, bool | string | int | float | array | null $defaultValue, ?EvaluationContextInterface $context = null, ?EvaluationOptions $options = null): EvaluationDetails
     {
         return EvaluationDetailsFactory::from($flagKey, $defaultValue);
     }

diff --git a/src/implementation/hooks/AbstractHookContext.php b/src/implementation/hooks/AbstractHookContext.php
@@ -4,7 +4,6 @@
 
 namespace OpenFeature\implementation\hooks;
 
-use DateTime;
 use Exception;
 use OpenFeature\implementation\common\Metadata;
 use OpenFeature\implementation\flags\EvaluationContext;
@@ -13,15 +12,14 @@
 use OpenFeature\interfaces\flags\FlagValueType;
 use OpenFeature\interfaces\hooks\HookContext;
 
-use function array_values;
 use function is_array;
 
 abstract class AbstractHookContext
 {
-    protected string $flagKey;
-    protected FlagValueType $type;
-    /** @var bool|string|int|float|DateTime|mixed[]|null $defaultValue */
-    protected bool | string | int | float | DateTime | array | null $defaultValue = null;
+    protected string $flagKey = '';
+    protected FlagValueType $type = FlagValueType::Boolean;
+    /** @var bool|string|int|float|mixed[]|null $defaultValue */
+    protected bool | string | int | float | array | null $defaultValue = null;
     protected EvaluationContextInterface $evaluationContext;
     protected MetadataInterface $clientMetadata;
     protected MetadataInterface $providerMetadata;
@@ -48,7 +46,7 @@ public function __construct(HookContext | array | null $hookContext = null)
             $this->clientMetadata = $hookContext->getClientMetadata();
             $this->providerMetadata = $hookContext->getProviderMetadata();
         } elseif (is_array($hookContext)) {
-            foreach (array_values(self::REQUIRED_PROPERTIES) as $requiredProperty) {
+            foreach (self::REQUIRED_PROPERTIES as $requiredProperty) {
                 if (!isset($hookContext[$requiredProperty])) {
                     throw new Exception('Required property missing from hook context');
                 }

diff --git a/src/implementation/hooks/HookContextBuilder.php b/src/implementation/hooks/HookContextBuilder.php
@@ -4,7 +4,6 @@
 
 namespace OpenFeature\implementation\hooks;
 
-use DateTime;
 use OpenFeature\interfaces\common\Metadata;
 use OpenFeature\interfaces\flags\EvaluationContext;
 use OpenFeature\interfaces\flags\FlagValueType;
@@ -35,9 +34,9 @@ public function withType(FlagValueType $type): self
     }
 
     /**
-     * @param bool|string|int|float|DateTime|mixed[]|null $defaultValue
+     * @param bool|string|int|float|mixed[]|null $defaultValue
      */
-    public function withDefaultValue(bool | string | int | float | DateTime | array | null $defaultValue): self
+    public function withDefaultValue(bool | string | int | float | array | null $defaultValue): self
     {
         $this->hookContext->setDefaultValue($defaultValue);
 

diff --git a/src/implementation/hooks/HookContextFactory.php b/src/implementation/hooks/HookContextFactory.php
@@ -4,7 +4,6 @@
 
 namespace OpenFeature\implementation\hooks;
 
-use DateTime;
 use OpenFeature\implementation\flags\EvaluationContext;
 use OpenFeature\interfaces\common\Metadata;
 use OpenFeature\interfaces\flags\EvaluationContext as EvaluationContextInterface;
@@ -14,12 +13,12 @@
 class HookContextFactory
 {
     /**
-     * @param bool|string|int|float|DateTime|mixed[]|null $defaultValue
+     * @param bool|string|int|float|mixed[]|null $defaultValue
      */
     public static function from(
         string $flagKey,
         FlagValueType $type,
-        bool | string | int | float | DateTime | array | null $defaultValue,
+        bool | string | int | float | array | null $defaultValue,
         ?EvaluationContextInterface $evaluationContext,
         Metadata $clientMetadata,
         Metadata $providerMetadata,

diff --git a/src/implementation/hooks/ImmutableHookContext.php b/src/implementation/hooks/ImmutableHookContext.php
@@ -4,7 +4,6 @@
 
 namespace OpenFeature\implementation\hooks;
 
-use DateTime;
 use OpenFeature\interfaces\common\Metadata;
 use OpenFeature\interfaces\flags\EvaluationContext;
 use OpenFeature\interfaces\flags\FlagValueType;
@@ -23,9 +22,9 @@ public function getType(): FlagValueType
     }
 
     /**
-     * @return bool|string|int|float|DateTime|mixed[]|null
+     * @return bool|string|int|float|mixed[]|null
      */
-    public function getDefaultValue(): bool | string | int | float | DateTime | array | null
+    public function getDefaultValue(): bool | string | int | float | array | null
     {
         return $this->defaultValue;
     }

diff --git a/src/implementation/hooks/MutableHookContext.php b/src/implementation/hooks/MutableHookContext.php
@@ -4,7 +4,6 @@
 
 namespace OpenFeature\implementation\hooks;
 
-use DateTime;
 use OpenFeature\interfaces\common\Metadata;
 use OpenFeature\interfaces\flags\EvaluationContext;
 use OpenFeature\interfaces\flags\FlagValueType;
@@ -23,7 +22,7 @@ public function setType(FlagValueType $type): void
         $this->type = $type;
     }
 
-    public function setDefaultValue(bool | string | int | float | DateTime | array | null $defaultValue): void
+    public function setDefaultValue(bool | string | int | float | array | null $defaultValue): void
     {
         $this->defaultValue = $defaultValue;
     }

diff --git a/src/implementation/provider/Reason.php b/src/implementation/provider/Reason.php
diff --git a/src/implementation/provider/ResolutionDetails.php b/src/implementation/provider/ResolutionDetails.php
@@ -4,30 +4,29 @@
 
 namespace OpenFeature\implementation\provider;
 
-use DateTime;
 use OpenFeature\interfaces\provider\ResolutionDetails as ResolutionDetailsInterface;
 use OpenFeature\interfaces\provider\ResolutionError;
 
 class ResolutionDetails implements ResolutionDetailsInterface
 {
-    /** @var bool|string|int|float|DateTime|mixed[]|null $value */
-    private bool | string | int | float | DateTime | array | null $value = null;
+    /** @var bool|string|int|float|mixed[]|null $value */
+    private bool | string | int | float | array | null $value = null;
     private ?ResolutionError $error = null;
     private ?string $reason = null;
     private ?string $variant = null;
 
     /**
-     * @return bool|string|int|float|DateTime|mixed[]|null
+     * @return bool|string|int|float|mixed[]|null
      */
-    public function getValue(): bool | string | int | float | DateTime | array | null
+    public function getValue(): bool | string | int | float | array | null
     {
         return $this->value;
     }
 
     /**
-     * @param bool|string|int|float|DateTime|mixed[]|null $value
+     * @param bool|string|int|float|mixed[]|null $value
      */
-    public function setValue(bool | string | int | float | DateTime | array | null $value): void
+    public function setValue(bool | string | int | float | array | null $value): void
     {
         $this->value = $value;
     }

diff --git a/src/implementation/provider/ResolutionDetailsBuilder.php b/src/implementation/provider/ResolutionDetailsBuilder.php
@@ -4,7 +4,6 @@
 
 namespace OpenFeature\implementation\provider;
 
-use DateTime;
 use OpenFeature\interfaces\provider\ResolutionDetails as ResolutionDetailsInterface;
 use OpenFeature\interfaces\provider\ResolutionError;
 
@@ -18,9 +17,9 @@ public function __construct()
     }
 
     /**
-     * @param bool|string|int|float|DateTime|mixed[]|null $value
+     * @param bool|string|int|float|mixed[]|null $value
      */
-    public function withValue(bool | string | int | float | DateTime | array | null $value): ResolutionDetailsBuilder
+    public function withValue(bool | string | int | float | array | null $value): ResolutionDetailsBuilder
     {
         $this->details->setValue($value);