fix tests and segmentation fault (infinite loop on collection map)

Author: d8vjork

src/Mapper.php

@@ -7,11 +7,14 @@
 use Illuminate\Http\Request;
 use Illuminate\Pipeline\Pipeline;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Traits\Conditionable;
 use ReflectionClass;
 use ReflectionProperty;
 
 final class Mapper
 {
+    use Conditionable;
+    
     protected mixed $data;
 
     protected ?string $dataClass = null;

src/Mappers/CollectionDataMapper.php

@@ -5,7 +5,6 @@
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Collection;
 use OpenSoutheners\LaravelDataMapper\MappingValue;
-use Symfony\Component\TypeInfo\Type;
 
 use function OpenSoutheners\ExtendedPhp\Strings\is_json_structure;
 use function OpenSoutheners\LaravelDataMapper\map;
@@ -17,11 +16,11 @@ final class CollectionDataMapper extends DataMapper
      */
     public function assert(MappingValue $mappingValue): bool
     {
-        return ($mappingValue->collectClass === Collection::class && is_array($mappingValue->data))
+        return $mappingValue->collectClass === 'array'
+            || ($mappingValue->collectClass === Collection::class && is_array($mappingValue->data))
             || ($mappingValue->collectClass === Collection::class && is_string($mappingValue->data) && str_contains($mappingValue->data, ','))
-            || $mappingValue->preferredType instanceof Type\CollectionType
-            || $mappingValue->preferredTypeClass === Collection::class
-            || $mappingValue->preferredTypeClass === EloquentCollection::class;
+            || $mappingValue->objectClass === Collection::class
+            || $mappingValue->objectClass === EloquentCollection::class;
     }
 
     /**
@@ -40,14 +39,18 @@ 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));
+        
+        $collection = $collection->filter();
+        
+        if ($mappingValue->collectClass === 'array') {
+            $mappingValue->data = $collection->all();
+            
+            return;
         }
 
-        // if ($mappingValue->preferredType->getBuiltinType() === Type::BUILTIN_TYPE_ARRAY) {
-        //     $collection = $collection->all();
-        // }
+        if ($mappingValue->objectClass && $mappingValue->objectClass !== Collection::class) {
+            $collection = $collection->map(fn ($value) => map($value)->to($mappingValue->objectClass));
+        }
 
         $mappingValue->data = $collection;
     }

src/Mappers/ObjectDataMapper.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use OpenSoutheners\LaravelDataMapper\Attributes\NormaliseProperties;
+use OpenSoutheners\LaravelDataMapper\Mapper;
 use OpenSoutheners\LaravelDataMapper\MappingValue;
 use OpenSoutheners\LaravelDataMapper\PropertyInfoExtractor;
 use ReflectionAttribute;
@@ -83,9 +84,11 @@ public function resolve(MappingValue $mappingValue): void
             }
 
             if ($type instanceof Type\CollectionType) {
+                $collectionValueType = $type->getCollectionValueType();
+                
                 $data[$key] = map($value)
                     ->through((string) $unwrappedType)
-                    ->to($type->getCollectionValueType());
+                    ->to((string) $collectionValueType);
 
                 continue;
             }

tests/Unit/DataTransferObjectTest.php

@@ -14,7 +14,7 @@
 
 class DataTransferObjectTest extends TestCase
 {
-    public function test_data_transfer_object_from_array()
+    public function test_object_as_data_transfer_object_from_array()
     {
         $data = map([
             'title' => 'Hello world',

workbench/app/DataTransferObjects/CreatePostData.php

@@ -20,7 +20,7 @@ class CreatePostData implements RouteTransferableObject
      */
     public function __construct(
         public string $title,
-        public ?array $tags,
+        public ?array $tags = null,
         public PostStatus $postStatus,
         public ?Post $post = null,
         public array|string|null $country = null,
@@ -33,7 +33,9 @@ public function __construct(
         public ?Collection $dates = null,
         $authorEmail = null
     ) {
-        $this->tags ??= ['generic', 'post'];
+        if (count($this->tags) === 0) {
+            $this->tags = ['generic', 'post'];
+        }
 
         $this->authorEmail = $authorEmail;
     }