允许 FieldTypeTransform 无法转换时返回 null

top-think · Aug 17, 2024 · 23f01ce · 23f01ce
1 parent d68e185
commit 23f01ce
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 9 deletions.
diff --git a/src/model/contracts/FieldTypeTransform.php b/src/model/contracts/FieldTypeTransform.php
@@ -8,7 +8,7 @@
 
 interface FieldTypeTransform
 {
-    public static function get(mixed $value, Model $model): static;
+    public static function get(mixed $value, Model $model): ?static;
 
     /**
      * @return static|mixed

diff --git a/tests/orm/ModelFieldTypeTest.php b/tests/orm/ModelFieldTypeTest.php
@@ -14,7 +14,8 @@ class ModelFieldTypeTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         Db::execute('DROP TABLE IF EXISTS `test_field_type`;');
-        Db::execute(<<<SQL
+        Db::execute(
+            <<<SQL
 CREATE TABLE `test_field_type` (
      `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
      `t_json` json DEFAULT NULL,
@@ -65,4 +66,19 @@ public function testFieldReadAndWrite()
         $this->assertEquals((string) new TestFieldPhpDTO(40, 'eee'), (string) $result->t_php);
         $this->assertEquals($result->id, $result->t_php->getId());
     }
+
+    /**
+     * @depends testFieldTypeSelect
+     */
+    public function testFieldReadInvalid()
+    {
+
+        $model = new FieldTypeModel([
+            'id' => 1,
+            't_json' => '???Invalid',
+            't_php' => '???Invalid',
+        ]);
+        $this->assertNull($model->t_json);
+        $this->assertNull($model->t_php);
+    }
 }
diff --git a/tests/stubs/TestFieldJsonDTO.php b/tests/stubs/TestFieldJsonDTO.php
@@ -15,10 +15,13 @@ public function __construct(
     {
     }
 
-    public static function fromData(array|string $data): static
+    public static function fromData(array|string $data): ?static
     {
         if (is_string($data)) {
             $data = json_decode($data, true);
+            if (empty($data)) {
+                return null;
+            }
         }
         return new self(...$data);
     }
@@ -33,7 +36,7 @@ public function __toString(): string
         return json_encode($this);
     }
 
-    public static function get(mixed $value, Model $model): static
+    public static function get(mixed $value, Model $model): ?static
     {
         return static::fromData($value);
     }
@@ -43,4 +46,3 @@ public static function set($value, $model): string
         return (string) $value;
     }
 }
-
diff --git a/tests/stubs/TestFieldPhpDTO.php b/tests/stubs/TestFieldPhpDTO.php
@@ -22,9 +22,14 @@ public function getId(): ?int
         return $this->id;
     }
 
-    public static function fromData(string $data): static
+    public static function fromData(string $data): ?static
     {
-        return unserialize($data);
+        $result = @unserialize($data);
+        if (empty($result)) {
+            return null;
+        }
+
+        return $result;
     }
 
     public function __serialize(): array
@@ -44,9 +49,12 @@ public function __toString(): string
         return serialize($this);
     }
 
-    public static function get(mixed $value, Model $model): static
+    public static function get(mixed $value, Model $model): ?static
     {
         $d = static::fromData($value);
+        if (empty($d)) {
+            return null;
+        }
         $d->id = $model->getData('id');
         return $d;
     }
@@ -56,4 +64,3 @@ public static function set($value, $model): string
         return (string) $value;
     }
 }
-