chore: improved normalizer handling

Author: andrepimpao

src/Rule/Count.php

@@ -47,7 +47,7 @@ public function assert(mixed $value, ?string $name = null): void
         $numElements = \count($value);
 
         if ($this->min !== null && $numElements < $this->min) {
-            $message = $this->min === $this->max ? $this->exactMessage : $this->minMessage;
+            $message = ($this->min === $this->max) ? $this->exactMessage : $this->minMessage;
 
             throw new CountException(
                 message: $message,
@@ -62,7 +62,7 @@ public function assert(mixed $value, ?string $name = null): void
         }
 
         if ($this->max !== null && $numElements > $this->max) {
-            $message = $this->min === $this->max ? $this->exactMessage : $this->maxMessage;
+            $message = ($this->min === $this->max) ? $this->exactMessage : $this->maxMessage;
 
             throw new CountException(
                 message: $message,

src/Rule/Email.php

@@ -25,8 +25,8 @@ class Email extends AbstractRule implements RuleInterface
         self::MODE_HTML5_ALLOW_NO_TLD => '/^[a-zA-Z0-9.!#$%&\'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/'
     ];
 
-    // Using array to bypass unallowed callable type in properties
-    private array $normalizer;
+    /** @var ?callable */
+    private $normalizer;
     private string $message = 'The {{ name }} value is not a valid email address, {{ value }} given.';
 
     public function __construct(
@@ -35,7 +35,7 @@ public function __construct(
         ?string $message = null
     )
     {
-        $this->normalizer['callable'] = $normalizer;
+        $this->normalizer = $normalizer;
         $this->message = $message ?? $this->message;
     }
 
@@ -49,8 +49,8 @@ public function assert(mixed $value, ?string $name = null): void
             throw new UnexpectedTypeException('string', get_debug_type($value));
         }
 
-        if ($this->normalizer['callable'] !== null) {
-            $value = ($this->normalizer['callable'])($value);
+        if ($this->normalizer !== null) {
+            $value = ($this->normalizer)($value);
         }
 
         if ($this->mode === self::MODE_STRICT) {

src/Rule/NotBlank.php

@@ -6,16 +6,16 @@
 
 class NotBlank extends AbstractRule implements RuleInterface
 {
-    // Using array to bypass unallowed callable type in properties
-    private array $normalizer;
+    /** @var ?callable */
+    private $normalizer;
     private string $message = 'The {{ name }} value should not be blank, {{ value }} given.';
 
     public function __construct(
         ?callable $normalizer = null,
         ?string $message = null
     )
     {
-        $this->normalizer['callable'] = $normalizer;
+        $this->normalizer = $normalizer;
         $this->message = $message ?? $this->message;
     }
 
@@ -24,8 +24,8 @@ public function __construct(
      */
     public function assert(mixed $value, ?string $name = null): void
     {
-        if ($this->normalizer['callable'] !== null) {
-            $value = ($this->normalizer['callable'])($value);
+        if ($this->normalizer !== null) {
+            $value = ($this->normalizer)($value);
         }
 
         // Do not allow null, false, [] and ''

src/Rule/Url.php

@@ -32,8 +32,8 @@ class Url extends AbstractRule implements RuleInterface
         (?:\# (?:[\pL\pN\-._\~!$&\'()*+,;=:@/?]|%%[0-9A-Fa-f]{2})* )?       # a fragment (optional)
     $~ixu';
 
-    // Using array to bypass unallowed callable type in properties
-    private array $normalizer;
+    /** @var ?callable */
+    private $normalizer;
     private string $message = 'The {{ name }} value is not a valid URL address, {{ value }} given.';
 
     public function __construct(
@@ -43,7 +43,7 @@ public function __construct(
         ?string $message = null
     )
     {
-        $this->normalizer['callable'] = $normalizer;
+        $this->normalizer = $normalizer;
         $this->message = $message ?? $this->message;
     }
 
@@ -53,8 +53,8 @@ public function assert(mixed $value, ?string $name = null): void
             throw new UnexpectedTypeException('string', get_debug_type($value));
         }
 
-        if ($this->normalizer['callable'] !== null) {
-            $value = ($this->normalizer['callable'])($value);
+        if ($this->normalizer !== null) {
+            $value = ($this->normalizer)($value);
         }
 
         $pattern = $this->allowRelativeProtocol ? \str_replace('(%s):', '(?:(%s):)?', self::PATTERN) : self::PATTERN;