wip

Author: d8vjork

CHANGELOG.md

@@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Attribute `OpenSoutheners\LaravelDto\Attributes\Inject` to inject container stuff
 - Attribute `OpenSoutheners\LaravelDto\Attributes\Authenticated` that uses base `Illuminate\Container\Attributes\Authenticated` to inject current authenticated user
 - Ability to register custom mappers (extending package functionality)
+- ObjectMapper now extracts type info from generics inside collections typed properties [#1]
+
+### Changed
+
+- Full refactor [#7]
 
 ### Removed
 

composer.json

@@ -34,6 +34,7 @@
     },
     "require-dev": {
         "larastan/larastan": "^3.0",
+        "laravel/pint": "^1.22",
         "orchestra/testbench": "^9.0 || ^10.0",
         "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^11.0"

config/data-transfer-objects.php

@@ -4,7 +4,7 @@
 
     /**
      * Normalise data transfer objects property names.
-     * 
+     *
      * For example: user_id (sent) => user (DTO) or is_published (sent) => isPublished (DTO)
      */
     'normalise_properties' => true,
@@ -14,13 +14,13 @@
      * are passed to the command.
      */
     'types_generation' => [
-        
+
         'output' => null,
-        
+
         'source' => null,
 
         'filename' => null,
-        
+
         'declarations' => false,
 
     ],

src/Attributes/AsType.php

@@ -9,6 +9,6 @@ class AsType
 {
     public function __construct(public string $typeName)
     {
-        // 
+        //
     }
-}
+}

src/Attributes/Authenticated.php

@@ -8,5 +8,5 @@
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Authenticated extends BaseAttribute
 {
-    // 
+    //
 }

src/Attributes/Inject.php

@@ -11,14 +11,12 @@ class Inject implements ContextualAttribute
 {
     public function __construct(public string $value)
     {
-        // 
+        //
     }
-    
+
     /**
      * Resolve the currently authenticated user.
      *
-     * @param  self  $attribute
-     * @param  \Illuminate\Contracts\Container\Container  $container
      * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
     public static function resolve(self $attribute, Container $container)

src/Attributes/ModelWith.php

@@ -9,6 +9,6 @@ class ModelWith
 {
     public function __construct(public string|array $relations, public ?string $type = null)
     {
-        // 
+        //
     }
 }

src/Attributes/ResolveModel.php

@@ -13,7 +13,7 @@ final class ResolveModel
 {
     public function __construct(
         public string|array|null $keyFromRouteParam = null,
-        public string|null $morphTypeFrom = null
+        public ?string $morphTypeFrom = null
     ) {
         //
     }
@@ -54,7 +54,7 @@ public function getBindingAttribute(string $key, string $type, array $with)
 
     protected function resolveBinding(string $model, mixed $value, mixed $field = null, array $with = [])
     {
-        $modelInstance = new $model();
+        $modelInstance = new $model;
 
         return $modelInstance->resolveRouteBindingQuery($modelInstance, $value, $field)
             ->with($with);
@@ -66,7 +66,7 @@ public function getMorphPropertyTypeKey(string $fromPropertyKey): string
             return Str::snake($this->morphTypeFrom);
         }
 
-        return static::getDefaultMorphKeyFrom($fromPropertyKey);
+        return self::getDefaultMorphKeyFrom($fromPropertyKey);
     }
 
     public function getMorphModel(string $fromPropertyKey, array $properties, array $propertyTypeClasses = []): array
@@ -90,7 +90,7 @@ public function getMorphModel(string $fromPropertyKey, array $properties, array
         if (count($modelModelClass) === 0 && count($propertyTypeClasses) > 0) {
             $modelModelClass = array_filter(
                 $propertyTypeClasses,
-                fn (string $class) => in_array((new $class())->getMorphClass(), $types)
+                fn (string $class) => in_array((new $class)->getMorphClass(), $types)
             );
 
             $modelModelClass = reset($modelModelClass);

src/Attributes/Validate.php

@@ -9,6 +9,6 @@ class Validate
 {
     public function __construct(public string $value)
     {
-        // 
+        //
     }
 }

src/Attributes/WithDefaultValue.php

@@ -9,6 +9,6 @@ class WithDefaultValue
 {
     public function __construct(public mixed $value)
     {
-        // 
+        //
     }
-}
+}

src/Commands/DtoMakeCommand.php

@@ -4,9 +4,9 @@
 
 use Illuminate\Console\GeneratorCommand;
 use Illuminate\Support\Str;
+use OpenSoutheners\ExtendedLaravel\Console\Concerns\OpensGeneratedFiles;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
-use OpenSoutheners\ExtendedLaravel\Console\Concerns\OpensGeneratedFiles;
 
 #[AsCommand(name: 'make:dto')]
 class DtoMakeCommand extends GeneratorCommand
@@ -138,7 +138,7 @@ protected function getProperties(string $requestClass)
             return '';
         }
 
-        $requestInstance = new $requestClass();
+        $requestInstance = new $requestClass;
         $properties = '';
 
         $requestRules = $requestInstance->rules();

src/Contracts/DataTransferObject.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace OpenSoutheners\LaravelDto\Contracts;
+
+/**
+ * This solely act as a tag for the class to be resolved by the Laravel DI (Container).
+ *
+ * So in case is used directly in a controller method this will map the request
+ * with route data onto the object class constructor properties.
+ */
+interface RouteTransferableObject
+{
+    //
+}

src/Contracts/RouteTransferableObject.php

@@ -11,20 +11,20 @@
 final class MappingValue
 {
     public readonly ?Type $preferredType;
-    
+
     /**
      * @var class-string|null
      */
     public readonly ?string $preferredTypeClass;
-    
+
     /**
      * @var Collection<\ReflectionAttribute>
      */
     public readonly Collection $attributes;
-    
+
     /**
-     * @param class-string|null $objectClass
-     * @param array<Type>|null $types
+     * @param  class-string|null  $objectClass
+     * @param  array<Type>|null  $types
      */
     public function __construct(
         public readonly mixed $data,
@@ -35,9 +35,9 @@ public function __construct(
         public readonly ?ReflectionProperty $property = null,
     ) {
         $this->preferredType = $types ? (reset($types) ?? null) : null;
-        
+
         $this->preferredTypeClass = $this->preferredType ? ($this->preferredType->getClassName() ?: $objectClass) : $objectClass;
-        
+
         $this->attributes = Collection::make($class ? $class->getAttributes() : []);
     }
 }

src/DataTransferObjects/MappingValue.php

@@ -7,42 +7,42 @@ enum BuiltInType: string
     case Object = 'object';
     case Array = 'array';
     case Iterable = 'iterable';
-    
+
     case Integer = 'int';
     case Float = 'float';
-    
+
     case String = 'string';
-    
+
     case Boolean = 'bool';
     case True = 'true';
     case False = 'false';
-    
+
     case Null = 'null';
     case Never = 'never';
     case Void = 'void';
-    
+
     case Mixed = 'mixed';
-    
+
     case Callable = 'callable';
     case Resource = 'resource';
-    
+
     public static function guess($value): static
     {
         return self::tryFrom(gettype($value)) ?? self::Mixed;
     }
-    
+
     public function assert(...$types): bool
     {
         $loops = 0;
         $truth = false;
-        
+
         while ($truth === false && count($types) > $loops) {
             $type = $types[$loops];
-            
+
             $truth = $type instanceof static ? $type === $this : $type === $this->value;
             $loops++;
         }
-        
+
         return $truth;
     }
 }