projects
/
fsfdrupalauth.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7f0a5f4
)
fix function and attribute types
author
Andrew Engelbrecht
<andrew@fsf.org>
Thu, 3 Aug 2023 20:49:06 +0000
(16:49 -0400)
committer
root
<root@login0d.fsf.org>
Thu, 3 Aug 2023 20:49:06 +0000
(16:49 -0400)
lib/Auth/Source/FSFDrupalAuth.php
patch
|
blob
|
blame
|
history
diff --git
a/lib/Auth/Source/FSFDrupalAuth.php
b/lib/Auth/Source/FSFDrupalAuth.php
index efad30f068143a44d6cac06df9f96e1e32a369a5..57b5e40bdd3b02d52351371970ddd4ac88fa0a3e 100644
(file)
--- a/
lib/Auth/Source/FSFDrupalAuth.php
+++ b/
lib/Auth/Source/FSFDrupalAuth.php
@@
-37,7
+37,7
@@
class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
/**
* The options that we should connect to the database with.
*/
/**
* The options that we should connect to the database with.
*/
- private
string
$options;
+ private
array
$options;
/**
* The query we should use to retrieve the attributes for the user.
/**
* The query we should use to retrieve the attributes for the user.
@@
-144,6
+144,8
@@
class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
if (isset($config['options'])) {
$this->options = $config['options'];
if (isset($config['options'])) {
$this->options = $config['options'];
+ } else {
+ $this->options = [];
}
}
}
}
@@
-189,7
+191,7
@@
class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
* Check the password against a Drupal hash
*
*/
* Check the password against a Drupal hash
*
*/
- private function check_password(string $password, string $hash): bool
ean
{
+ private function check_password(string $password, string $hash): bool {
//
// The reason for running a separate process is so that the PHP global
//
// The reason for running a separate process is so that the PHP global
@@
-256,7
+258,7
@@
class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
* query the database with arbitrary queries that only require a user name.
*
*/
* query the database with arbitrary queries that only require a user name.
*
*/
- private function query_db(string $queryname,
string
$query_params): array
+ private function query_db(string $queryname,
array
$query_params): array
{
$db = $this->connect();
{
$db = $this->connect();
@@
-361,8
+363,8
@@
class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
* @param string $query_name Name of query in authsources
* @param array $extra_params Associative array of parameters to include in query
*/
* @param string $query_name Name of query in authsources
* @param array $extra_params Associative array of parameters to include in query
*/
- $donation_query = function (string $query_name, array $extra_params)
: array
-
use (string $username)
{
+ $donation_query = function (string $query_name, array $extra_params)
+
use ($username): array
{
$parameters = ['username' => $username];
$parameters = ['username' => $username];
@@
-375,7
+377,7
@@
class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
$old_membership_query = $donation_query;
$old_membership_query = $donation_query;
- $compare_res = function (array $result, int $amount):
void
{
+ $compare_res = function (array $result, int $amount):
bool
{
foreach ($result[0] as $key => $value) {
if (intval($value) >= $amount) {
return true;
foreach ($result[0] as $key => $value) {
if (intval($value) >= $amount) {
return true;
@@
-397,8
+399,8
@@
class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
// the time window with a single donation. this approximates whether
// the person was, or would have been, a member during the configured
// time window.
// the time window with a single donation. this approximates whether
// the person was, or would have been, a member during the configured
// time window.
- $nomination_process_analyze_history = function (array $selective_donations_history)
: boolean
-
use (string $nomination_process_start_date, string $nomination_process_end_date)
{
+ $nomination_process_analyze_history = function (array $selective_donations_history)
+
use ($nomination_process_start_date, $nomination_process_end_date): bool
{
$eligible = false;
$eligible = false;
@@
-444,8
+446,8
@@
class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
return false;
};
return false;
};
- $discussion_process_analyze_history = function (array $selective_donations_history)
: boolean
- use (
string $discussion_process_start_date, string $discussion_process_end_date)
{
+ $discussion_process_analyze_history = function (array $selective_donations_history)
+ use (
$discussion_process_start_date, $discussion_process_end_date): bool
{
$eligible = false;
$total = 0;
$eligible = false;
$total = 0;
@@
-591,7
+593,7
@@
class FSFDrupalAuth extends \SimpleSAML\Module\core\Auth\UserPassBase
* @param string $password The password the user wrote.
* @return array Associative array with the users attributes.
*/
* @param string $password The password the user wrote.
* @return array Associative array with the users attributes.
*/
- protected function login(
string $username, string $password): array
+ protected function login(
$username, $password)
{
//// keep this commented when it's not in use. it prints user passwords to the log file
{
//// keep this commented when it's not in use. it prints user passwords to the log file