fix: TypeError when Time is passed to Model

codeigniter4 · Apr 9, 2024 · 1a191b5 · 1a191b5
1 parent f846ffd
commit 1a191b5
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/system/BaseModel.php b/system/BaseModel.php
@@ -926,6 +926,9 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
                     $row = (array) $row;
                 }
 
+                // Convert any Time instances to appropriate $dateFormat
+                $row = $this->timeToString($row);
+
                 // Validate every row.
                 if (! $this->skipValidation && ! $this->validate($row)) {
                     // Restore $cleanValidationRules
@@ -1845,8 +1848,6 @@ protected function transformDataToArray($row, string $type): array
                 $row = $this->converter->toDataSource($row);
             } elseif ($row instanceof Entity) {
                 $row = $this->converter->extract($row, $onlyChanged);
-                // Convert any Time instances to appropriate $dateFormat
-                $row = $this->timeToString($row);
             } elseif (is_object($row)) {
                 $row = $this->converter->extract($row, $onlyChanged);
             }
@@ -1870,7 +1871,8 @@ protected function transformDataToArray($row, string $type): array
             throw DataException::forEmptyDataset($type);
         }
 
-        return $row;
+        // Convert any Time instances to appropriate $dateFormat
+        return $this->timeToString($row);
     }
 
     /**