Merge branch 'codeigniter4:develop' into patch-2

Author: obozdag

tests/_support/Entity/UserWithCasts.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <[email protected]>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Entity;
+
+use CodeIgniter\Entity\Entity;
+
+class UserWithCasts extends Entity
+{
+    protected $casts = [
+        'email' => 'json',
+    ];
+}

tests/_support/Models/UserEntityWithCastsModel.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <[email protected]>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
+
+use CodeIgniter\Model;
+use Tests\Support\Entity\UserWithCasts;
+
+class UserEntityWithCastsModel extends Model
+{
+    protected $table         = 'user';
+    protected $allowedFields = [
+        'name',
+        'email',
+        'country',
+        'deleted_at',
+    ];
+    protected $returnType = UserWithCasts::class;
+}

tests/system/Models/FindModelTest.php

@@ -15,8 +15,10 @@
 
 use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\Exceptions\ModelException;
+use Tests\Support\Entity\UserWithCasts;
 use Tests\Support\Models\JobModel;
 use Tests\Support\Models\SecondaryModel;
+use Tests\Support\Models\UserEntityWithCastsModel;
 use Tests\Support\Models\UserModel;
 
 /**
@@ -32,6 +34,24 @@ public function testFindReturnsRow(): void
         $this->assertSame('Musician', $this->model->find(4)->name);
     }
 
+    public function testFindReturnsEntityWithCasts(): void
+    {
+        $this->createModel(UserEntityWithCastsModel::class);
+        $this->model->builder()->truncate();
+        $user = new UserWithCasts([
+            'name'    => 'John Smith',
+            'email'   => ['[email protected]', '[email protected]'],
+            'country' => 'US',
+        ]);
+        $id = $this->model->insert($user, true);
+
+        /** @var UserWithCasts $user */
+        $user = $this->model->find($id);
+
+        $this->assertSame('John Smith', $user->name);
+        $this->assertSame(['[email protected]', '[email protected]'], $user->email);
+    }
+
     public function testFindReturnsMultipleRows(): void
     {
         $this->createModel(JobModel::class);