refactor, tests

src/Config.php

@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Icefox\DTO;
-
-use Icefox\DTO\RuleFactory;
-use Illuminate\Support\Collection;
-use phpDocumentor\Reflection\PseudoTypes\Generic;
-
-class Config
-{
-    /**
-     * @param class-string $class
-    **/
-    public static function getCaster(string $class): ?callable
-    {
-        return config('dto.cast.' . $class, null);
-    }
-
-    /**
-     * @param class-string $class
-    **/
-    public static function getRules(string $class): ?callable
-    {
-        if ($userDefined = config('dto.rules.' . $class, null)) {
-            return $userDefined;
-        }
-        return match ($class) {
-            Collection::class => static::rulesIlluminateCollection(...),
-            default => null,
-        };
-    }
-
-
-    /**
-     * @return array<string,string[]>
-     */
-    private static function rulesIlluminateCollection(ParameterMeta $parameter, RuleFactory $factory): array
-    {
-        if (is_null($parameter->tag)) {
-            return [];
-        }
-
-        $type = $parameter->tag->getType();
-        if (!$type instanceof Generic) {
-            return [];
-        }
-
-        $subtypes = $type->getTypes();
-
-        if (count($subtypes) == 0) {
-            return ['' => ['array']];
-        }
-
-        $subtype = count($subtypes) == 1 ? $subtypes[0] : $subtypes[1];
-
-        return $factory->mergeRules(
-            ['' => ['array']],
-            $factory->getRulesFromDocBlock($subtype, '.*'),
-        );
-    }
-}

src/CustomHandlers.php

@@ -2,7 +2,7 @@
 
 namespace Icefox\DTO;
 
-use Icefox\DTO\RuleFactory;
+use Icefox\DTO\Factories\RuleFactory;
 use phpDocumentor\Reflection\PseudoTypes\Generic;
 
 class CustomHandlers
@@ -35,4 +35,3 @@ class CustomHandlers
         );
     }
 }
-

src/DataObject.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Icefox\DTO;
 
+use Icefox\DTO\Factories\DataObjectFactory;
 use Illuminate\Http\Request;
 
 trait DataObject

src/Factories/DataObjectFactory.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace Icefox\DTO;
+namespace Icefox\DTO\Factories;
 
 use Icefox\DTO\Attributes\FromInput;
 use Icefox\DTO\Attributes\FromRouteParameter;
-use Icefox\DTO\RuleFactory;
-use Icefox\DTO\ValueFactory;
+use Icefox\DTO\Factories\RuleFactory;
+use Icefox\DTO\Factories\ValueFactory;
+use Icefox\DTO\ReflectionHelper;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\App;

src/Factories/RuleFactory.php

@@ -2,14 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Icefox\DTO;
+namespace Icefox\DTO\Factories;
 
 use Icefox\DTO\Attributes\Flat;
 use Icefox\DTO\Attributes\Overwrite;
-use Icefox\DTO\Config;
 use Icefox\DTO\ParameterMeta;
 use Icefox\DTO\ReflectionHelper;
