chore: refactored common message exceptions

Author: andrepimpao

src/Exception/UnexpectedOptionException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace ProgrammatorDev\YetAnotherPhpValidator\Exception;
+
+class UnexpectedOptionException extends UnexpectedValueException
+{
+    public function __construct(string $name, array $expected, string $given)
+    {
+        $message = \sprintf('Invalid %s "%s". Accepted values are: "%s".', $name, $given, \implode(", ", $expected));
+
+        parent::__construct($message);
+    }
+}

src/Exception/UnexpectedTypeException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace ProgrammatorDev\YetAnotherPhpValidator\Exception;
+
+class UnexpectedTypeException extends UnexpectedValueException
+{
+    public function __construct(string $expected, string $given)
+    {
+        $message = \sprintf('Expected value of type "%s", "%s" given.', $expected, $given);
+
+        parent::__construct($message);
+    }
+}

src/Rule/Choice.php

@@ -3,6 +3,7 @@
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ChoiceException;
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedTypeException;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedValueException;
 
 class Choice extends AbstractRule implements RuleInterface
@@ -21,9 +22,7 @@ public function __construct(
     public function assert(mixed $value, ?string $name = null): void
     {
         if ($this->multiple && !\is_array($value)) {
-            throw new UnexpectedValueException(
-                \sprintf('Expected value of type "array" when using multiple choices, "%s" given', get_debug_type($value))
-            );
+            throw new UnexpectedTypeException('array', get_debug_type($value));
         }
 
         if (

src/Rule/Country.php

@@ -3,7 +3,8 @@
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\CountryException;
-use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedValueException;
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedOptionException;
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedTypeException;
 use Symfony\Component\Intl\Countries;
 
 class Country extends AbstractRule implements RuleInterface
@@ -24,19 +25,11 @@ public function __construct(
     public function assert(mixed $value, ?string $name = null): void
     {
         if (!\in_array($this->code, self::CODE_OPTIONS)) {
-            throw new UnexpectedValueException(
-                \sprintf(
-                    'Invalid code "%s". Accepted values are: "%s".',
-                    $this->code,
-                    \implode(", ", self::CODE_OPTIONS)
-                )
-            );
+            throw new UnexpectedOptionException('code', self::CODE_OPTIONS, $this->code);
         }
 
         if (!\is_string($value)) {
-            throw new UnexpectedValueException(
-                \sprintf('Expected value of type "string", "%s" given.', get_debug_type($value))
-            );
+            throw new UnexpectedTypeException('string', get_debug_type($value));
         }
 
         // Keep original value for parameters

src/Rule/EachKey.php

@@ -3,7 +3,7 @@
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\EachKeyException;
-use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedValueException;
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedTypeException;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
@@ -17,9 +17,7 @@ public function __construct(
     public function assert(mixed $value, ?string $name = null): void
     {
         if (!\is_iterable($value)) {
-            throw new UnexpectedValueException(
-                \sprintf('Expected value of type "array|\Traversable", "%s" given.', get_debug_type($value))
-            );
+            throw new UnexpectedTypeException('array|\Traversable', get_debug_type($value));
         }
 
         try {

src/Rule/EachValue.php

@@ -3,7 +3,7 @@
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\EachValueException;
-use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedValueException;
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedTypeException;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
@@ -17,9 +17,7 @@ public function __construct(
     public function assert(mixed $value, ?string $name = null): void
     {
         if (!\is_iterable($value)) {
-            throw new UnexpectedValueException(
-                \sprintf('Expected value of type "array|\Traversable", "%s" given.', get_debug_type($value))
-            );
+            throw new UnexpectedTypeException('array|\Traversable', get_debug_type($value));
         }
 
         try {

src/Rule/Type.php

@@ -3,7 +3,7 @@
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\TypeException;
-use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedValueException;
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedOptionException;
 
 class Type extends AbstractRule implements RuleInterface
 {
@@ -88,13 +88,7 @@ public function assert(mixed $value, ?string $name = null): void
             }
 
             if (!isset(self::TYPE_FUNCTIONS[$constraint]) && !\class_exists($constraint) && !\interface_exists($constraint)) {
-                throw new UnexpectedValueException(
-                    \sprintf(
-                        'Invalid constraint type "%s". Accepted values are: "%s"',
-                        $constraint,
-                        \implode('", "', \array_keys(self::TYPE_FUNCTIONS))
-                    )
-                );
+                throw new UnexpectedOptionException('constraint type', self::TYPE_FUNCTIONS, $constraint);
             }
         }
 

tests/ChoiceTest.php

@@ -19,7 +19,7 @@ class ChoiceTest extends AbstractTest
     public static function provideRuleUnexpectedValueData(): \Generator
     {
         $constraints = [1, 2, 3, 4, 5];
-        $multipleMessage = '/Expected value of type "array" when using multiple choices, "(.*)" given/';
+        $multipleMessage = '/Expected value of type "array", "(.*)" given/';
         $constraintMessage = '/Max constraint value must be greater than or equal to min constraint value./';
 
         yield 'multiple not array' => [new Choice($constraints, true), 1, $multipleMessage];