chore: spread NotBlank options

Author: andrepimpao

src/Rule/NotBlank.php

@@ -3,25 +3,21 @@
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\NotBlankException;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class NotBlank extends AbstractRule implements RuleInterface
 {
-    private array $options;
+    // Using array to bypass unallowed callable type in properties
+    private ?array $normalizer = null;
 
-    public function __construct(array $options = [])
-    {
-        $resolver = new OptionsResolver();
-
-        $resolver->setDefaults([
-            'normalizer' => null,
-            'message' => 'The "{{ name }}" value should not be blank, "{{ value }}" given.'
-        ]);
+    private ?string $message;
 
-        $resolver->setAllowedTypes('normalizer', ['null', 'callable']);
-        $resolver->setAllowedTypes('message', 'string');
-
-        $this->options = $resolver->resolve($options);
+    public function __construct(
+        ?callable $normalizer = null,
+        ?string $message = null
+    )
+    {
+        $this->normalizer['callable'] = $normalizer;
+        $this->message = $message ?? 'The "{{ name }}" value should not be blank, "{{ value }}" given.';
     }
 
     /**
@@ -33,14 +29,14 @@ public function assert(mixed $value, string $name): void
         $input = $value;
 
         // Call normalizer if provided
-        if ($this->options['normalizer'] !== null) {
-            $input = ($this->options['normalizer'])($input);
+        if ($this->normalizer['callable'] !== null) {
+            $input = ($this->normalizer['callable'])($input);
         }
 
         // Do not allow null, false, [] and ''
         if ($input === false || (empty($input) && $input != '0')) {
             throw new NotBlankException(
-                message: $this->options['message'],
+                message: $this->message,
                 parameters: [
                     'value' => $value,
                     'name' => $name

tests/NotBlankTest.php

@@ -24,7 +24,8 @@ public static function provideRuleFailureConditionData(): \Generator
         yield 'blank string' => [new NotBlank(), '', $exception, $exceptionMessage];
         yield 'blank array' => [new NotBlank(), [], $exception, $exceptionMessage];
 
-        yield 'normalizer whitespace' => [new NotBlank(['normalizer' => 'trim']), ' ', $exception, $exceptionMessage];
+        yield 'normalizer whitespace' => [new NotBlank(normalizer: 'trim'), ' ', $exception, $exceptionMessage];
+        yield 'normalizer whitespace function' => [new NotBlank(normalizer: fn($value) => trim($value)), ' ', $exception, $exceptionMessage];
     }
 
     public static function provideRuleSuccessConditionData(): \Generator
@@ -47,11 +48,9 @@ public static function provideRuleSuccessConditionData(): \Generator
     public static function provideRuleMessageOptionData(): \Generator
     {
         yield 'message' => [
-            new NotBlank(
-                options: [
-                    'message' => 'The "{{ name }}" value "{{ value }}" is not blank.'
-                ]
-            ), '', 'The "test" value "" is not blank.'
+            new NotBlank(message: 'The "{{ name }}" value "{{ value }}" is not blank.'),
+            '',
+            'The "test" value "" is not blank.'
         ];
     }
 }