Merge pull request #7436 from kenjis/fix-phpdoc-types-database

fix: PHPDoc @template and @return in database

Author: kenjis

system/Database/BaseConnection.php

@@ -46,8 +46,8 @@
  * @property bool       $transFailure
  * @property bool       $transStatus
  *
- * @template TConnection of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TResult
  *
  * @implements ConnectionInterface<TConnection, TResult>
  */

system/Database/BasePreparedQuery.php

@@ -18,9 +18,9 @@
 use ErrorException;
 
 /**
- * @template TConnection of object|resource
- * @template TStatement of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TStatement
+ * @template TResult
  *
  * @implements PreparedQueryInterface<TConnection, TStatement, TResult>
  */

system/Database/BaseResult.php

@@ -15,8 +15,8 @@
 use stdClass;
 
 /**
- * @template TConnection of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TResult
  *
  * @implements ResultInterface<TConnection, TResult>
  */
@@ -499,6 +499,8 @@ abstract public function getFieldData(): array;
 
     /**
      * Frees the current result.
+     *
+     * @return void
      */
     abstract public function freeResult();
 
@@ -525,7 +527,7 @@ abstract protected function fetchAssoc();
      *
      * Overridden by child classes.
      *
-     * @return object
+     * @return Entity|false|object|stdClass
      */
     abstract protected function fetchObject(string $className = 'stdClass');
 }

system/Database/ConnectionInterface.php

@@ -12,8 +12,8 @@
 namespace CodeIgniter\Database;
 
 /**
- * @template TConnection of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TResult
  */
 interface ConnectionInterface
 {

system/Database/MySQLi/Result.php

@@ -103,6 +103,8 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
+     *
+     * @return void
      */
     public function freeResult()
     {

system/Database/OCI8/Result.php

@@ -13,6 +13,7 @@
 
 use CodeIgniter\Database\BaseResult;
 use CodeIgniter\Entity\Entity;
+use stdClass;
 
 /**
  * Result for OCI8

system/Database/Postgre/Result.php

@@ -69,6 +69,8 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
+     *
+     * @return void
      */
     public function freeResult()
     {

system/Database/PreparedQueryInterface.php

@@ -14,9 +14,9 @@
 use BadMethodCallException;
 
 /**
- * @template TConnection of object|resource
- * @template TStatement of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TStatement
+ * @template TResult
  */
 interface PreparedQueryInterface
 {

system/Database/ResultInterface.php

@@ -14,8 +14,8 @@
 use stdClass;
 
 /**
- * @template TConnection of object|resource
- * @template TResult of object|resource
+ * @template TConnection
+ * @template TResult
  */
 interface ResultInterface
 {

system/Database/SQLSRV/Result.php

@@ -103,6 +103,8 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
+     *
+     * @return void
      */
     public function freeResult()
     {