Merge pull request #6708 from paulbalandan/prepared-query-template-types

Add template types to `PreparedQuery`

Author: paulbalandan

phpstan-baseline.neon.dist

@@ -200,26 +200,6 @@ parameters:
 			count: 3
 			path: system/Database/MySQLi/PreparedQuery.php
 
-		-
-			message: "#^Cannot call method bind_param\\(\\) on object\\|resource\\.$#"
-			count: 1
-			path: system/Database/MySQLi/PreparedQuery.php
-
-		-
-			message: "#^Cannot call method execute\\(\\) on object\\|resource\\.$#"
-			count: 1
-			path: system/Database/MySQLi/PreparedQuery.php
-
-		-
-			message: "#^Cannot call method get_result\\(\\) on object\\|resource\\.$#"
-			count: 1
-			path: system/Database/MySQLi/PreparedQuery.php
-
-		-
-			message: "#^Cannot call method close\\(\\) on object\\|resource\\.$#"
-			count: 1
-			path: system/Database/MySQLi/PreparedQuery.php
-
 		-
 			message: "#^Cannot access property \\$field_count on object\\|resource\\|false\\.$#"
 			count: 1
@@ -315,16 +295,6 @@ parameters:
 			count: 1
 			path: system/Database/SQLite3/Connection.php
 
-		-
-			message: "#^Cannot call method bindValue\\(\\) on object\\|resource\\.$#"
-			count: 1
-			path: system/Database/SQLite3/PreparedQuery.php
-
-		-
-			message: "#^Cannot call method execute\\(\\) on object\\|resource\\.$#"
-			count: 1
-			path: system/Database/SQLite3/PreparedQuery.php
-
 		-
 			message: "#^Cannot call method lastErrorCode\\(\\) on bool\\|object\\|resource\\.$#"
 			count: 1
@@ -340,11 +310,6 @@ parameters:
 			count: 1
 			path: system/Database/SQLite3/PreparedQuery.php
 
-		-
-			message: "#^Cannot call method close\\(\\) on object\\|resource\\.$#"
-			count: 1
-			path: system/Database/SQLite3/PreparedQuery.php
-
 		-
 			message: "#^Cannot call method columnName\\(\\) on object\\|resource\\|false\\.$#"
 			count: 2

system/Database/BasePreparedQuery.php

@@ -19,13 +19,18 @@
 
 /**
  * Base prepared query
+ *
+ * @template TStatement of object|resource
+ *
+ * @implements PreparedQueryInterface<TStatement>
  */
 abstract class BasePreparedQuery implements PreparedQueryInterface
 {
     /**
      * The prepared statement itself.
      *
      * @var object|resource|null
+     * @phpstan-var TStatement|null
      */
     protected $statement;
 

system/Database/MySQLi/PreparedQuery.php

@@ -14,9 +14,12 @@
 use BadMethodCallException;
 use CodeIgniter\Database\BasePreparedQuery;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use mysqli_stmt;
 
 /**
  * Prepared query for MySQLi
+ *
+ * @extends BasePreparedQuery<mysqli_stmt>
  */
 class PreparedQuery extends BasePreparedQuery
 {

system/Database/OCI8/PreparedQuery.php

@@ -18,6 +18,8 @@
 
 /**
  * Prepared query for OCI8
+ *
+ * @extends BasePreparedQuery<resource>
  */
 class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
 {

system/Database/Postgre/PreparedQuery.php

@@ -18,6 +18,8 @@
 
 /**
  * Prepared query for Postgre
+ *
+ * @extends BasePreparedQuery<\PgSql\Result>
  */
 class PreparedQuery extends BasePreparedQuery
 {

system/Database/PreparedQueryInterface.php

@@ -13,6 +13,8 @@
 
 /**
  * Prepared query interface
+ *
+ * @template TStatement of object|resource
  */
 interface PreparedQueryInterface
 {

system/Database/SQLSRV/PreparedQuery.php

@@ -18,6 +18,8 @@
 
 /**
  * Prepared query for Postgre
+ *
+ * @extends BasePreparedQuery<resource>
  */
 class PreparedQuery extends BasePreparedQuery
 {

system/Database/SQLite3/PreparedQuery.php

@@ -14,9 +14,12 @@
 use BadMethodCallException;
 use CodeIgniter\Database\BasePreparedQuery;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use SQLite3Stmt;
 
 /**
  * Prepared query for SQLite3
+ *
+ * @extends BasePreparedQuery<SQLite3Stmt>
  */
 class PreparedQuery extends BasePreparedQuery
 {