-use Icefox\DTO\RuleFactory;
+use Icefox\DTO\Factories\RuleFactory;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Rule;
@@ -107,7 +106,7 @@ final class RuleFactory
         }
 
         if ($type instanceof ReflectionNamedType && $name = $type->getName()) {
-            if ($globalRules = Config::getRules($name)) {
+            if ($globalRules =  config('dto.rules.' . $name, null)) {
                 foreach ($globalRules($parameter, $this) as $scopedPrefix => $values) {
                     $realPrefix = $prefix . $scopedPrefix;
                     $rules[$realPrefix] = array_merge($rules[$realPrefix] ?? [], $values);

src/Factories/ValueFactory.php

@@ -2,15 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Icefox\DTO;
+namespace Icefox\DTO\Factories;
 
 use Icefox\DTO\Attributes\CastWith;
 use Icefox\DTO\Attributes\Flat;
-use Icefox\DTO\Config;
 use Icefox\DTO\ReflectionHelper;
 use Illuminate\Support\Facades\App;
 use ReflectionNamedType;
-use phpDocumentor\Reflection\DocBlock\Tags\Param;
 use phpDocumentor\Reflection\PseudoTypes\Generic;
 use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\Types\AbstractList;
@@ -22,21 +20,6 @@ use phpDocumentor\Reflection\Types\Object_;
 
 class ValueFactory
 {
-    public static function constructObject(string $className, mixed $rawValue): object
-    {
-        if ($mapper = Config::getCaster($className)) {
-            return $mapper($rawValue);
-        }
-
-        // Plain values or numeric arrays are passed as a single parameter to the constructor
-        if (!is_array($rawValue) || array_key_exists(0, $rawValue)) {
-            return new $className($className);
-        }
-
-        // Associative arrays leverage Laravel service container
-        return App::makeWith($className, $rawValue);
-    }
-
     public static function resolveAnnotatedValue(Type $type, mixed $rawValue): mixed
     {
         if ($type instanceof Nullable) {
@@ -89,14 +72,18 @@ class ValueFactory
 
     public static function resolveDeclaredTypeValue(ReflectionNamedType $parameter, mixed $rawValue): mixed
     {
-        return match ($parameter->getName()) {
+        $type = $parameter->getName();
+        if (is_a($type, \BackedEnum::class, true)) {
+            return $type::from($rawValue);
+        }
+
+        return match ($type) {
             'string' => $rawValue,
             'bool' => boolval($rawValue),
             'int' => intval($rawValue),
             'float' => floatval($rawValue),
             'array' => $rawValue,
-            default => self::make($parameter->getName(), $rawValue),
-
+            default => self::make($type, $rawValue),
         };
     }
 
@@ -113,9 +100,9 @@ class ValueFactory
             $parameterArgs = empty($parameter->reflection->getAttributes(Flat::class)) ? ($input[$name] ?? null) : $input;
 
             if (is_null($parameterArgs)) {
-                if ($parameter->reflection->allowsNull()) {
-                    $arguments[$name] = null;
-                }
+                $arguments[$name] = $parameter->reflection->isDefaultValueAvailable()
+                    ? $parameter->reflection->getDefaultValue()
+                    : null;
                 continue;
             }
 
@@ -129,20 +116,22 @@ class ValueFactory
 
             $type = $parameter->tag?->getType();
             if (empty($parameterClass) && $type instanceof Object_) {
-                $parameterClass = $type->getFqsen();
+                $parameterClass = $type->getFqsen()?->__toString();
             }
+
             if (!empty($parameterClass) && $caster = config('dto.cast.' . $parameterClass, null)) {
                 $arguments[$name] = App::call($caster, ['data' => $parameterArgs]);
                 continue;
             }
 
-            if ($parameter->tag instanceof Param) {
+            if (!is_null($type)) {
                 $arguments[$name] = self::resolveAnnotatedValue($type, $parameterArgs);
                 continue;
             }
 
-            if ($parameter->reflection->getType() instanceof ReflectionNamedType) {
-                $arguments[$name] = self::resolveDeclaredTypeValue($parameter->reflection->getType(), $parameterArgs);
+            $reflectionType = $parameter->reflection->getType();
+            if ($reflectionType instanceof ReflectionNamedType) {
+                $arguments[$name] = self::resolveDeclaredTypeValue($reflectionType, $parameterArgs);
                 continue;
             }
 

src/ReflectionHelper.php

@@ -2,6 +2,7 @@
 
 namespace Icefox\DTO;
 
+use ReflectionNamedType;
 use ReflectionParameter;
 use phpDocumentor\Reflection\DocBlock\Tag;
 use phpDocumentor\Reflection\DocBlock\Tags\Param;
@@ -63,4 +64,17 @@ class ReflectionHelper
         return count($subtypes) > 1 ? $subtypes[1]->__toString() : $subtypes[0]->__toString();
     }
 
+    public static function isListType(ParameterMeta $parameter): bool
+    {
+        $reflectionType = $parameter->reflection->getType();
+        $namedType = $reflectionType instanceof ReflectionNamedType ? $reflectionType->getName() : null;
+        $annotatedType = $parameter->tag?->getType();
+        return
+         $parameter->reflection->isArray()
+            || in_array($namedType, config('dto.listTypes', []))
+            || in_array($annotatedType?->__toString(), config('dto.listTypes', []))
+            || $annotatedType instanceof AbstractList;
+
+    }
+
 }