patch

AnourValar · Sep 23, 2024 · 9d5f848 · 9d5f848
1 parent 8a70133
commit 9d5f848
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 2 deletions.
diff --git a/src/Mapper.php b/src/Mapper.php
@@ -70,7 +70,7 @@ public static function from(array|object $data): static
                     $value = $rule['mutate']($value);
                 }
 
-                if (isset($rule['array_of'])) {
+                if (isset($rule['array_of']) && isset($value)) {
                     $arrayOf = $rule['array_of'];
                     foreach ($value as &$item) {
                         if ($item instanceof $arrayOf) {
@@ -101,7 +101,15 @@ public static function from(array|object $data): static
      */
     public function toArray(): array
     {
-        return $this->resolveToArray((array) $this, static::getRules(new \ReflectionClass(static::class)));
+        $result = $this->resolveToArray((array) $this, static::getRules(new \ReflectionClass(static::class)));
+
+        foreach ((new \ReflectionClass(static::class))->getAttributes() as $attribute) {
+            if ($attribute->getName() == \AnourValar\LaravelAtom\Mapper\Jsonb::class) {
+                $result = $this->sort($result);
+            }
+        }
+
+        return $result;
     }
 
     /**
@@ -210,6 +218,11 @@ public function set(Model $model, string $key, mixed $value, array $attributes)
 
                 return json_encode(($this->class)::from($value)->toArray(), JSON_UNESCAPED_UNICODE);
             }
+
+            public function serialize(Model $model, string $key, mixed $value, array $attributes): array
+            {
+                return $value->toArray();
+            }
         };
     }
 
@@ -342,4 +355,33 @@ protected static function getArg(\ReflectionAttribute $attribute)
 
         return array_shift($args);
     }
+
+    /**
+     * @param mixed $value
+     * @return mixed
+     */
+    protected function sort(mixed $value): mixed
+    {
+        if (is_array($value) && ! array_is_list($value)) {
+            uksort($value, function ($a, $b) {
+                $strlenA = mb_strlen($a);
+                $strlenB = mb_strlen($b);
+
+                if ($strlenA == $strlenB) {
+                    return $a <=> $b;
+                }
+
+                return $strlenA <=> $strlenB;
+            });
+        }
+
+        if (is_array($value)) {
+            foreach ($value as &$item) {
+                $item = $this->sort($item);
+            }
+            unset($item);
+        }
+
+        return $value;
+    }
 }
diff --git a/src/Mapper/Jsonb.php b/src/Mapper/Jsonb.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace AnourValar\LaravelAtom\Mapper;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+class Jsonb
+{
+}
diff --git a/tests/MapperTest.php b/tests/MapperTest.php
@@ -239,5 +239,8 @@ public function test_model()
         $post->forceFill(['data' => ['a' => 1, 'b' => 2, 'c' => 3, 'd' => '4']]);
         $this->assertInstanceOf(SimpleMapper::class, $post->data);
         $this->assertSame(['a' => '1', 'b' => 2, 'c' => '3', 'd' => 4], $post->data->toArray());
+
+        $this->assertSame(['data' => ['a' => '1', 'b' => 2, 'c' => '3', 'd' => 4]], $post->toArray());
+        $this->assertSame(['data' => json_encode(['a' => '1', 'b' => 2, 'c' => '3', 'd' => 4])], $post->getAttributes());
     }
 }
diff --git a/tests/Mappers/SimpleMapper.php b/tests/Mappers/SimpleMapper.php
@@ -5,7 +5,9 @@
 use AnourValar\LaravelAtom\Mapper;
 use AnourValar\LaravelAtom\Mapper\Mapping;
 use AnourValar\LaravelAtom\Mapper\MappingSnakeCase;
+use AnourValar\LaravelAtom\Mapper\Jsonb;
 
+#[Jsonb]
 class SimpleMapper extends Mapper
 {
     public function __construct(