feat: improve interigify

Author: wilcorrea

src/Core/Fake/Faker.php

@@ -18,6 +18,7 @@
 use Constructo\Support\Reflective\Factory\Target;
 use Constructo\Support\Reflective\Notation;
 use Constructo\Support\Set;
+use Constructo\Support\Value;
 use DateTime;
 use Faker\Factory;
 use Faker\Generator;
@@ -247,28 +248,9 @@ private function resolveParameters(array $parameters, Set $presets): Set
         $fromDefaultValue = $this->ignoreFromDefaultValue
             ? null
             : new FromDefaultValue($this->notation, $this->formatters, $this->locale);
-        $fromTypeAttributes = new FromTypeAttributes(
-            $this->notation,
-            $this->formatters,
-            $this->locale,
-            $this->ignoreFromDefaultValue
-        );
         foreach ($parameters as $parameter) {
             $field = $this->casedField($parameter);
-            $generated = (new FromDependency(
-                $this->notation,
-                $this->formatters,
-                $this->locale,
-                $this->ignoreFromDefaultValue
-            ))
-                ->then(new FromTypeDate($this->notation, $this->formatters, $this->locale))
-                ->then(new FromCollection($this->notation, $this->formatters, $this->locale))
-                ->then(new FromTypeBuiltin($this->notation, $this->formatters, $this->locale))
-                ->then($fromTypeAttributes)
-                ->then(new FromEnum($this->notation, $this->formatters, $this->locale))
-                ->then($fromDefaultValue)
-                ->then(new FromPreset($this->notation, $this->formatters, $this->locale))
-                ->resolve($parameter, $presets);
+            $generated = $this->generateValue($parameter, $presets, $fromDefaultValue);
 
             if ($generated === null) {
                 continue;
@@ -288,4 +270,35 @@ private function locale(?string $locale): string
         };
         return $locale ?? $fallback();
     }
+
+    /**
+     * @throws ReflectionException
+     */
+    private function generateValue(
+        ReflectionParameter $parameter,
+        Set $presets,
+        ?FromDefaultValue $fromDefaultValue = null,
+    ): ?Value {
+        return (new FromDependency(
+            $this->notation,
+            $this->formatters,
+            $this->locale,
+            $this->ignoreFromDefaultValue
+        ))
+            ->then(new FromTypeDate($this->notation, $this->formatters, $this->locale))
+            ->then(new FromCollection($this->notation, $this->formatters, $this->locale))
+            ->then(new FromTypeBuiltin($this->notation, $this->formatters, $this->locale))
+            ->then(
+                new FromTypeAttributes(
+                    $this->notation,
+                    $this->formatters,
+                    $this->locale,
+                    $this->ignoreFromDefaultValue
+                )
+            )
+            ->then(new FromEnum($this->notation, $this->formatters, $this->locale))
+            ->then($fromDefaultValue)
+            ->then(new FromPreset($this->notation, $this->formatters, $this->locale))
+            ->resolve($parameter, $presets);
+    }
 }

src/_/cast.php

@@ -6,6 +6,18 @@
 
 use Stringable;
 
+use function function_exists;
+use function is_array;
+use function is_bool;
+use function is_float;
+use function is_int;
+use function is_numeric;
+use function is_object;
+use function is_scalar;
+use function is_string;
+use function method_exists;
+use function sprintf;
+
 if (! function_exists(__NAMESPACE__ . '\arrayify')) {
     /**
      * @template T of array-key
@@ -15,7 +27,9 @@
      */
     function arrayify(mixed $value, array $default = []): array
     {
-        return is_array($value) ? $value : $default;
+        return is_array($value)
+            ? $value
+            : $default;
     }
 }
 
@@ -33,7 +47,9 @@ function mapify(mixed $data, array $default = []): array
         };
         $mapping = [];
         foreach ($data as $key => $datum) {
-            $key = is_string($key) ? $key : sprintf('key_%s', $key);
+            $key = is_string($key)
+                ? $key
+                : sprintf('key_%s', $key);
             $mapping[$key] = $datum;
         }
         return $mapping;
@@ -56,22 +72,32 @@ function stringify(mixed $value, string $default = ''): string
 if (! function_exists(__NAMESPACE__ . '\integerify')) {
     function integerify(mixed $value, int $default = 0): int
     {
-        $value = is_numeric($value) ? (int) $value : $value;
-        return is_int($value) ? $value : $default;
+        return match (true) {
+            is_int($value) => $value,
+            is_numeric($value) => (int) $value,
+            is_bool($value) => (int) $value,
+            default => $default,
+        };
     }
 }
 
 if (! function_exists(__NAMESPACE__ . '\floatify')) {
     function floatify(mixed $value, float $default = 0.0): float
     {
-        $value = is_numeric($value) ? (float) $value : $value;
-        return is_float($value) ? $value : $default;
+        $value = is_numeric($value)
+            ? (float) $value
+            : $value;
+        return is_float($value)
+            ? $value
+            : $default;
     }
 }
 
 if (! function_exists(__NAMESPACE__ . '\boolify')) {
     function boolify(mixed $value, bool $default = false): bool
     {
-        return is_bool($value) ? $value : $default;
+        return is_bool($value)
+            ? $value
+            : $default;
     }
 }