Merge remote-tracking branch 'upstream/develop' into 4.8

Author: paulbalandan

system/CodeIgniter.php

@@ -552,6 +552,8 @@ protected function getResponseObject()
 
     /**
      * Returns an array with our basic performance stats collected.
+     *
+     * @return array{startTime: float|null, totalTime: float}
      */
     public function getPerformanceStats(): array
     {

system/Database/BaseBuilder.php

@@ -28,6 +28,8 @@
  * Provides the core Query Builder methods.
  * Database-specific Builders might need to override
  * certain methods to make them work.
+ *
+ * @template TDb of BaseConnection
  */
 class BaseBuilder
 {
@@ -205,7 +207,7 @@ class BaseBuilder
     /**
      * A reference to the database connection.
      *
-     * @var BaseConnection
+     * @var TDb
      */
     protected $db;
 
@@ -332,7 +334,7 @@ public function __construct($tableName, ConnectionInterface $db, ?array $options
             throw new DatabaseException('A table must be specified when creating a new Query Builder.');
         }
 
-        /** @var BaseConnection $db */
+        /** @var TDb $db */
         $this->db = $db;
 
         if ($tableName instanceof TableName) {

system/Database/BasePreparedQuery.php

@@ -25,6 +25,7 @@
  * @template TConnection
  * @template TStatement
  * @template TResult
+ * @template TDb of BaseConnection
  *
  * @implements PreparedQueryInterface<TConnection, TStatement, TResult>
  */
@@ -67,7 +68,7 @@ abstract class BasePreparedQuery implements PreparedQueryInterface
     /**
      * A reference to the db connection to use.
      *
-     * @var BaseConnection<TConnection, TResult>
+     * @var TDb
      */
     protected $db;
 

system/Database/BaseResult.php

@@ -387,8 +387,6 @@ public function setRow($key, $value = null)
 
     /**
      * Returns the "first" row of the current results.
-     *
-     * @return array|object|null
      */
     public function getFirstRow(string $type = 'object')
     {
@@ -399,8 +397,6 @@ public function getFirstRow(string $type = 'object')
 
     /**
      * Returns the "last" row of the current results.
-     *
-     * @return array|object|null
      */
     public function getLastRow(string $type = 'object')
     {
@@ -411,8 +407,6 @@ public function getLastRow(string $type = 'object')
 
     /**
      * Returns the "next" row of the current results.
-     *
-     * @return array|object|null
      */
     public function getNextRow(string $type = 'object')
     {
@@ -426,8 +420,6 @@ public function getNextRow(string $type = 'object')
 
     /**
      * Returns the "previous" row of the current results.
-     *
-     * @return array|object|null
      */
     public function getPreviousRow(string $type = 'object')
     {

system/Database/Forge.php

@@ -21,13 +21,15 @@
 /**
  * The Forge class transforms migrations to executable
  * SQL statements.
+ *
+ * @template TDb of BaseConnection
  */
 class Forge
 {
     /**
      * The active database connection.
      *
-     * @var BaseConnection
+     * @var TDb
      */
     protected $db;
 
@@ -178,6 +180,8 @@ class Forge
 
     /**
      * Constructor.
+     *
+     * @param TDb $db
      */
     public function __construct(BaseConnection $db)
     {

system/Database/MySQLi/Builder.php

@@ -19,6 +19,8 @@
 
 /**
  * Builder for MySQLi
+ *
+ * @extends BaseBuilder<Connection>
  */
 class Builder extends BaseBuilder
 {

system/Database/MySQLi/Forge.php

@@ -17,6 +17,8 @@
 
 /**
  * Forge for MySQLi
+ *
+ * @extends BaseForge<Connection>
  */
 class Forge extends BaseForge
 {

system/Database/MySQLi/PreparedQuery.php

@@ -23,7 +23,7 @@
 /**
  * Prepared query for MySQLi
  *
- * @extends BasePreparedQuery<mysqli, mysqli_stmt, mysqli_result>
+ * @extends BasePreparedQuery<mysqli, mysqli_stmt, mysqli_result, Connection>
  */
 class PreparedQuery extends BasePreparedQuery
 {

system/Database/OCI8/Builder.php

@@ -19,6 +19,8 @@
 
 /**
  * Builder for OCI8
+ *
+ * @extends BaseBuilder<Connection>
  */
 class Builder extends BaseBuilder
 {
@@ -48,13 +50,6 @@ class Builder extends BaseBuilder
      */
     protected $countString = 'SELECT COUNT(1) ';
 
-    /**
-     * A reference to the database connection.
-     *
-     * @var Connection
-     */
-    protected $db;
-
     /**
      * Generates a platform-specific insert string from the supplied data.
      */

system/Database/OCI8/Connection.php

@@ -53,6 +53,9 @@ class Connection extends BaseConnection
         'rownum',
     ];
 
+    /**
+     * @var array<string, string>
+     */
     protected $validDSNs = [
         // TNS
         'tns' => '/^\(DESCRIPTION=(\(.+\)){2,}\)$/',
@@ -79,6 +82,8 @@ class Connection extends BaseConnection
      *
      * Used by storedProcedure() to prevent execute() from
      * re-setting the statement ID.
+     *
+     * @var bool
      */
     protected $resetStmtId = true;