fix: ObjectCast implementation

But I don't know it makes sense.
codeigniter4 · Sep 30, 2023 · d77ec8f · d77ec8f
1 parent 02df574
commit d77ec8f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/system/Entity/Cast/ObjectCast.php b/system/Entity/Cast/ObjectCast.php
@@ -40,23 +40,23 @@ public static function toDatabase($value, array $params = [])
         }
 
         // @TODO How to implement?
-        return serialize($value);
+        return serialize((array) $value);
     }
 
     /**
      * {@inheritDoc}
      */
-    public static function fromDatabase($value, array $params = []): array
+    public static function fromDatabase($value, array $params = []): object
     {
         if (! is_string($value)) {
             self::invalidTypeValueError($value);
         }
 
         // @TODO How to implement?
-        if ((strpos($value, 'a:') === 0 || strpos($value, 's:') === 0)) {
-            $value = unserialize($value);
+        if ((strpos($value, 'a:') === 0)) {
+            return (object) unserialize($value, ['allowed_classes' => false]);
         }
 
-        return (array) $value;
+        self::invalidTypeValueError($value);
     }
 }
diff --git a/tests/system/Entity/EntityLiveTest.php b/tests/system/Entity/EntityLiveTest.php
@@ -11,12 +11,12 @@
 
 namespace CodeIgniter\Entity;
 
-use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Model;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use Config\Services;
+use stdClass;
 
 /**
  * @internal
@@ -85,8 +85,6 @@ public function testEntityReturnsValuesWithCorrectTypes()
      */
     public function testCastObject(): void
     {
-        $this->expectException(DatabaseException::class);
-
         $entity = new class () extends Entity {
             protected $casts = [
                 'id'     => 'int',
@@ -103,5 +101,10 @@ public function testCastObject(): void
         };
         $entity->fill(['username' => 'johnsmith', 'active' => false, 'memo' => ['foo', 'bar']]);
         $model->save($entity);
+
+        $user = $model->asObject(get_class($entity))->find(1);
+
+        $this->assertInstanceOf(stdClass::class, $user->memo);
+        $this->assertSame(['foo', 'bar'], (array) $user->memo);
     }
 }