chore: spread Choice options

Author: andrepimpao

composer.json

@@ -12,8 +12,7 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
-        "symfony/options-resolver": "^6.3"
+        "php": ">=8.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",

src/Rule/Choice.php

@@ -4,35 +4,32 @@
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ChoiceException;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedValueException;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class Choice extends AbstractRule implements RuleInterface
 {
-    private array $options;
+    private string $message;
+
+    private string $multipleMessage;
+
+    private string $minMessage;
+
+    private string $maxMessage;
 
     public function __construct(
         private readonly array $constraints,
         private readonly bool $multiple = false,
         private readonly ?int $minConstraint = null,
         private readonly ?int $maxConstraint = null,
-        array $options = []
+        ?string $message = null,
+        ?string $multipleMessage = null,
+        ?string $minMessage = null,
+        ?string $maxMessage = null
     )
     {
-        $resolver = new OptionsResolver();
-
-        $resolver->setDefaults([
-            'message' => 'The "{{ name }}" value is not a valid choice, "{{ value }}" given. Accepted values are: "{{ constraints }}".',
-            'multipleMessage' => 'The "{{ name }}" value has one or more invalid choices, "{{ value }}" given. Accepted values are: "{{ constraints }}".',
-            'minMessage' => 'The "{{ name }}" value must have at least {{ minConstraint }} choices, {{ numValues }} choices given.',
-            'maxMessage' => 'The "{{ name }}" value must have at most {{ maxConstraint }} choices, {{ numValues }} choices given.'
-        ]);
-
-        $resolver->setAllowedTypes('message', 'string');
-        $resolver->setAllowedTypes('multipleMessage', 'string');
-        $resolver->setAllowedTypes('minMessage', 'string');
-        $resolver->setAllowedTypes('maxMessage', 'string');
-
-        $this->options = $resolver->resolve($options);
+        $this->message = $message ?? 'The "{{ name }}" value is not a valid choice, "{{ value }}" given. Accepted values are: "{{ constraints }}".';
+        $this->multipleMessage = $multipleMessage ?? 'The "{{ name }}" value has one or more invalid choices, "{{ value }}" given. Accepted values are: "{{ constraints }}".';
+        $this->minMessage = $minMessage ?? 'The "{{ name }}" value must have at least {{ minConstraint }} choices, {{ numValues }} choices given.';
+        $this->maxMessage = $maxMessage ?? 'The "{{ name }}" value must have at most {{ maxConstraint }} choices, {{ numValues }} choices given.';
     }
 
     public function assert(mixed $value, string $name): void
@@ -58,7 +55,7 @@ public function assert(mixed $value, string $name): void
             foreach ($value as $input) {
                 if (!\in_array($input, $this->constraints, true)) {
                     throw new ChoiceException(
-                        message: $this->options['multipleMessage'],
+                        message: $this->multipleMessage,
                         parameters: [
                             'value' => $value,
                             'name' => $name,
@@ -72,7 +69,7 @@ public function assert(mixed $value, string $name): void
 
             if ($this->minConstraint !== null && $numValues < $this->minConstraint) {
                 throw new ChoiceException(
-                    message: $this->options['minMessage'],
+                    message: $this->minMessage,
                     parameters: [
                         'value' => $value,
                         'numValues' => $numValues,
@@ -86,7 +83,7 @@ public function assert(mixed $value, string $name): void
 
             if ($this->maxConstraint !== null && $numValues > $this->maxConstraint) {
                 throw new ChoiceException(
-                    message: $this->options['maxMessage'],
+                    message: $this->maxMessage,
                     parameters: [
                         'value' => $value,
                         'numValues' => $numValues,
@@ -100,7 +97,7 @@ public function assert(mixed $value, string $name): void
         }
         else if (!\in_array($value, $this->constraints, true)) {
             throw new ChoiceException(
-                message: $this->options['message'],
+                message: $this->message,
                 parameters: [
                     'value' => $value,
                     'name' => $name,

tests/ChoiceTest.php

@@ -64,39 +64,39 @@ public static function provideRuleMessageOptionData(): \Generator
         yield 'message' => [
             new Choice(
                 constraints: $constraints,
-                options: [
-                    'message' => 'The "{{ name }}" value "{{ value }}" is not a valid choice.'
-                ]
-            ), 10, 'The "test" value "10" is not a valid choice.'
+                message: 'The "{{ name }}" value "{{ value }}" is not a valid choice.'
+            ),
+            10,
+            'The "test" value "10" is not a valid choice.'
         ];
         yield 'multiple message' => [
             new Choice(
                 constraints: $constraints,
                 multiple: true,
-                options: [
-                    'multipleMessage' => 'The "{{ name }}" value "{{ value }}" is not a valid choice.'
-                ]
-            ), [10], 'The "test" value "[10]" is not a valid choice.'
+                multipleMessage: 'The "{{ name }}" value "{{ value }}" is not a valid choice.'
+            ),
+            [10],
+            'The "test" value "[10]" is not a valid choice.'
         ];
         yield 'min message' => [
             new Choice(
                 constraints: $constraints,
                 multiple: true,
                 minConstraint: 2,
-                options: [
-                    'minMessage' => 'The "{{ name }}" value should have at least {{ minConstraint }} choices.'
-                ]
-            ), [1], 'The "test" value should have at least 2 choices.'
+                minMessage: 'The "{{ name }}" value should have at least {{ minConstraint }} choices.'
+            ),
+            [1],
+            'The "test" value should have at least 2 choices.'
         ];
         yield 'max message' => [
             new Choice(
                 constraints: $constraints,
                 multiple: true,
                 maxConstraint: 2,
-                options: [
-                    'maxMessage' => 'The "{{ name }}" value should have at most {{ maxConstraint }} choices.'
-                ]
-            ), [1, 2, 3], 'The "test" value should have at most 2 choices.'
+                maxMessage: 'The "{{ name }}" value should have at most {{ maxConstraint }} choices.'
+            ),
+            [1, 2, 3],
+            'The "test" value should have at most 2 choices.'
         ];
     }