apply code review suggestions

Author: michalsn

system/Entity/Entity.php

@@ -465,15 +465,15 @@ private function normalizeValue(mixed $data): mixed
                 ];
             } elseif ($data instanceof JsonSerializable) {
                 $objectData = $data->jsonSerialize();
+            } elseif (method_exists($data, 'toArray')) {
+                $objectData = $data->toArray();
             } elseif ($data instanceof Traversable) {
                 $objectData = iterator_to_array($data);
             } elseif ($data instanceof DateTimeInterface) {
                 return [
                     '__class'    => $data::class,
                     '__datetime' => $data->format(DATE_RFC3339_EXTENDED),
                 ];
-            } elseif (method_exists($data, 'toArray')) {
-                $objectData = $data->toArray();
             } else {
                 $objectData = get_object_vars($data);
 

tests/_support/Enum/JsonSerializableStateUnitEnum.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Enum;
+
+use JsonSerializable;
+
+enum JsonSerializableStateUnitEnum implements JsonSerializable
+{
+    case DRAFT;
+    case PUBLISHED;
+
+    public function jsonSerialize(): mixed
+    {
+        return ['json' => $this->name];
+    }
+}

tests/_support/Enum/StateUnitEnum.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Enum;
+
+enum StateUnitEnum
+{
+    case DRAFT;
+    case PUBLISHED;
+
+    public function toArray(): array
+    {
+        return self::cases();
+    }
+}

tests/system/Entity/EntityTest.php

@@ -34,8 +34,10 @@
 use Tests\Support\Entity\Cast\CastPassParameters;
 use Tests\Support\Entity\Cast\NotExtendsBaseCast;
 use Tests\Support\Enum\ColorEnum;
+use Tests\Support\Enum\JsonSerializableStateUnitEnum;
 use Tests\Support\Enum\RoleEnum;
 use Tests\Support\Enum\StateEnum;
+use Tests\Support\Enum\StateUnitEnum;
 use Tests\Support\Enum\StatusEnum;
 use Tests\Support\SomeEntity;
 
@@ -1049,7 +1051,7 @@ public function testCastEnumSetWithUnitEnumObject(): void
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/10136
      */
-    public function testInjectRawDataWithEnumThatHasToArrayMethod(): void
+    public function testInjectRawDataWithBackedEnumThatHasToArrayMethod(): void
     {
         $entity = new class () extends Entity {};
 
@@ -1059,6 +1061,32 @@ public function testInjectRawDataWithEnumThatHasToArrayMethod(): void
         $this->assertFalse($entity->hasChanged('state'));
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/10136
+     */
+    public function testInjectRawDataWithUnitEnumThatHasToArrayMethod(): void
+    {
+        $entity = new class () extends Entity {};
+
+        $entity->injectRawData(['state' => StateUnitEnum::DRAFT]);
+
+        $this->assertSame(StateUnitEnum::DRAFT, $entity->toRawArray()['state']);
+        $this->assertFalse($entity->hasChanged('state'));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/10136
+     */
+    public function testInjectRawDataWithUnitEnumThatImplementsJsonSerializable(): void
+    {
+        $entity = new class () extends Entity {};
+
+        $entity->injectRawData(['state' => JsonSerializableStateUnitEnum::DRAFT]);
+
+        $this->assertSame(JsonSerializableStateUnitEnum::DRAFT, $entity->toRawArray()['state']);
+        $this->assertFalse($entity->hasChanged('state'));
+    }
+
     public function testAsArray(): void
     {
         $entity = $this->getEntity();
@@ -1989,6 +2017,41 @@ public function jsonSerialize(): mixed
         $this->assertTrue($entity->hasChanged('data'));
     }
 
+    public function testHasChangedPrefersJsonSerializableOverToArray(): void
+    {
+        $entity = new class () extends Entity {
+            protected $attributes = [
+                'data' => null,
+            ];
+        };
+
+        $entity->data = new class ('original') implements JsonSerializable {
+            public function __construct(private string $value)
+            {
+            }
+
+            public function jsonSerialize(): mixed
+            {
+                return ['json' => $this->value];
+            }
+
+            public function setValue(string $value): void
+            {
+                $this->value = $value;
+            }
+
+            public function toArray(): array
+            {
+                return ['array' => 'same'];
+            }
+        };
+        $entity->syncOriginal();
+
+        $entity->data->setValue('modified');
+
+        $this->assertTrue($entity->hasChanged('data'));
+    }
+
     public function testHasChangedDoesNotDetectUnchangedObject(): void
     {
         $entity = new class () extends Entity {
@@ -2292,6 +2355,48 @@ public function toArray(): array
         $this->assertTrue($entity->hasChanged('custom'));
     }
 
+    public function testHasChangedPrefersToArrayOverTraversable(): void
+    {
+        $entity = new class () extends Entity {
+            protected $attributes = [
+                'items' => null,
+            ];
+        };
+
+        $entity->items = new class (['iterator' => 'original']) extends ArrayObject {
+            public function toArray(): array
+            {
+                return ['array' => 'same'];
+            }
+        };
+        $entity->syncOriginal();
+
+        $entity->items->exchangeArray(['iterator' => 'modified']);
+
+        $this->assertFalse($entity->hasChanged('items'));
+    }
+
+    public function testHasChangedPrefersToArrayOverDateTimeInterface(): void
+    {
+        $entity = new class () extends Entity {
+            protected $attributes = [
+                'date' => null,
+            ];
+        };
+
+        $entity->date = new class ('2024-01-01 00:00:00') extends DateTime {
+            public function toArray(): array
+            {
+                return ['date' => 'same'];
+            }
+        };
+        $entity->syncOriginal();
+
+        $entity->date->modify('+1 day');
+
+        $this->assertFalse($entity->hasChanged('date'));
+    }
+
     public function testHasChangedScalarOptimizationWithNullValues(): void
     {
         $entity = new class () extends Entity {