From 429e0985fd284b754c72a37dc50253f2764e6249 Mon Sep 17 00:00:00 2001 From: lukinovec Date: Fri, 1 May 2026 15:17:38 +0200 Subject: [PATCH] Improve code quality and comments --- src/Database/Concerns/ValidatesDatabaseParameters.php | 5 +++-- .../TenantDatabaseManagers/SQLiteDatabaseManager.php | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Database/Concerns/ValidatesDatabaseParameters.php b/src/Database/Concerns/ValidatesDatabaseParameters.php index 0a8e6d9d..0b1ce746 100644 --- a/src/Database/Concerns/ValidatesDatabaseParameters.php +++ b/src/Database/Concerns/ValidatesDatabaseParameters.php @@ -20,7 +20,7 @@ trait ValidatesDatabaseParameters /** * Characters allowed in parameters. * - * Used as the default allowlist for validateParameter(), which validates non-password + * Used as the default allowlist in validateParameter(), which validates non-password * parameters such as database names or usernames. */ protected static function allowedParameterCharacters(): string @@ -44,7 +44,7 @@ trait ValidatesDatabaseParameters /** * Ensure that parameters (database names, usernames, etc.) * only contain allowed characters before used in SQL statements - * (or file names in the case of SQLiteDatabaseManager). + * (or paths in the case of SQLiteDatabaseManager). * * By default, only the characters in static::allowedParameterCharacters() are allowed. * @@ -65,6 +65,7 @@ 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.'); } diff --git a/src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php b/src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php index d0e16cd4..8f52a9ed 100644 --- a/src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php +++ b/src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php @@ -130,11 +130,7 @@ class SQLiteDatabaseManager implements TenantDatabaseManager public function databaseExists(string $name): bool { - if ($this->isInMemory($name)) { - return true; - } - - return file_exists($this->getPath($name)); + return $this->isInMemory($name) || file_exists($this->getPath($name)); } public function makeConnectionConfig(array $baseConfig, string $databaseName): array