Skip to content

Commit

Permalink
Merge pull request #7994 from kenjis/refactor-OCI8-Connection-if
Browse files Browse the repository at this point in the history
refactor: if condition in OCI8/Connection.php
  • Loading branch information
kenjis authored Oct 3, 2023
2 parents ca50f24 + c3c170e commit e67b42a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions phpstan-baseline.php
Original file line number Diff line number Diff line change
Expand Up @@ -1466,11 +1466,6 @@
'count' => 1,
'path' => __DIR__ . '/system/Database/OCI8/Connection.php',
];
$ignoreErrors[] = [
'message' => '#^Only booleans are allowed in a negated boolean, array\\|string given\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Database/OCI8/Connection.php',
];
$ignoreErrors[] = [
'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\<resource,resource\\>\\:\\:\\$escapeChar\\.$#',
'count' => 1,
Expand Down
2 changes: 1 addition & 1 deletion system/Database/OCI8/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ public function insertID(): int
}
}

if (! $primaryColumnName) {
if ($primaryColumnName === '') {
return 0;
}

Expand Down

0 comments on commit e67b42a

Please sign in to comment.