Merge pull request #7 from Shureban/v1.1.0

Work with simple objects

Author: Shureban

README.md

@@ -92,7 +92,7 @@ Below you will see cases which you can use for mapping data into your object
 
 - `CustomClass`
 - `Enum`
-- `EloquentModel`
+- `Eloquent`
 
 ### Array of types
 

composer.json

@@ -17,7 +17,7 @@
         }
     ],
     "minimum-stability": "dev",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "autoload": {
         "psr-4": {
             "Shureban\\LaravelObjectMapper\\": "src/"

config/object_mapper.php

@@ -7,8 +7,8 @@
 use Shureban\LaravelObjectMapper\Types\BoxTypes\CollectionType;
 use Shureban\LaravelObjectMapper\Types\BoxTypes\DateTimeType;
 use Shureban\LaravelObjectMapper\Types\Custom\CustomType;
+use Shureban\LaravelObjectMapper\Types\Custom\EloquentType;
 use Shureban\LaravelObjectMapper\Types\Custom\EnumType;
-use Shureban\LaravelObjectMapper\Types\Custom\ModelType;
 use Shureban\LaravelObjectMapper\Types\SimpleTypes\ArrayType;
 use Shureban\LaravelObjectMapper\Types\SimpleTypes\BoolType;
 use Shureban\LaravelObjectMapper\Types\SimpleTypes\FloatType;
@@ -40,9 +40,9 @@
             'Collection'         => CollectionType::class,
         ],
         'other'  => [
-            'custom' => CustomType::class,
-            'enum'   => EnumType::class,
-            'model'  => ModelType::class,
+            'custom'   => CustomType::class,
+            'enum'     => EnumType::class,
+            'eloquent' => EloquentType::class,
         ],
     ],
 ];

src/ObjectMapper.php

@@ -92,12 +92,14 @@ private function mapData(array $data, string|array|FormRequest $defaultData): ob
     }
 
     /**
-     * @param array $data
+     * @param array|object $data
      *
      * @return mixed
      */
-    public function mapFromArray(array $data): object
+    public function mapFromArray(array|object $data): object
     {
+        $data = (array)$data;
+
         return $this->mapData($data, $data);
     }
 

src/Types/ArrayOfType.php

@@ -32,8 +32,9 @@ public function getDefaultValue(): array
      */
     public function convert(mixed $value): array
     {
-        return array_map(fn(mixed $nestedValue) => $this->nestedLevel === 1
+        return collect($value)->map(fn(mixed $nestedValue) => $this->nestedLevel === 1
             ? $this->type->convert($nestedValue)
-            : (new static($this->type, $this->nestedLevel - 1))->convert($nestedValue), $value);
+            : (new static($this->type, $this->nestedLevel - 1))->convert($nestedValue)
+        )->toArray();
     }
 }

src/Types/Custom/CustomType.php

@@ -28,7 +28,7 @@ public function convert(mixed $value): object
         $constructor      = $reflection->getConstructor();
         $emptyConstructor = !is_null($constructor) && $constructor->getNumberOfParameters() === 0;
 
