archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-06-21 13:44:06 +00:00
Code Activity

update docblocks (methods were changed to static props), validate empty

Browse source 
strings
This commit is contained in:
Samuel Stancl 2026-06-09 19:05:31 -07:00
parent 4760ed9375
commit c9fa41111d
No known key found for this signature in database
GPG key ID: BA146259A1E16C57
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Database/Concerns/ValidatesDatabaseParameters.php
View file

@ -41,7 +41,7 @@ trait ValidatesDatabaseParameters
* only contains allowed characters before being used in SQL statements * only contains allowed characters before being used in SQL statements
* (or paths in the case of SQLiteDatabaseManager). * (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 * @throws InvalidArgumentException
*/ */
@ -56,10 +56,13 @@ trait ValidatesDatabaseParameters
} }
if (! is_string($parameter)) { 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.'); throw new InvalidArgumentException('Parameter has to be a string.');
} }
if ($parameter === '') {
throw new InvalidArgumentException('Parameter cannot be an empty string.');
}
$allowedCharacters ??= static::$allowedParameterCharacters; $allowedCharacters ??= static::$allowedParameterCharacters;
foreach (str_split($parameter) as $character) { 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. * before being used in SQL statements.
* *
* Used in permission controlled managers as a shorthand for calling validateParameter() * Used in permission controlled managers as a shorthand for calling validateParameter()
@ -81,7 +84,11 @@ trait ValidatesDatabaseParameters
protected function validatePassword(string|null $password): void protected function validatePassword(string|null $password): void
{ {
if (is_null($password)) { 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); $this->validateParameter($password, allowedCharacters: static::$allowedPasswordCharacters);