From 740d53e9cc1dd861c2e8584bd76ff28e050eef4f Mon Sep 17 00:00:00 2001 From: lukinovec Date: Wed, 29 Apr 2026 17:25:15 +0200 Subject: [PATCH] Rename ValidatesSqlParameters to ValidatesDatabaseParameters --- ...datesSqlParameters.php => ValidatesDatabaseParameters.php} | 4 +--- src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php | 4 ++-- src/Database/TenantDatabaseManagers/TenantDatabaseManager.php | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) rename src/Database/Concerns/{ValidatesSqlParameters.php => ValidatesDatabaseParameters.php} (91%) diff --git a/src/Database/Concerns/ValidatesSqlParameters.php b/src/Database/Concerns/ValidatesDatabaseParameters.php similarity index 91% rename from src/Database/Concerns/ValidatesSqlParameters.php rename to src/Database/Concerns/ValidatesDatabaseParameters.php index ad61e8f4..d42551d8 100644 --- a/src/Database/Concerns/ValidatesSqlParameters.php +++ b/src/Database/Concerns/ValidatesDatabaseParameters.php @@ -6,9 +6,7 @@ namespace Stancl\Tenancy\Database\Concerns; use InvalidArgumentException; -// todo@validation this trait's name might be a bit misleading -// it suggests validating parameters for SQL statements, but it is also used in SQLiteDatabaseManager to validate the database file name -trait ValidatesSqlParameters +trait ValidatesDatabaseParameters { /** * Characters allowed in the parameters. diff --git a/src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php b/src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php index e4e6ab76..ab9325c9 100644 --- a/src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php +++ b/src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php @@ -7,14 +7,14 @@ namespace Stancl\Tenancy\Database\TenantDatabaseManagers; use Closure; use Illuminate\Database\Eloquent\Model; use PDO; -use Stancl\Tenancy\Database\Concerns\ValidatesSqlParameters; +use Stancl\Tenancy\Database\Concerns\ValidatesDatabaseParameters; use Stancl\Tenancy\Database\Contracts\TenantDatabaseManager; use Stancl\Tenancy\Database\Contracts\TenantWithDatabase; use Throwable; class SQLiteDatabaseManager implements TenantDatabaseManager { - use ValidatesSqlParameters; + use ValidatesDatabaseParameters; /** * SQLite database directory path. diff --git a/src/Database/TenantDatabaseManagers/TenantDatabaseManager.php b/src/Database/TenantDatabaseManagers/TenantDatabaseManager.php index 6c520e5e..a0822615 100644 --- a/src/Database/TenantDatabaseManagers/TenantDatabaseManager.php +++ b/src/Database/TenantDatabaseManagers/TenantDatabaseManager.php @@ -6,13 +6,13 @@ namespace Stancl\Tenancy\Database\TenantDatabaseManagers; use Illuminate\Database\Connection; use Illuminate\Support\Facades\DB; -use Stancl\Tenancy\Database\Concerns\ValidatesSqlParameters; +use Stancl\Tenancy\Database\Concerns\ValidatesDatabaseParameters; use Stancl\Tenancy\Database\Contracts\StatefulTenantDatabaseManager; use Stancl\Tenancy\Database\Exceptions\NoConnectionSetException; abstract class TenantDatabaseManager implements StatefulTenantDatabaseManager { - use ValidatesSqlParameters; + use ValidatesDatabaseParameters; /** The database connection to the server. */ protected string $connection;