-        if (is_null($constructor) || $emptyConstructor || is_array($value)) {
+        if (is_null($constructor) || $emptyConstructor || is_array($value) || is_object($value)) {
             return (new ObjectMapper(new $this->classNamespace()))->mapFromArray($value);
         }
 

src/Types/Custom/ModelType.php renamed to src/Types/Custom/EloquentType.php

@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Shureban\LaravelObjectMapper\Types\SimpleTypes\ObjectType;
 
-class ModelType extends ObjectType
+class EloquentType extends ObjectType
 {
     private string $modelNamespace;
 

src/Types/CustomTypeFactory.php

@@ -24,7 +24,7 @@ public static function make(string $typeName): ?Type
         }
 
         if (is_subclass_of($typeName, Model::class)) {
-            $modelType = config('object_mapper.types.other.model');
+            $modelType = config('object_mapper.types.other.eloquent');
 
             return !is_null($modelType) ? new $modelType($typeName) : null;
         }

tests/Unit/RealCasesTest.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Shureban\LaravelObjectMapper\Tests\Unit;
+
+use Shureban\LaravelObjectMapper\ObjectMapper;
+use Shureban\LaravelObjectMapper\Tests\Unit\Structs\RealCases\Exld001ArchiveClass;
+use Tests\TestCase;
+
+class RealCasesTest extends TestCase
+{
+    public function test_JsonObject()
+    {
+        $json = '{"data":{"id":"23e4036d-cccb-4289-84a2-45ac47a03606","bucket":{"id":"94223aaa-fb1f-427c-aed6-0bf6e8939252","size":8067726,"resources":18,"content_objects":0,"content_size":0,"video_objects":0,"video_size":0,"audio_objects":0,"audio_size":0,"archive_objects":18,"archive_size":8067726,"document_objects":0,"document_size":0,"name":"Hintz, Spinka and Shanahan","description":"Organization bucket: Hintz, Spinka and Shanahan","created_at":1668256624,"updated_at":1669915052},"size":448207,"width":null,"height":null,"duration":null,"content_type":"archive","object_type":"file","url":"https:\/\/cs002.ote.exldservice.com\/archives\/94223aaa-fb1f-427c-aed6-0bf6e8939252\/archive\/23e4036d-cccb-4289-84a2-45ac47a03606\/yLskNckJ1eZExYjBmVIMuXTvPXcL2DqbJsute8YI.zip","name":"phpR80fOK","ext":"zip","labels":null,"mime_type":"application\/zip","file_map":{"files":[{"name":"index.html","size":15990,"mime_type":"text\/html","extension":"html"}],"directories":{"images":{"files":[{"name":"favicon-16x16.png","size":757,"mime_type":"image\/png","extension":"png"},{"name":"favicon.ico","size":15406,"mime_type":"image\/vnd.microsoft.icon","extension":"ico"},{"name":".DS_Store","size":6148,"mime_type":"application\/octet-stream","extension":"DS_Store"},{"name":"android-chrome-192x192.png","size":46331,"mime_type":"image\/png","extension":"png"},{"name":"apple-touch-icon.png","size":41345,"mime_type":"image\/png","extension":"png"},{"name":"ring.png","size":13447,"mime_type":"image\/png","extension":"png"},{"name":"android-chrome-512x512.png","size":259752,"mime_type":"image\/png","extension":"png"},{"name":"favicon-32x32.png","size":1977,"mime_type":"image\/png","extension":"png"},{"name":"bg.png","size":72488,"mime_type":"image\/png","extension":"png"}],"directories":[]},"__MACOSX":{"files":[{"name":"._index.html","size":176,"mime_type":"application\/octet-stream","extension":"html"}],"directories":{"images":{"files":[{"name":"._favicon-16x16.png","size":212,"mime_type":"application\/octet-stream","extension":"png"},{"name":"._favicon.ico","size":212,"mime_type":"application\/octet-stream","extension":"ico"},{"name":"._.DS_Store","size":120,"mime_type":"application\/octet-stream","extension":"DS_Store"},{"name":"._android-chrome-192x192.png","size":212,"mime_type":"application\/octet-stream","extension":"png"},{"name":"._apple-touch-icon.png","size":212,"mime_type":"application\/octet-stream","extension":"png"},{"name":"._ring.png","size":331,"mime_type":"application\/octet-stream","extension":"png"},{"name":"._android-chrome-512x512.png","size":212,"mime_type":"application\/octet-stream","extension":"png"},{"name":"._favicon-32x32.png","size":212,"mime_type":"application\/octet-stream","extension":"png"}],"directories":[]}}}}},"created_at":1669915052,"updated_at":1669915052}}';
+        $json = json_decode($json);
+
+        $this->assertEquals("23e4036d-cccb-4289-84a2-45ac47a03606", (new ObjectMapper(new Exld001ArchiveClass()))->mapFromArray((array)$json->data)->id);
+    }
+}

tests/Unit/Structs/RealCases/Exld001Class.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Shureban\LaravelObjectMapper\Tests\Unit\Structs\RealCases;
+
+class Exld001FileClass
+{
+    public string $id;
+    public string $url;
+}
+
+class Exld001ArchiveClass extends Exld001FileClass
+{
+    public Exld001BucketClass         $bucket;
+    public Exld001ArchiveFileMapClass $file_map;
+}
+
+class Exld001BucketClass
+{
+    public string $id;
+    public int    $size;
+}
+
+class Exld001ArchiveFileMapClass
+{
+    /** @var Exld001ArchiveFileClass[] */
+    public array $files = [];
+    /** @var Exld001ArchiveFileMapClass[] */
+    public array $directories = [];
+}
+
+class Exld001ArchiveFileClass
+{
+    public string $name;
+    public float  $size;
+    public string $mime_type;
+    public string $extension;
+}