Add template types to PreparedQuery

paulbalandan · paulbalandan · commit a9d59be8a42a · 2022-10-18T11:30:41.000+08:00
diff --git a/phpstan-baseline.neon.dist b/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
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
@@ -19,13 +19,16 @@
 
 /**
  * Base prepared query
+ *
+ * @template TStatement of object|resource
  */
 abstract class BasePreparedQuery implements PreparedQueryInterface
 {
     /**
      * The prepared statement itself.
      *
      * @var object|resource|null
+     * @phpstan-var TStatement|null
      */
     protected $statement;
 
diff --git a/system/Database/MySQLi/PreparedQuery.php b/system/Database/MySQLi/PreparedQuery.php
@@ -17,6 +17,8 @@
 
 /**
  * Prepared query for MySQLi
+ *
+ * @extends BasePreparedQuery<\mysqli_stmt>
  */
 class PreparedQuery extends BasePreparedQuery
 {
diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
@@ -18,6 +18,8 @@
 
 /**
  * Prepared query for OCI8
+ *
+ * @extends BasePreparedQuery<resource>
  */
 class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
 {
diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php
@@ -18,6 +18,8 @@
 
 /**
  * Prepared query for Postgre
+ *
+ * @extends BasePreparedQuery<\PgSql\Result>
  */
 class PreparedQuery extends BasePreparedQuery
 {
diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php
@@ -18,6 +18,8 @@
 
 /**
  * Prepared query for Postgre
+ *
+ * @extends BasePreparedQuery<resource>
  */
 class PreparedQuery extends BasePreparedQuery
 {
diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php
@@ -17,6 +17,8 @@
 
 /**
  * Prepared query for SQLite3
+ *
+ * @extends BasePreparedQuery<\SQLite3Stmt>
  */
 class PreparedQuery extends BasePreparedQuery
 {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* Prepared query for MySQLi`
	`20`	`+ *`
	`21`	`+ * @extends BasePreparedQuery<\mysqli_stmt>`
`20`	`22`	`*/`
`21`	`23`	`class PreparedQuery extends BasePreparedQuery`
`22`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* Prepared query for OCI8`
	`21`	`+ *`
	`22`	`+ * @extends BasePreparedQuery<resource>`
`21`	`23`	`*/`
`22`	`24`	`class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface`
`23`	`25`	`{`