Updating exception from ValueException to RegexArgumentsFailedException

microwin7 · Nov 30, 2024 · e2d4410 · e2d4410
1 parent 7618a3f
commit e2d4410
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/Exceptions/RegexArgumentsFailedException.php b/src/Exceptions/RegexArgumentsFailedException.php
@@ -8,4 +8,13 @@ public function __construct(string $message)
     {
         parent::__construct($message);
     }
+    public static function pattern(string $argument, string $regexp, mixed $argument_given): self
+    {
+        return new self(sprintf(
+            'Field "%s" should be valid with pattern: [%s], "%s" given',
+            $argument,
+            $regexp,
+            (string)$argument_given
+        ));
+    }
 }
diff --git a/src/Request/RequestParamsAbstract.php b/src/Request/RequestParamsAbstract.php
@@ -6,6 +6,7 @@
 
 use Microwin7\PHPUtils\Contracts\Enum\EnumInterface;
 use Microwin7\PHPUtils\Contracts\Enum\EnumRequestInterface;
+use Microwin7\PHPUtils\Exceptions\RegexArgumentsFailedException;
 use Microwin7\PHPUtils\Exceptions\RequiredArgumentMissingException;
 
 #[\AllowDynamicProperties]
@@ -58,7 +59,7 @@ protected function validateVariable(string $key, string $regexp): static
     {
         null === $this->arguments[$key]
             ?: filter_var($this->$key, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => $regexp]])
-            ?: throw new \ValueError(sprintf('Field "%s" should be valid with pattern: [%s], "%s" given', $key, $regexp, (string)$this->$key));
+            ?: throw RegexArgumentsFailedException::pattern($key, $regexp, (string)$this->$key);
         return $this;
     }
     /**
@@ -100,7 +101,7 @@ protected function addEnum(string $enumClass, bool $maybeDefault = false): stati
         }
     }
     /**
-     * @throws \ValueError
+     * @throws RegexArgumentsFailedException
      */
     protected function addVariable(string $key, string $regexp, bool $maybeNull = false): static
     {

diff --git a/src/Request/RequiredArguments.php b/src/Request/RequiredArguments.php
@@ -106,7 +106,7 @@ private function execute(): void
                         try {
                             $this->setVariable($oneFromAllArgumets);
                             $count++;
-                        } catch (RequiredArgumentMissingException $ignored) {
+                        } catch (RequiredArgumentMissingException) {
                             $this->with($oneFromAllArgumets, null);
                         }
                     }
@@ -177,12 +177,7 @@ protected function validateVariable(RegexArguments $regexArgument): void
             ?: (
                 !is_null($regexArgument->messageCallback)
                 ? throw new RegexArgumentsFailedException($regexArgument->messageCallback)
-                : throw new \ValueError(sprintf(
-                    'Field "%s" should be valid with pattern: [%s], "%s" given',
-                    $regexArgument->argument,
-                    $regexArgument->regexp,
-                    (string)$this->{$regexArgument->argument}
-                ))
+                : throw RegexArgumentsFailedException::pattern($regexArgument->argument, $regexArgument->regexp, $this->{$regexArgument->argument})
             );
     }
     /** @param string|int|bool|EnumRequestInterface|EnumInterface|\BackedEnum|non-empty-array<int|string, array<int|string, mixed>|string>|null $value */