chore: spread comparison rules options

Author: andrepimpao

src/Rule/AbstractComparisonRule.php

@@ -20,7 +20,7 @@ public function assert(mixed $value, string $name): void
 
         if (!$this->compareValues($value, $this->constraint)) {
             throw new ($this->getException())(
-                message: $this->options['message'],
+                message: $this->message,
                 parameters: [
                     'value' => $value,
                     'name' => $name,

src/Rule/GreaterThan.php

@@ -3,24 +3,17 @@
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\GreaterThanException;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class GreaterThan extends AbstractComparisonRule implements RuleInterface
 {
-    protected array $options;
+    protected string $message;
 
     public function __construct(
         protected readonly mixed $constraint,
-        array $options = []
+        ?string $message = null
     )
     {
-        $resolver = new OptionsResolver();
-
-        $resolver->setDefaults(['message' => 'The "{{ name }}" value should be greater than "{{ constraint }}", "{{ value }}" given.']);
-
-        $resolver->setAllowedTypes('message', 'string');
-
-        $this->options = $resolver->resolve($options);
+        $this->message = $message ?? 'The "{{ name }}" value should be greater than "{{ constraint }}", "{{ value }}" given.';
     }
 
     protected function compareValues(mixed $value1, mixed $value2): bool

src/Rule/GreaterThanOrEqual.php

@@ -3,24 +3,17 @@
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\GreaterThanOrEqualException;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class GreaterThanOrEqual extends AbstractComparisonRule implements RuleInterface
 {
-    protected array $options;
+    protected string $message;
 
     public function __construct(
         protected readonly mixed $constraint,
-        array $options = []
+        ?string $message = null
     )
     {
-        $resolver = new OptionsResolver();
-
-        $resolver->setDefaults(['message' => 'The "{{ name }}" value should be greater than or equal to "{{ constraint }}", "{{ value }}" given.']);
-
-        $resolver->setAllowedTypes('message', 'string');
-
-        $this->options = $resolver->resolve($options);
+        $this->message = $message ?? 'The "{{ name }}" value should be greater than or equal to "{{ constraint }}", "{{ value }}" given.';
     }
 
     protected function compareValues(mixed $value1, mixed $value2): bool

src/Rule/LessThan.php

@@ -3,24 +3,17 @@
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\LessThanException;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class LessThan extends AbstractComparisonRule implements RuleInterface
 {
-    protected array $options;
+    protected string $message;
 
     public function __construct(
         protected readonly mixed $constraint,
-        array $options = []
+        ?string $message = null
     )
     {
-        $resolver = new OptionsResolver();
-
-        $resolver->setDefaults(['message' => 'The "{{ name }}" value should be less than "{{ constraint }}", "{{ value }}" given.']);
-
-        $resolver->setAllowedTypes('message', 'string');
-
-        $this->options = $resolver->resolve($options);
+        $this->message = $message ?? 'The "{{ name }}" value should be less than "{{ constraint }}", "{{ value }}" given.';
     }
 
     protected function compareValues(mixed $value1, mixed $value2): bool

src/Rule/LessThanOrEqual.php

@@ -3,24 +3,17 @@
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\LessThanOrEqualException;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class LessThanOrEqual extends AbstractComparisonRule implements RuleInterface
 {
-    protected array $options;
+    protected string $message;
 
     public function __construct(
         protected readonly mixed $constraint,
-        array $options = []
+        ?string $message = null
     )
     {
-        $resolver = new OptionsResolver();
-
-        $resolver->setDefaults(['message' => 'The "{{ name }}" value should be less than or equal to "{{ constraint }}", "{{ value }}" given.']);
-
-        $resolver->setAllowedTypes('message', 'string');
-
-        $this->options = $resolver->resolve($options);
+        $this->message = $message ?? 'The "{{ name }}" value should be less than or equal to "{{ constraint }}", "{{ value }}" given.';
     }
 
     protected function compareValues(mixed $value1, mixed $value2): bool

src/Rule/Range.php

@@ -7,27 +7,20 @@
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\UnexpectedValueException;
 use ProgrammatorDev\YetAnotherPhpValidator\Rule\Util\ComparableTrait;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class Range extends AbstractRule implements RuleInterface
 {
     use ComparableTrait;
 
-    private array $options;
+    private string $message;
 
     public function __construct(
         private readonly mixed $minConstraint,
         private readonly mixed $maxConstraint,
-        array $options = []
+        ?string $message = null
     )
     {
-        $resolver = new OptionsResolver();
-
-        $resolver->setDefaults(['message' => 'The "{{ name }}" value should be between "{{ minConstraint }}" and "{{ maxConstraint }}", "{{ value }}" given.']);
-
-        $resolver->setAllowedTypes('message', 'string');
-
-        $this->options = $resolver->resolve($options);
+        $this->message = $message ?? 'The "{{ name }}" value should be between "{{ minConstraint }}" and "{{ maxConstraint }}", "{{ value }}" given.';
     }
 
     public function assert(mixed $value, string $name): void
@@ -54,7 +47,7 @@ public function assert(mixed $value, string $name): void
                 ->validate($value)
         ) {
             throw new RangeException(
-                message: $this->options['message'],
+                message: $this->message,
                 parameters: [
                     'value' => $value,
                     'name' => $name,

tests/GreaterThanOrEqualTest.php

@@ -60,10 +60,10 @@ public static function provideRuleMessageOptionData(): \Generator
         yield 'message' => [
             new GreaterThanOrEqual(
                 constraint: 10,
-                options: [
-                    'message' => 'The "{{ name }}" value "{{ value }}" is not greater than or equal to "{{ constraint }}".'
-                ]
-            ), 1, 'The "test" value "1" is not greater than or equal to "10".'
+                message: 'The "{{ name }}" value "{{ value }}" is not greater than or equal to "{{ constraint }}".'
+            ),
+            1,
+            'The "test" value "1" is not greater than or equal to "10".'
         ];
     }
 }

tests/GreaterThanTest.php

@@ -60,10 +60,10 @@ public static function provideRuleMessageOptionData(): \Generator
         yield 'message' => [
             new GreaterThan(
                 constraint: 10,
-                options: [
-                    'message' => 'The "{{ name }}" value "{{ value }}" is not greater than "{{ constraint }}".'
-                ]
-            ), 1, 'The "test" value "1" is not greater than "10".'
+                message: 'The "{{ name }}" value "{{ value }}" is not greater than "{{ constraint }}".'
+            ),
+            1,
+            'The "test" value "1" is not greater than "10".'
         ];
     }
 }

tests/LessThanOrEqualTest.php

@@ -60,10 +60,10 @@ public static function provideRuleMessageOptionData(): \Generator
         yield 'message' => [
             new LessThanOrEqual(
                 constraint: 10,
-                options: [
-                    'message' => 'The "{{ name }}" value "{{ value }}" is not less than or equal to "{{ constraint }}".'
-                ]
-            ), 20, 'The "test" value "20" is not less than or equal to "10".'
+                message: 'The "{{ name }}" value "{{ value }}" is not less than or equal to "{{ constraint }}".'
+            ),
+            20,
+            'The "test" value "20" is not less than or equal to "10".'
         ];
     }
 }

tests/LessThanTest.php

@@ -60,10 +60,10 @@ public static function provideRuleMessageOptionData(): \Generator
         yield 'message' => [
             new LessThan(
                 constraint: 10,
-                options: [
-                    'message' => 'The "{{ name }}" value "{{ value }}" is not less than "{{ constraint }}".'
-                ]
-            ), 20, 'The "test" value "20" is not less than "10".'
+                message: 'The "{{ name }}" value "{{ value }}" is not less than "{{ constraint }}".'
+            ),
+            20,
+            'The "test" value "20" is not less than "10".'
         ];
     }
 }