code style fixes

Author: d8vjork

src/Attributes/ResolveModel.php

@@ -80,7 +80,7 @@ public function getMorphModel(string $fromPropertyKey, array $properties, array
         }
 
         $morphMap = Relation::morphMap();
-        
+
         $modelModelClass = array_filter(
             array_map(
                 fn (string $morphType) => $morphMap[$morphType] ?? null,

src/Mapper.php

@@ -7,8 +7,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Pipeline\Pipeline;
 use Illuminate\Support\Collection;
-use OpenSoutheners\LaravelDataMapper\MappingValue;
-use OpenSoutheners\LaravelDataMapper\Enums\BuiltInType;
 use ReflectionClass;
 use ReflectionProperty;
 
@@ -19,21 +17,21 @@ final class Mapper
     protected ?string $dataClass = null;
 
     protected ?string $throughClass = null;
-    
+
     protected ?MappingValue $fromMappingValue = null;
-    
+
     protected ?string $property = null;
 
     protected array $propertyTypes = [];
-    
+
     protected bool $runningFromMapper = false;
 
     public function __construct(mixed $input)
     {
         if (is_array($input) && count($input) === 1) {
             $input = reset($input);
         }
-        
+
         if (is_object($input)) {
             $this->dataClass = get_class($input);
         }
@@ -74,7 +72,7 @@ protected function takeDataFrom(mixed $input): mixed
     public function through(string $class): static
     {
         $this->throughClass = $class;
-        
+
         return $this;
     }
 
@@ -96,7 +94,7 @@ public function to(?string $output = null)
 
         $mappingDataValue = new MappingValue(
             data: $this->data,
-            allMappingData: (!$this->runningFromMapper ? $this->fromMappingValue?->allMappingData : $this->data) ?? [],
+            allMappingData: (! $this->runningFromMapper ? $this->fromMappingValue?->allMappingData : $this->data) ?? [],
             types: $this->propertyTypes,
             objectClass: $output,
             collectClass: $this->throughClass,

src/Mappers/CollectionDataMapper.php

@@ -3,7 +3,6 @@
 namespace OpenSoutheners\LaravelDataMapper\Mappers;
 
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 use OpenSoutheners\LaravelDataMapper\MappingValue;
 use Symfony\Component\TypeInfo\Type;
@@ -32,7 +31,7 @@ public function resolve(MappingValue $mappingValue): void
     {
         if ($mappingValue->objectClass === EloquentCollection::class) {
             $mappingValue->data = $mappingValue->data->toBase();
-            
+
             return;
         }
 
@@ -41,15 +40,15 @@ public function resolve(MappingValue $mappingValue): void
             is_string($mappingValue->data) => Collection::make(explode(',', $mappingValue->data)),
             default => Collection::make($mappingValue->data),
         };
-        
+
         if ($mappingValue->preferredTypeClass) {
             $collection = $collection->map(fn ($value) => map($value)->to($mappingValue->preferredTypeClass));
         }
 
         // if ($mappingValue->preferredType->getBuiltinType() === Type::BUILTIN_TYPE_ARRAY) {
         //     $collection = $collection->all();
         // }
-        
+
         $mappingValue->data = $collection;
     }
 }

src/Mappers/DataMapper.php

@@ -16,15 +16,15 @@ abstract public function assert(MappingValue $mappingValue): bool;
      * Resolve mapper that runs once assert returns true.
      */
     abstract public function resolve(MappingValue $mappingValue): void;
-    
+
     public function __invoke(MappingValue $mappingValue, Closure $next)
     {
-        if (!$this->assert($mappingValue)) {
+        if (! $this->assert($mappingValue)) {
             return $next($mappingValue);
         }
-        
+
         $this->resolve($mappingValue);
-        
+
         return $next($mappingValue);
     }
 }

src/Mappers/ModelDataMapper.php

@@ -33,42 +33,42 @@ public function resolve(MappingValue $mappingValue): void
         if (is_array($mappingValue->data) && Arr::isAssoc($mappingValue->data)) {
             /** @var Model $modelInstance */
             $modelInstance = new $mappingValue->preferredTypeClass;
-            
+
             foreach ($mappingValue->data as $key => $value) {
                 if ($modelInstance->isRelation($key) && $modelInstance->$key() instanceof BelongsTo) {
                     $modelInstance->$key()->associate($value);
-                    
+
                     continue;
                 }
-                
+
                 if ($modelInstance->isRelation($key) && $modelInstance->$key() instanceof HasMany) {
                     $modelInstance->setRelation($key, map($value)->to(get_class($modelInstance->$key()->getModel())));
-                    
+
                     continue;
                 }
 
                 $modelInstance->fill([$key => $value]);
             }
-            
+
             $mappingValue->data = $modelInstance;
-            
+
             return;
         }
-        
+
         if (is_string($mappingValue->data) && str_contains($mappingValue->data, ',')) {
             $mappingValue->data = array_filter(explode(',', $mappingValue->data));
         }
-        
+
         if (count($mappingValue->types) <= 1) {
             $mappingValue->data = $this->resolveIntoModelInstance($mappingValue->data, $mappingValue->preferredTypeClass);
         }
-        
+
         if ($mappingValue->collectClass === Collection::class) {
             $mappingValue->data = $mappingValue->data instanceof DatabaseCollection
                 ? $mappingValue->data->toBase()
                 : Collection::make($mappingValue->data);
         }
-        
+
         // $resolveModelAttributeReflector = $mappingValue->property->getAttributes(ResolveModel::class);
 
         // /** @var \ReflectionAttribute<\OpenSoutheners\LaravelDataMapper\Attributes\ResolveModel>|null $resolveModelAttributeReflector */
@@ -128,7 +128,7 @@ public function resolve(MappingValue $mappingValue): void
         //             if (! is_null($valueB)) {
         //                 $lastNonValue = $valueB;
         //             }
-    
+
         //             return [$valueA, $valueB ?? $lastNonValue];
         //         },
         //         $data,

src/Mappers/ObjectDataMapper.php

@@ -3,7 +3,6 @@
 namespace OpenSoutheners\LaravelDataMapper\Mappers;
 
 use Illuminate\Contracts\Container\ContextualAttribute;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use OpenSoutheners\LaravelDataMapper\Attributes\NormaliseProperties;
@@ -44,7 +43,7 @@ public function assert(MappingValue $mappingValue): bool
     public function resolve(MappingValue $mappingValue): void
     {
         $class = new ReflectionClass($mappingValue->preferredTypeClass);
-        
+
         $data = [];
 
         $mappingData = is_string($mappingValue->data) ? json_decode($mappingValue->data, true) : $mappingValue->data;
@@ -59,7 +58,7 @@ public function resolve(MappingValue $mappingValue): void
             $value = $propertiesData[$key] ?? null;
 
             $type = app(PropertyInfoExtractor::class)->typeInfo($class->getName(), $key);
-            
+
             /** @var \Illuminate\Support\Collection<\ReflectionAttribute> $propertyAttributes */
             $propertyAttributes = Collection::make($property->getAttributes());
 
@@ -76,21 +75,21 @@ public function resolve(MappingValue $mappingValue): void
             if (is_null($value)) {
                 continue;
             }
-            
+
             $unwrappedType = app(PropertyInfoExtractor::class)->unwrapType($type);
-            
+
             if ($type instanceof Type\NullableType) {
                 $type = $type->getWrappedType();
             }
-            
+
             if ($type instanceof Type\CollectionType) {
                 $data[$key] = map($value)
                     ->through((string) $unwrappedType)
                     ->to($type->getCollectionValueType());
-                    
+
                 continue;
             }
-            
+
             $data[$key] = match (true) {
                 $type instanceof Type\ObjectType => map($value)->to((string) $type),
                 default => $value,
@@ -106,7 +105,7 @@ public function resolve(MappingValue $mappingValue): void
     protected function normalisePropertyKey(MappingValue $mappingValue, string $key): ?string
     {
         $class = new ReflectionClass($mappingValue->objectClass);
-        
+
         $normaliseProperty = count($class->getAttributes(NormaliseProperties::class)) > 0
             ?: (app('config')->get('data-mapper.normalise_properties') ?? true);
 

src/MappingValue.php

@@ -27,10 +27,10 @@ final class MappingValue
     public function __construct(
         public mixed $data,
         public readonly array $allMappingData,
-        
+
         public readonly ?string $objectClass = null,
         public readonly ?string $collectClass = null,
-        
+
         public readonly ?array $types = null,
     ) {
         $this->preferredType = $types ? (reset($types) ?? null) : null;

src/PropertyInfoExtractor.php

@@ -15,15 +15,15 @@ final class PropertyInfoExtractor
 
     public function __construct()
     {
-        $phpStanExtractor = new PhpStanExtractor();
-        $reflectionExtractor = new ReflectionExtractor();
-    
+        $phpStanExtractor = new PhpStanExtractor;
+        $reflectionExtractor = new ReflectionExtractor;
+
         $this->extractor = new Extractor(
             [$reflectionExtractor],
             [$phpStanExtractor, $reflectionExtractor],
         );
     }
-    
+
     public function typeInfo(string $class, string $property, array $context = []): ?Type
     {
         return $this->extractor->getType($class, $property, $context);
@@ -35,26 +35,26 @@ public function typeInfo(string $class, string $property, array $context = []):
     public function typeInfoFromClass(string $class, array $context = []): array
     {
         $classReflection = new ReflectionClass($class);
-        
+
         $classProperties = $classReflection->getProperties(ReflectionProperty::IS_PUBLIC);
-        
+
         $propertiesTypes = [];
-        
+
         foreach ($classProperties as $property) {
             $propertiesTypes[$property->getName()] = $this->extractor->getType($class, $property->getName(), $context);
         }
-        
+
         return $propertiesTypes;
     }
-    
+
     public function unwrapType(Type $type): Type
     {
         $builtinType = $type;
-        
+
         while (method_exists($builtinType, 'getWrappedType')) {
             $builtinType = $builtinType->getWrappedType();
         }
-        
+
         return $builtinType;
     }
 }

src/ServiceProvider.php

@@ -50,8 +50,8 @@ function ($dataClass, $parameters, $app) {
                 });
             }
         );
-        
-        $this->app->instance(PropertyInfoExtractor::class, new PropertyInfoExtractor());
+
+        $this->app->instance(PropertyInfoExtractor::class, new PropertyInfoExtractor);
         $this->app->alias(PropertyInfoExtractor::class, 'propertyInfo');
     }