Skip to content

Commit 9b83f78

Browse files
Fix $winning_auth_query not being camelCase
1 parent 618e0d3 commit 9b83f78

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/Auth/Source/SQL2.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ protected function login(
498498
): array {
499499

500500
$attributes = [];
501-
$winning_auth_query = null;
501+
$winningAuthQuery = null;
502502

503503
// Run authentication queries in order until one succeeds.
504504
foreach ($this->authQueries as $queryname => &$queryConfig) {
@@ -543,7 +543,7 @@ protected function login(
543543
if (array_key_exists('extract_userid_from', $queryConfig)) {
544544
$queryConfig['_extracted_userid'] = $data[0][$queryConfig['extract_userid_from']];
545545
}
546-
$winning_auth_query = $queryname;
546+
$winningAuthQuery = $queryname;
547547

548548
$forbiddenAttributes = [];
549549
if (array_key_exists('password_verify_hash_column', $queryConfig)) {
@@ -572,22 +572,22 @@ protected function login(
572572
Logger::debug(
573573
'sqlauth:' . $this->authId . ': ' .
574574
'Considering attribute query ' . $attrQueryConfig['query'] .
575-
' for winning auth query ' . $winning_auth_query .
575+
' for winning auth query ' . $winningAuthQuery .
576576
' with only_for_auth ' . implode(',', $attrQueryConfig['only_for_auth'] ?? []),
577577
);
578578

579579
if (
580580
(!array_key_exists('only_for_auth', $attrQueryConfig)) ||
581-
in_array($winning_auth_query, $attrQueryConfig['only_for_auth'], true)
581+
in_array($winningAuthQuery, $attrQueryConfig['only_for_auth'], true)
582582
) {
583583
Logger::debug('sqlauth:' . $this->authId . ': Running attribute query ' . $attrQueryConfig['query'] .
584-
' for winning auth query ' . $winning_auth_query);
584+
' for winning auth query ' . $winningAuthQuery);
585585

586586
$db = $this->connect($attrQueryConfig['database']);
587587

588588
try {
589-
$params = ($this->authQueries[$winning_auth_query]['_extracted_userid'] !== null) ?
590-
['userid' => $this->authQueries[$winning_auth_query]['_extracted_userid']] :
589+
$params = ($this->authQueries[$winningAuthQuery]['_extracted_userid'] !== null) ?
590+
['userid' => $this->authQueries[$winningAuthQuery]['_extracted_userid']] :
591591
['username' => $username];
592592
$data = $this->executeQuery($db, $attrQueryConfig['query'], $params);
593593
} catch (PDOException $e) {
@@ -602,7 +602,7 @@ protected function login(
602602
$this->extractAttributes($attributes, $data, []);
603603
} else {
604604
Logger::debug('sqlauth:' . $this->authId . ': Skipping attribute query ' . $attrQueryConfig['query'] .
605-
' because it does not apply to winning auth query ' . $winning_auth_query);
605+
' because it does not apply to winning auth query ' . $winningAuthQuery);
606606
}
607607
}
608608

0 commit comments

Comments
 (0)