1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-05-06 19:04:04 +00:00

Make validateParameter have void return type

This commit is contained in:
lukinovec 2026-04-30 09:28:48 +02:00
parent f3f1ab977a
commit 75b74f2e6c
8 changed files with 38 additions and 22 deletions

View file

@ -47,13 +47,13 @@ trait ValidatesDatabaseParameters
*
* @throws InvalidArgumentException
*/
protected function validateParameter(string|array|null $parameters, string|null $allowlist = null): string|array|null
protected function validateParameter(string|array|null $parameters, string|null $allowlist = null): void
{
if (is_null($parameters)) {
// Return null if there's nothing to validate
// Return early if there's nothing to validate
// (e.g. when $databaseConfig->getUsername() of an
// improperly created tenant is passed).
return null;
return;
}
$allowlist = $allowlist ?? static::parameterAllowlist();
@ -69,12 +69,6 @@ trait ValidatesDatabaseParameters
}
}
}
throw new InvalidArgumentException("Invalid character '{$char}' in parameter: {$parameter}");
}
}
}
return $parameters;
}
/**
@ -84,8 +78,8 @@ trait ValidatesDatabaseParameters
*
* @throws InvalidArgumentException
*/
protected function validatePassword(string|null $password): string|null
protected function validatePassword(string|null $password): void
{
return $this->validateParameter($password, static::passwordAllowlist());
$this->validateParameter($password, static::passwordAllowlist());
}
}