From e8168eb0b906c8ff9a8edbe274d59cb222eab4c4 Mon Sep 17 00:00:00 2001 From: lukinovec Date: Fri, 1 May 2026 09:16:17 +0200 Subject: [PATCH] Add string check to validateFilename, swap validation order Validate characters first, only then throw if the filename is a directory. --- src/Database/Concerns/ValidatesDatabaseParameters.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Database/Concerns/ValidatesDatabaseParameters.php b/src/Database/Concerns/ValidatesDatabaseParameters.php index a39e8b1b..90807e4b 100644 --- a/src/Database/Concerns/ValidatesDatabaseParameters.php +++ b/src/Database/Concerns/ValidatesDatabaseParameters.php @@ -105,10 +105,10 @@ trait ValidatesDatabaseParameters */ protected function validateFilename(string|null $filename): void { - if (is_dir($filename)) { + $this->validateParameter($filename, static::allowedFilenameCharacters()); + + if (is_string($filename) && is_dir($filename)) { throw new InvalidArgumentException("Filename '{$filename}' is a directory."); } - - $this->validateParameter($filename, static::allowedFilenameCharacters()); } }