codeigniter4 · paulbalandan · Aug 13, 2026 · Aug 12, 2026
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -26,6 +26,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
 {
@@ -183,7 +185,7 @@ class BaseBuilder
     /**
      * A reference to the database connection.
      *
-     * @var BaseConnection
+     * @var TDb
      */
     protected $db;
 
@@ -310,7 +312,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) {

diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
@@ -23,6 +23,7 @@
  * @template TConnection
  * @template TStatement
  * @template TResult
+ * @template TDb of BaseConnection
  *
  * @implements PreparedQueryInterface<TConnection, TStatement, TResult>
  */
@@ -60,7 +61,7 @@ abstract class BasePreparedQuery implements PreparedQueryInterface
     /**
      * A reference to the db connection to use.
      *
-     * @var BaseConnection<TConnection, TResult>
+     * @var TDb
      */
     protected $db;
 

diff --git a/system/Database/Forge.php b/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;
 
@@ -187,6 +189,8 @@ class Forge
 
     /**
      * Constructor.
+     *
+     * @param TDb $db
      */
     public function __construct(BaseConnection $db)
     {

diff --git a/system/Database/MySQLi/Builder.php b/system/Database/MySQLi/Builder.php
@@ -19,6 +19,8 @@
 
 /**
  * Builder for MySQLi
+ *
+ * @extends BaseBuilder<Connection>
  */
 class Builder extends BaseBuilder
 {

diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
@@ -17,6 +17,8 @@
 
 /**
  * Forge for MySQLi
+ *
+ * @extends BaseForge<Connection>
  */
 class Forge extends BaseForge
 {

diff --git a/system/Database/MySQLi/PreparedQuery.php b/system/Database/MySQLi/PreparedQuery.php
@@ -24,7 +24,7 @@
 /**
  * Prepared query for MySQLi
  *
- * @extends BasePreparedQuery<mysqli, mysqli_stmt, mysqli_result>
+ * @extends BasePreparedQuery<mysqli, mysqli_stmt, mysqli_result, Connection>
  */
 class PreparedQuery extends BasePreparedQuery
 {

diff --git a/system/Database/OCI8/Builder.php b/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.
      */

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
@@ -17,6 +17,8 @@
 
 /**
  * Forge for OCI8
+ *
+ * @extends BaseForge<Connection>
  */
 class Forge extends BaseForge
 {

diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
@@ -21,17 +21,10 @@
 /**
  * Prepared query for OCI8
  *
- * @extends BasePreparedQuery<resource, resource, resource>
+ * @extends BasePreparedQuery<resource, resource, resource, Connection>
  */
 class PreparedQuery extends BasePreparedQuery
 {
-    /**
-     * A reference to the db connection to use.
-     *
-     * @var Connection
-     */
-    protected $db;
-
     /**
      * Latest inserted table name.
      */

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
@@ -22,6 +22,8 @@
 
 /**
  * Builder for Postgre
+ *
+ * @extends BaseBuilder<Connection>
  */
 class Builder extends BaseBuilder
 {

diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
@@ -17,6 +17,8 @@
 
 /**
  * Forge for Postgre
+ *
+ * @extends BaseForge<Connection>
  */
 class Forge extends BaseForge
 {
@@ -67,11 +69,6 @@ class Forge extends BaseForge
      */
     protected $null = 'NULL';
 
-    /**
-     * @var Connection
-     */
-    protected $db;
-
     /**
      * CREATE TABLE attributes
      *

diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php
@@ -23,7 +23,7 @@
 /**
  * Prepared query for Postgre
  *
- * @extends BasePreparedQuery<PgSqlConnection, PgSqlResult, PgSqlResult>
+ * @extends BasePreparedQuery<PgSqlConnection, PgSqlResult, PgSqlResult, Connection>
  */
 class PreparedQuery extends BasePreparedQuery
 {

diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
@@ -28,6 +28,8 @@
  * @todo auto check for TextCastToInt
  * @todo auto check for InsertIndexValue
  * @todo replace: delete index entries before insert
+ *
+ * @extends BaseBuilder<Connection>
  */
 class Builder extends BaseBuilder
 {

diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
@@ -20,6 +20,8 @@
 
 /**
  * Forge for SQLSRV
+ *
+ * @extends BaseForge<Connection>
  */
 class Forge extends BaseForge
 {

diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php
@@ -20,7 +20,7 @@
 /**
  * Prepared query for Postgre
  *
- * @extends BasePreparedQuery<resource, resource, resource>
+ * @extends BasePreparedQuery<resource, resource, resource, Connection>
  */
 class PreparedQuery extends BasePreparedQuery
 {
@@ -31,13 +31,6 @@ class PreparedQuery extends BasePreparedQuery
      */
     protected $parameters = [];
 
-    /**
-     * A reference to the db connection to use.
-     *
-     * @var Connection
-     */
-    protected $db;
-
     public function __construct(Connection $db)
     {
         parent::__construct($db);

diff --git a/system/Database/SQLite3/Builder.php b/system/Database/SQLite3/Builder.php
@@ -20,6 +20,8 @@
 
 /**
  * Builder for SQLite3
+ *
+ * @extends BaseBuilder<Connection>
  */
 class Builder extends BaseBuilder
 {

diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
@@ -19,6 +19,8 @@
 
 /**
  * Forge for SQLite3
+ *
+ * @extends BaseForge<Connection>
  */
 class Forge extends BaseForge
 {
@@ -29,11 +31,6 @@ class Forge extends BaseForge
      */
     protected $dropIndexStr = 'DROP INDEX %s';
 
-    /**
-     * @var Connection
-     */
-    protected $db;
-
     /**
      * UNSIGNED support
      *

diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php
@@ -24,7 +24,7 @@
 /**
  * Prepared query for SQLite3
  *
- * @extends BasePreparedQuery<SQLite3, SQLite3Stmt, SQLite3Result>
+ * @extends BasePreparedQuery<SQLite3, SQLite3Stmt, SQLite3Result, Connection>
  */
 class PreparedQuery extends BasePreparedQuery
 {

diff --git a/system/Test/Mock/MockBuilder.php b/system/Test/Mock/MockBuilder.php
@@ -15,6 +15,9 @@
 
 use CodeIgniter\Database\BaseBuilder;
 
+/**
+ * @extends BaseBuilder<MockConnection>
+ */
 class MockBuilder extends BaseBuilder
 {
     /**

diff --git a/tests/_support/Mock/MockPreparedQuery.php b/tests/_support/Mock/MockPreparedQuery.php
@@ -14,11 +14,12 @@
 namespace Tests\Support\Mock;
 
 use CodeIgniter\Database\BasePreparedQuery;
+use CodeIgniter\Test\Mock\MockConnection;
 
 /**
  * @internal
  *
- * @extends BasePreparedQuery<object, object, object>
+ * @extends BasePreparedQuery<object, object, object, MockConnection>
  */
 final class MockPreparedQuery extends BasePreparedQuery
 {

diff --git a/tests/system/Database/Forge/CreateTableTest.php b/tests/system/Database/Forge/CreateTableTest.php
@@ -42,7 +42,7 @@ public function testCreateTableWithDefaultRawSql(): void
             ->with($sql)
             ->willReturn(true);
 
-        $forge = new class ($dbMock) extends Forge {};
+        $forge = new Forge($dbMock);
 
         $fields = [
             'id' => [

diff --git a/utils/phpstan-baseline/argument.type.neon b/utils/phpstan-baseline/argument.type.neon
@@ -53,7 +53,7 @@ parameters:
             path: ../../tests/system/Config/FactoriesTest.php
 
         -
-            message: '#^Parameter \#1 \$from of method CodeIgniter\\Database\\BaseBuilder\:\:from\(\) expects array\|string, null given\.$#'
+            message: '#^Parameter \#1 \$from of method CodeIgniter\\Database\\BaseBuilder\<CodeIgniter\\Database\\BaseConnection\>\:\:from\(\) expects array\|string, null given\.$#'
             count: 1
             path: ../../tests/system/Database/Builder/FromTest.php
 
@@ -68,7 +68,7 @@ parameters:
             path: ../../tests/system/Database/Builder/GetTest.php
 
         -
-            message: '#^Parameter \#1 \$fields of method CodeIgniter\\Database\\Forge\:\:addField\(\) expects array\<string, array\|string\>\|string, array\<int, string\> given\.$#'
+            message: '#^Parameter \#1 \$fields of method CodeIgniter\\Database\\Forge\<CodeIgniter\\Database\\BaseConnection\>\:\:addField\(\) expects array\<string, array\|string\>\|string, array\<int, string\> given\.$#'
             count: 2
             path: ../../tests/system/Database/Live/ForgeTest.php
 
@@ -78,17 +78,17 @@ parameters:
             path: ../../tests/system/Database/Live/SQLite3/AlterTableTest.php
 
         -
-            message: '#^Parameter \#1 \$set of method CodeIgniter\\Database\\BaseBuilder\:\:updateFields\(\) expects list\<CodeIgniter\\Database\\RawSql\|string\>\|string, array\{0\: ''country'', updated_at\: CodeIgniter\\Database\\RawSql\} given\.$#'
+            message: '#^Parameter \#1 \$set of method CodeIgniter\\Database\\BaseBuilder\<CodeIgniter\\Database\\BaseConnection\>\:\:updateFields\(\) expects list\<CodeIgniter\\Database\\RawSql\|string\>\|string, array\{0\: ''country'', updated_at\: CodeIgniter\\Database\\RawSql\} given\.$#'
             count: 2
             path: ../../tests/system/Database/Live/UpdateTest.php
 
         -
-            message: '#^Parameter \#1 \$set of method CodeIgniter\\Database\\BaseBuilder\:\:updateFields\(\) expects list\<CodeIgniter\\Database\\RawSql\|string\>\|string, array\{0\: ''name'', updated_at\: CodeIgniter\\Database\\RawSql\} given\.$#'
+            message: '#^Parameter \#1 \$set of method CodeIgniter\\Database\\BaseBuilder\<CodeIgniter\\Database\\BaseConnection\>\:\:updateFields\(\) expects list\<CodeIgniter\\Database\\RawSql\|string\>\|string, array\{0\: ''name'', updated_at\: CodeIgniter\\Database\\RawSql\} given\.$#'
             count: 1
             path: ../../tests/system/Database/Live/UpdateTest.php
 
         -
-            message: '#^Parameter \#1 \$set of method CodeIgniter\\Database\\BaseBuilder\:\:updateFields\(\) expects list\<CodeIgniter\\Database\\RawSql\|string\>\|string, array\{updated_at\: CodeIgniter\\Database\\RawSql\} given\.$#'
+            message: '#^Parameter \#1 \$set of method CodeIgniter\\Database\\BaseBuilder\<CodeIgniter\\Database\\BaseConnection\>\:\:updateFields\(\) expects list\<CodeIgniter\\Database\\RawSql\|string\>\|string, array\{updated_at\: CodeIgniter\\Database\\RawSql\} given\.$#'
             count: 2
             path: ../../tests/system/Database/Live/UpsertTest.php
 

diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
@@ -1,4 +1,4 @@
-# total 1478 errors
+# total 1454 errors
 
 includes:
     - argument.type.neon

diff --git a/utils/phpstan-baseline/property.notFound.neon b/utils/phpstan-baseline/property.notFound.neon
@@ -1,22 +1,7 @@
-# total 47 errors
+# total 28 errors
 
 parameters:
     ignoreErrors:
-        -
-            message: '#^Access to an undefined property CodeIgniter\\Database\\BaseConnection\<mysqli, mysqli_result\>\:\:\$mysqli\.$#'
-            count: 3
-            path: ../../system/Database/MySQLi/PreparedQuery.php
-
-        -
-            message: '#^Access to an undefined property CodeIgniter\\Database\\BaseConnection\:\:\$schema\.$#'
-            count: 2
-            path: ../../system/Database/SQLSRV/Builder.php
-
-        -
-            message: '#^Access to an undefined property CodeIgniter\\Database\\BaseConnection\:\:\$schema\.$#'
-            count: 14
-            path: ../../system/Database/SQLSRV/Forge.php
-
         -
             message: '#^Access to an undefined property CodeIgniter\\Database\\BaseConnection\:\:\$mysqli\.$#'
             count: 1
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,8 @@ @@
     /**
      * Builder for MySQLi
+     *
+     * @extends BaseBuilder<Connection>
      */
     class Builder extends BaseBuilder
     {
@@ Expand Down @@