fix: don't break on safe int to string (and vv) property assignments

Author: vazaha-nl

src/Models/Model.php

@@ -59,21 +59,29 @@ public function toArray(): array
      */
     protected static function resolvePropertyValue(string $property, $value)
     {
-        $className = static::getPropertyClassName($property);
+        $type = static::getPropertyType($property);
 
-        if ($className === null) {
+        if ($type === null) {
             return $value;
         }
 
-        if (is_array($value) && is_a($className, self::class, true)) {
-            return $className::fromArray($value);
+        if ($type === 'int' && is_string($value) && is_numeric($value)) {
+            return (int) $value;
         }
 
-        if (is_array($value) && is_a($className, ModelCollection::class, true)) {
-            return $className::fromArray($value);
+        if ($type === 'string' && is_int($value)) {
+            return (string) $value;
         }
 
-        if (is_a($className, DateTimeInterface::class, true)) {
+        if (is_array($value) && is_a($type, self::class, true)) {
+            return $type::fromArray($value);
+        }
+
+        if (is_array($value) && is_a($type, ModelCollection::class, true)) {
+            return $type::fromArray($value);
+        }
+
+        if (is_a($type, DateTimeInterface::class, true)) {
             if (is_int($value) || is_float($value)) {
                 return Carbon::createFromTimestamp($value);
             }
@@ -86,7 +94,7 @@ protected static function resolvePropertyValue(string $property, $value)
         return $value;
     }
 
-    protected static function getPropertyClassName(string $property): ?string
+    protected static function getPropertyType(string $property): ?string
     {
         $reflectionClass = new ReflectionClass(static::class);
         $reflectionProperty = $reflectionClass->getProperty($property);

tests/ModelTest.php

@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests;
+
+use PHPUnit\Framework\TestCase;
+use Vazaha\Mastodon\Collections\FieldCollection;
+use Vazaha\Mastodon\Models\AccountModel;
+use Vazaha\Mastodon\Models\FieldModel;
+use Vazaha\Mastodon\Models\RoleModel;
+
+class ModelTest extends TestCase
+{
+    public function testModelsWithEncapsulatedModels(): void
+    {
+        $array = [
+            'moved' => [
+                'id' => '123',
+            ],
+            'fields' => [
+                [
+                    'name' => 'name1',
+                    'value' => 'value1',
+                ],
+            ],
+        ];
+
+        $account = AccountModel::fromArray($array);
+        self::assertInstanceOf(FieldCollection::class, $account->fields);
+        self::assertInstanceOf(FieldModel::class, $account->fields->first());
+        self::assertSame('name1', $account->fields->first()->name);
+        self::assertInstanceOf(AccountModel::class, $account->moved);
+        self::assertSame('123', $account->moved->id);
+    }
+
+    public function testAssignStringifiedIntToIntPropertyShouldNotBreak(): void
+    {
+        $array = [
+            'permissions' => '1234',
+        ];
+        $model = RoleModel::fromArray($array);
+        self::assertSame(1234, $model->permissions);
+    }
+
+    public function testAssignIntToStringPropertyShouldNotBreak(): void
+    {
+        $array = [
+            'id' => 1234,
+        ];
+        $model = RoleModel::fromArray($array);
+        self::assertSame('1234', $model->id);
+    }
+}