diff --git a/CHANGELOG.md b/CHANGELOG.md index 0286474d4fe4..6b867cb672ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,7 +53,6 @@ * fix: typo in pager default_simple by @jasonliang-dev in https://github.com/codeigniter4/CodeIgniter4/pull/8407 * refactor: improve Forge variable names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8434 - ## [v4.4.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.4) (2023-12-28) [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.3...v4.4.4) diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php index 2ef3ae7a5866..c3ffa2b9b0d4 100644 --- a/system/Database/BaseResult.php +++ b/system/Database/BaseResult.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Database; -use CodeIgniter\Entity\Entity; +use CodeIgniter\Entity\EntityInterface; use stdClass; /** @@ -159,7 +159,7 @@ public function getCustomResultObject(string $className) $this->customResultObject[$className] = []; while ($row = $this->fetchObject($className)) { - if (! is_subclass_of($row, Entity::class) && method_exists($row, 'syncOriginal')) { + if (! is_subclass_of($row, EntityInterface::class) && method_exists($row, 'syncOriginal')) { $row->syncOriginal(); } @@ -240,7 +240,7 @@ public function getResultObject(): array } while ($row = $this->fetchObject()) { - if (! is_subclass_of($row, Entity::class) && method_exists($row, 'syncOriginal')) { + if (! is_subclass_of($row, EntityInterface::class) && method_exists($row, 'syncOriginal')) { $row->syncOriginal(); } @@ -539,7 +539,7 @@ abstract protected function fetchAssoc(); * * Overridden by child classes. * - * @return Entity|false|object|stdClass + * @return EntityInterface|false|object|stdClass */ abstract protected function fetchObject(string $className = 'stdClass'); } diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php index 53f7fce4419f..7b7e2633247b 100644 --- a/system/Database/MySQLi/Result.php +++ b/system/Database/MySQLi/Result.php @@ -145,7 +145,7 @@ protected function fetchAssoc() * * Overridden by child classes. * - * @return Entity|false|object|stdClass + * @return EntityInterface|false|object|stdClass */ protected function fetchObject(string $className = 'stdClass') { diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php index daffc77e8849..4565ffdda036 100644 --- a/system/Database/OCI8/Result.php +++ b/system/Database/OCI8/Result.php @@ -95,7 +95,7 @@ protected function fetchAssoc() * * Overridden by child classes. * - * @return Entity|false|object|stdClass + * @return EntityInterface|false|object|stdClass */ protected function fetchObject(string $className = 'stdClass') { diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php index e3786ba9d130..4fcb317de589 100644 --- a/system/Database/Postgre/Result.php +++ b/system/Database/Postgre/Result.php @@ -111,7 +111,7 @@ protected function fetchAssoc() * * Overridden by child classes. * - * @return Entity|false|object|stdClass + * @return EntityInterface|false|object|stdClass */ protected function fetchObject(string $className = 'stdClass') { diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php index 12680c70394e..36d9bb5b87c9 100755 --- a/system/Database/SQLSRV/Result.php +++ b/system/Database/SQLSRV/Result.php @@ -151,7 +151,7 @@ protected function fetchAssoc() /** * Returns the result set as an object. * - * @return Entity|false|object|stdClass + * @return EntityInterface|false|object|stdClass */ protected function fetchObject(string $className = 'stdClass') {