Update Model.php

avegacms · kenjis · commit 463960886252 · 2024-05-08T15:23:04.000+09:00
Fix TypeError error in the methods: doFind and doFirst when using casts
diff --git a/system/Model.php b/system/Model.php
@@ -210,7 +210,7 @@ protected function doFind(bool $singleton, $id = null)
             $row = $builder->get()->getResult($this->tempReturnType);
         }
 
-        if ($useCast) {
+        if ($useCast && $row !== null) {
             $row = $this->convertToReturnType($row, $returnType);
 
             $this->tempReturnType = $returnType;

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ protected function doFind(bool $singleton, $id = null)`
`210`	`210`	`$row = $builder->get()->getResult($this->tempReturnType);`
`211`	`211`	`}`
`212`	`212`
`213`		`- if ($useCast) {`
	`213`	`+ if ($useCast && $row !== null) {`
`214`	`214`	`$row = $this->convertToReturnType($row, $returnType);`
`215`	`215`
`216`	`216`	`$this->tempReturnType = $returnType;`