Skip to content

Commit dbe460e

Browse files
committed
fix: do not unset statement after closing it, instead set to null
1 parent 78a34c9 commit dbe460e

File tree

2 files changed

+2
-32
lines changed

2 files changed

+2
-32
lines changed

phpstan-baseline.neon.dist

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,6 @@ parameters:
115115
count: 1
116116
path: system/Database/Migration.php
117117

118-
-
119-
message: "#^Property CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:\\$statement \\(object\\|resource\\) in isset\\(\\) is not nullable\\.$#"
120-
count: 1
121-
path: system/Database/BasePreparedQuery.php
122-
123118
-
124119
message: "#^Cannot access property \\$errno on bool\\|object\\|resource\\.$#"
125120
count: 1
@@ -225,11 +220,6 @@ parameters:
225220
count: 1
226221
path: system/Database/MySQLi/PreparedQuery.php
227222

228-
-
229-
message: "#^Property CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:\\$statement \\(object\\|resource\\) in isset\\(\\) is not nullable\\.$#"
230-
count: 1
231-
path: system/Database/MySQLi/PreparedQuery.php
232-
233223
-
234224
message: "#^Cannot access property \\$field_count on object\\|resource\\|false\\.$#"
235225
count: 1
@@ -270,21 +260,11 @@ parameters:
270260
count: 1
271261
path: system/Database/MySQLi/Result.php
272262

273-
-
274-
message: "#^Property CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:\\$statement \\(object\\|resource\\) in isset\\(\\) is not nullable\\.$#"
275-
count: 1
276-
path: system/Database/OCI8/PreparedQuery.php
277-
278263
-
279264
message: "#^Strict comparison using \\=\\=\\= between array and false will always evaluate to false\\.$#"
280265
count: 1
281266
path: system/Database/Postgre/Connection.php
282267

283-
-
284-
message: "#^Property CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:\\$statement \\(object\\|resource\\) in isset\\(\\) is not nullable\\.$#"
285-
count: 1
286-
path: system/Database/Postgre/PreparedQuery.php
287-
288268
-
289269
message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#"
290270
count: 2
@@ -295,11 +275,6 @@ parameters:
295275
count: 13
296276
path: system/Database/SQLSRV/Forge.php
297277

298-
-
299-
message: "#^Property CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:\\$statement \\(object\\|resource\\) in isset\\(\\) is not nullable\\.$#"
300-
count: 1
301-
path: system/Database/SQLSRV/PreparedQuery.php
302-
303278
-
304279
message: "#^Cannot call method changes\\(\\) on bool\\|object\\|resource\\.$#"
305280
count: 1
@@ -370,11 +345,6 @@ parameters:
370345
count: 1
371346
path: system/Database/SQLite3/PreparedQuery.php
372347

373-
-
374-
message: "#^Property CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:\\$statement \\(object\\|resource\\) in isset\\(\\) is not nullable\\.$#"
375-
count: 1
376-
path: system/Database/SQLite3/PreparedQuery.php
377-
378348
-
379349
message: "#^Cannot call method columnName\\(\\) on object\\|resource\\|false\\.$#"
380350
count: 2

system/Database/BasePreparedQuery.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ abstract class BasePreparedQuery implements PreparedQueryInterface
2525
/**
2626
* The prepared statement itself.
2727
*
28-
* @var object|resource
28+
* @var object|resource|null
2929
*/
3030
protected $statement;
3131

@@ -158,7 +158,7 @@ public function close(): bool
158158
try {
159159
return $this->_close();
160160
} finally {
161-
unset($this->statement);
161+
$this->statement = null;
162162
}
163163
}
164164

0 commit comments

Comments
 (0)