Return null for mapOf (#12)

Co-authored-by: david_smith <[email protected]>
zero-to-prod · Nov 8, 2024 · 079464e · 079464e
1 parent 7af0a86
commit 079464e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/DataModelHelper.php b/src/DataModelHelper.php
@@ -50,6 +50,10 @@ trait DataModelHelper
      */
     public static function mapOf(mixed $value, array $context, ?ReflectionAttribute $Attribute, ReflectionProperty $Property)
     {
+        if (!$value) {
+            return null;
+        }
+
         $args = $Attribute?->getArguments()[0];
         $value = isset($args['coerce']) && !isset($value[0]) ? [$value] : $value;
 
@@ -122,7 +126,7 @@ public static function pregReplace(mixed $value, array $context, ?ReflectionAttr
      */
     public static function isUrl(mixed $value, array $context, ?ReflectionAttribute $Attribute, ReflectionProperty $Property): ?string
     {
-        if(!$value){
+        if (!$value) {
             return null;
         }
 

diff --git a/tests/Unit/MapOf/Array/User.php b/tests/Unit/MapOf/Array/User.php
@@ -16,13 +16,13 @@ class User
         'cast' => [self::class, 'mapOf'],
         'type' => Alias::class,
     ])]
-    public array $Aliases;
+    public ?array $Aliases;
 
     /** @var Alias[][] $AliasesNested */
     #[Describe([
         'cast' => [self::class, 'mapOf'],
         'type' => Alias::class,
         'level' => 2,
     ])]
-    public array $AliasesNested;
+    public ?array $AliasesNested;
 }
diff --git a/tests/Unit/MapOf/KeyBy/User.php b/tests/Unit/MapOf/KeyBy/User.php
@@ -17,7 +17,7 @@ class User
         'type' => Alias::class,
         'key_by' => 'id'
     ])]
-    public array $Aliases;
+    public ?array $Aliases;
 
     /** @var Alias[][] $AliasesNested */
     #[Describe([
@@ -26,5 +26,5 @@ class User
         'level' => 2,
         'key_by' => 'id'
     ])]
-    public array $AliasesNested;
+    public ?array $AliasesNested;
 }
diff --git a/tests/Unit/MapOf/MapVia/User.php b/tests/Unit/MapOf/MapVia/User.php
@@ -26,5 +26,5 @@ class User
         'map_via' => 'mapper',
         'level' => 2,
     ])]
-    public Collection $AliasesNested;
+    public ?Collection $AliasesNested;
 }