mirror of
https://github.com/archtechx/tenancy.git
synced 2026-06-21 04:04:03 +00:00
update docblocks (methods were changed to static props), validate empty
strings
This commit is contained in:
parent
4760ed9375
commit
c9fa41111d
1 changed files with 11 additions and 4 deletions
|
|
@ -41,7 +41,7 @@ trait ValidatesDatabaseParameters
|
|||
* only contains allowed characters before being used in SQL statements
|
||||
* (or paths in the case of SQLiteDatabaseManager).
|
||||
*
|
||||
* By default, only the characters in allowedParameterCharacters() are allowed.
|
||||
* By default, only the characters in $allowedParameterCharacters are allowed.
|
||||
*
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
|
|
@ -56,10 +56,13 @@ trait ValidatesDatabaseParameters
|
|||
}
|
||||
|
||||
if (! is_string($parameter)) {
|
||||
// E.g. if a parameter is retrieved from the config, it isn't necessarily a string
|
||||
throw new InvalidArgumentException('Parameter has to be a string.');
|
||||
}
|
||||
|
||||
if ($parameter === '') {
|
||||
throw new InvalidArgumentException('Parameter cannot be an empty string.');
|
||||
}
|
||||
|
||||
$allowedCharacters ??= static::$allowedParameterCharacters;
|
||||
|
||||
foreach (str_split($parameter) as $character) {
|
||||
|
|
@ -70,7 +73,7 @@ trait ValidatesDatabaseParameters
|
|||
}
|
||||
|
||||
/**
|
||||
* Ensure password only contains allowed characters (allowedPasswordCharacters())
|
||||
* Ensure password only contains allowed characters ($allowedPasswordCharacters)
|
||||
* before being used in SQL statements.
|
||||
*
|
||||
* Used in permission controlled managers as a shorthand for calling validateParameter()
|
||||
|
|
@ -81,7 +84,11 @@ trait ValidatesDatabaseParameters
|
|||
protected function validatePassword(string|null $password): void
|
||||
{
|
||||
if (is_null($password)) {
|
||||
throw new InvalidArgumentException('Parameter cannot be null.');
|
||||
throw new InvalidArgumentException('Password cannot be null.');
|
||||
}
|
||||
|
||||
if ($password === '') {
|
||||
throw new InvalidArgumentException('Password cannot be an empty string.');
|
||||
}
|
||||
|
||||
$this->validateParameter($password, allowedCharacters: static::$allowedPasswordCharacters);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue