Merge pull request #8 from programmatordev/YAPV-9-create-range-rule

Create Range rule (unfinished)

Author: andrepimpao

src/ChainedValidatorInterface.php

@@ -22,4 +22,6 @@ public function greaterThan(mixed $constraint, array $options = []): ChainedVali
     public function lessThan(mixed $constraint, array $options = []): ChainedValidatorInterface;
 
     public function choice(array $constraints, bool $multiple = false, ?int $minConstraint = null, ?int $maxConstraint = null, array $options = []): ChainedValidatorInterface;
+
+    public function range(mixed $minConstraint, mixed $maxConstraint, array $options = []): ChainedValidatorInterface;
 }

src/Exception/RangeException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace ProgrammatorDev\YetAnotherPhpValidator\Exception;
+
+class RangeException extends ValidationException {}

src/Rule/Choice.php

@@ -23,14 +23,14 @@ public function __construct(
         $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 }}".',
-            'maxMessage' => 'The "{{ name }}" value must have at most {{ maxConstraint }} choices, {{ numValues }} choices given.',
-            'minMessage' => 'The "{{ name }}" value must have at least {{ minConstraint }} choices, {{ numValues }} choices given.'
+            '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('maxMessage', 'string');
         $resolver->setAllowedTypes('minMessage', 'string');
+        $resolver->setAllowedTypes('maxMessage', 'string');
 
         $this->options = $resolver->resolve($options);
     }

src/Rule/GreaterThan.php

@@ -28,7 +28,6 @@ public function __construct(private readonly mixed $constraint, array $options =
      */
     public function assert(mixed $value, string $name): void
     {
-        // Assert if constraint and value can be compared
         $this->assertIsComparable($this->constraint, $value);
 
         if (!($value > $this->constraint)) {

src/Rule/LessThan.php

@@ -28,7 +28,6 @@ public function __construct(private readonly mixed $constraint, array $options =
      */
     public function assert(mixed $value, string $name): void
     {
-        // Assert if constraint and value can be compared
         $this->assertIsComparable($this->constraint, $value);
 
         if (!($value < $this->constraint)) {

src/Rule/Range.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
+
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\RangeException;
+use ProgrammatorDev\YetAnotherPhpValidator\Rule\Util\AssertIsComparableTrait;
+use ProgrammatorDev\YetAnotherPhpValidator\Validator;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class Range extends AbstractRule implements RuleInterface
+{
+    use AssertIsComparableTrait;
+
+    private array $options;
+
+    public function __construct(
+        private readonly mixed $minConstraint,
+        private readonly mixed $maxConstraint,
+        array $options = []
+    )
+    {
+        $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);
+    }
+
+    public function assert(mixed $value, string $name): void
+    {
+        $this->assertIsComparable($this->minConstraint, $this->maxConstraint);
+
+        if (!Validator::greaterThan($this->minConstraint)->lessThan($this->maxConstraint)->validate($value)) {
+            throw new RangeException(
+                message: $this->options['message'],
+                parameters: [
+                    'value' => $value,
+                    'name' => $name,
+                    'minConstraint' => $this->minConstraint,
+                    'maxConstraint' => $this->maxConstraint
+                ]
+            );
+        }
+    }
+}

src/StaticValidatorInterface.php

@@ -11,4 +11,6 @@ public static function greaterThan(mixed $constraint, array $options = []): Chai
     public static function lessThan(mixed $constraint, array $options = []): ChainedValidatorInterface;
 
     public static function choice(array $constraints, bool $multiple = false, ?int $minConstraint = null, ?int $maxConstraint = null, array $options = []): ChainedValidatorInterface;
+
+    public static function range(mixed $minConstraint, mixed $maxConstraint, array $options = []): ChainedValidatorInterface;
 }