Skip to content

Commit 1230b28

Browse files
Fix scrutinizer issues
1 parent 6a2919e commit 1230b28

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/Auth/Source/PasswordVerify1Compat.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ public function __construct(array $info, array $config)
5050
$v2config['auth_queries']['default']['password_verify_hash_column'] = $config['passwordhash_column'];
5151
}
5252

53-
if (is_array($config['query']) && count($config['query']) > 1) {
53+
$numQueries = is_array($config['query']) ? count($config['query']) : 0;
54+
if ($numQueries > 1) {
5455
$v2config['attr_queries'] = [];
55-
for ($i = 1; $i < count($config['query']); $i++) {
56+
for ($i = 1; $i < $numQueries; $i++) {
5657
$v2config['attr_queries']['query' . $i] = [
5758
'database' => 'default',
5859
'query' => $config['query'][$i],

src/Auth/Source/SQL1Compat.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ public function __construct(array $info, array $config)
4444
$v2config['auth_queries']['default']['username_regex'] = $config['username_regex'];
4545
}
4646

47-
if (is_array($config['query']) && count($config['query']) > 1) {
47+
$numQueries = is_array($config['query']) ? count($config['query']) : 0;
48+
if ($numQueries > 1) {
4849
$v2config['attr_queries'] = [];
49-
for ($i = 1; $i < count($config['query']); $i++) {
50+
for ($i = 1; $i < $numQueries; $i++) {
5051
$v2config['attr_queries']['query' . $i] = [
5152
'database' => 'default',
5253
'query' => $config['query'][$i],

src/Auth/Source/SQL2.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,6 @@ protected function login(
574574
}
575575

576576
// At the end, disconnect from all databases
577-
$db = null;
578577
foreach ($this->databases as $dbname => $dbConfig) {
579578
if ($dbConfig['_pdo'] !== null) {
580579
$this->databases[$dbname]['_pdo'] = null;

0 commit comments

Comments
 (0)