Feature/php 8.5 compatibility

src/Rule/AbstractRule.php

@@ -172,7 +172,7 @@ public function getMessageTemplate(): string
     /**
      * Validates a value
      */
-    abstract public function validate(mixed $value, string $valueIdentifier = null): bool;
+    abstract public function validate(mixed $value, ?string $valueIdentifier = null): bool;
 
     /**
      * Sets the error message prototype that will be used when

src/Rule/Alpha.php

@@ -8,7 +8,7 @@ class Alpha extends AbstractRule
     const MESSAGE = 'This input can contain only letters';
     const LABELED_MESSAGE = '{label} can contain only letters';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $this->success = (bool)ctype_alpha((string)str_replace(' ', '', (string)$value));

src/Rule/AlphaNumHyphen.php

@@ -8,7 +8,7 @@ class AlphaNumHyphen extends AbstractRule
     const MESSAGE = 'This input must contain only letters, digits, spaces, hyphens and underscores';
     const LABELED_MESSAGE = '{label} must contain only letters, digits, spaces, hyphens and underscores';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $this->success = (bool)ctype_alnum(

src/Rule/AlphaNumeric.php

@@ -9,7 +9,7 @@ class AlphaNumeric extends AbstractRule
 
     const LABELED_MESSAGE = '{label} must contain only letters and digits';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $this->success = (bool)ctype_alnum((string)str_replace(' ', '', $value));

src/Rule/ArrayLength.php

@@ -16,7 +16,7 @@ class ArrayLength extends AbstractRule
         1 => self::OPTION_MAX
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $maxValidator = new ArrayMaxLength();

src/Rule/ArrayMaxLength.php

@@ -15,7 +15,7 @@ class ArrayMaxLength extends AbstractRule
         self::OPTION_MAX
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!isset($this->options['max'])) {

src/Rule/ArrayMinLength.php

@@ -14,7 +14,7 @@ class ArrayMinLength extends AbstractRule
         0 => self::OPTION_MIN
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!isset($this->options['min'])) {

src/Rule/Between.php

@@ -16,7 +16,7 @@ class Between extends AbstractRule
         1 => self::OPTION_MAX
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $minValidator = new LessThan();

src/Rule/Callback.php

@@ -40,7 +40,7 @@ public function getUniqueId(): string
         return $uniqueId;
     }
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!isset($this->options['callback']) || !is_callable($this->options['callback'])) {

src/Rule/Date.php

@@ -19,7 +19,7 @@ class Date extends AbstractRule
         0 => self::OPTION_FORMAT
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $this->success = $value == date(

src/Rule/Email.php

@@ -9,7 +9,7 @@ class Email extends AbstractRule
 
     const LABELED_MESSAGE = '{label} must be a valid email address';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $this->success = (filter_var((string)$value, FILTER_VALIDATE_EMAIL) !== false);

src/Rule/EmailDomain.php

@@ -8,7 +8,7 @@ class EmailDomain extends AbstractRule
     const MESSAGE = 'This the email address does not belong to a valid domain';
     const LABELED_MESSAGE = '{label} does not belong to a valid domain';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $value = (string)$value;
         $this->value = $value;

src/Rule/Equal.php

@@ -14,7 +14,7 @@ class Equal extends AbstractRule
         0 => self::OPTION_VALUE
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (isset($this->options[self::OPTION_VALUE])) {

src/Rule/File/Extension.php

@@ -31,7 +31,7 @@ public function setOption(string $name, mixed $value): static
         return parent::setOption($name, $value);
     }
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!file_exists($value)) {

src/Rule/File/Image.php

@@ -45,7 +45,7 @@ public function setOption(string $name, mixed $value): static
         return parent::setOption($name, $value);
     }
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!file_exists($value)) {

src/Rule/File/ImageHeight.php

@@ -19,7 +19,7 @@ class ImageHeight extends AbstractRule
         self::OPTION_MIN => 0,
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!file_exists($value)) {

src/Rule/File/ImageRatio.php

@@ -37,7 +37,7 @@ protected function normalizeRatio(mixed $ratio): float
         return 0;
     }
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $ratio = RuleHelper::normalizeImageRatio($this->options[self::OPTION_RATIO]);

src/Rule/File/ImageWidth.php

@@ -19,7 +19,7 @@ class ImageWidth extends AbstractRule
         self::OPTION_MIN => 0,
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!file_exists($value)) {

src/Rule/File/Size.php

@@ -18,7 +18,7 @@ class Size extends AbstractRule
         self::OPTION_SIZE => '2M'
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!file_exists($value)) {

src/Rule/FullName.php

@@ -11,7 +11,7 @@ class FullName extends AbstractRule
     /**
      * This is not going to work with Asian names, http://en.wikipedia.org/wiki/Chinese_name.
      */
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
 

src/Rule/GreaterThan.php

@@ -20,7 +20,7 @@ class GreaterThan extends AbstractRule
         1 => self::OPTION_INCLUSIVE
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!isset($this->options['min'])) {

src/Rule/InList.php

@@ -14,7 +14,7 @@ class InList extends AbstractRule
         0 => self::OPTION_LIST
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!isset($this->options['list'])) {

src/Rule/Integer.php

@@ -8,7 +8,7 @@ class Integer extends AbstractRule
     const MESSAGE = 'This input must be an integer number';
     const LABELED_MESSAGE = '{label} must be an integer number';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $this->success = (bool)filter_var($value, FILTER_VALIDATE_INT) || $value === '0';

src/Rule/IpAddress.php

@@ -8,7 +8,7 @@ class IpAddress extends AbstractRule
     const MESSAGE = 'This input is not a valid IP address';
     const LABELED_MESSAGE = '{label} is not a valid IP address';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         // Do not allow private and reserved range IPs

src/Rule/Length.php

@@ -18,7 +18,7 @@ class Length extends AbstractRule
         2 => self::OPTION_ENCODING
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $maxValidator = new MaxLength();

src/Rule/LessThan.php

@@ -20,7 +20,7 @@ class LessThan extends AbstractRule
         1 => self::OPTION_INCLUSIVE
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!isset($this->options['max'])) {

src/Rule/Matching.php

@@ -14,7 +14,7 @@ class Matching extends AbstractRule
         0 => self::OPTION_ITEM
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (isset($this->options[self::OPTION_ITEM])) {

src/Rule/MaxLength.php

@@ -16,7 +16,7 @@ class MaxLength extends AbstractStringRule
         1 => self::OPTION_ENCODING
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!isset($this->options['max'])) {

src/Rule/MinLength.php

@@ -16,7 +16,7 @@ class MinLength extends AbstractStringRule
         1 => self::OPTION_ENCODING
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!isset($this->options['min'])) {

src/Rule/NotEqual.php

@@ -8,7 +8,7 @@ class NotEqual extends Equal
     const MESSAGE = 'This input is equal to {value}';
     const LABELED_MESSAGE = '{label} is equal to {value}';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         parent::validate($value, $valueIdentifier);
         $this->success = !$this->success;

src/Rule/NotInList.php

@@ -14,7 +14,7 @@ class NotInList extends InList
         0 => self::OPTION_LIST
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!isset($this->options['list'])) {

src/Rule/NotMatch.php

@@ -8,7 +8,7 @@ class NotMatch extends Matching
     const MESSAGE = 'This input does match {item}';
     const LABELED_MESSAGE = '{label} does match {item}';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         parent::validate($value, $valueIdentifier);
         $this->success = !$this->success;

src/Rule/NotRegex.php

@@ -8,7 +8,7 @@ class NotRegex extends Regex
     const MESSAGE = 'This input should not match the regular expression {pattern}';
     const LABELED_MESSAGE = '{label} Tshould not match the regular expression {pattern}';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         parent::validate($value, $valueIdentifier);
         $this->success = !$this->success;

src/Rule/Number.php

@@ -8,7 +8,7 @@ class Number extends AbstractRule
     const MESSAGE = 'This input must be a number';
     const LABELED_MESSAGE = '{label} must be a number';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $this->success = (bool)filter_var($value, FILTER_VALIDATE_FLOAT) || (string)$value === '0';

src/Rule/Regex.php

@@ -14,7 +14,7 @@ class Regex extends AbstractRule
         0 => self::OPTION_PATTERN
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (isset($this->options['pattern'])) {

src/Rule/Required.php

@@ -8,7 +8,7 @@ class Required extends AbstractRule
     const MESSAGE = 'This field is required';
     const LABELED_MESSAGE = '{label} is required';
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $this->success = ($value !== null && $value !== '');

src/Rule/RequiredWhen.php

@@ -43,7 +43,7 @@ public function getItemRule(): ?AbstractRule
         return $rule; // @phpstan-ignore-line
     }
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
 

src/Rule/RequiredWith.php

@@ -14,7 +14,7 @@ class RequiredWith extends Required
         0 => self::OPTION_ITEM
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
 

src/Rule/RequiredWithout.php

@@ -14,7 +14,7 @@ class RequiredWithout extends Required
         0 => self::OPTION_ITEM
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
 

src/Rule/Upload/Extension.php

@@ -31,7 +31,7 @@ public function setOption(string $name, mixed $value): static
         return parent::setOption($name, $value);
     }
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!is_array($value) || !isset($value['tmp_name'])) {

src/Rule/Upload/Image.php

@@ -45,7 +45,7 @@ public function setOption(string $name, mixed $value): static
         return parent::setOption($name, $value);
     }
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!is_array($value) || !isset($value['tmp_name'])) {

src/Rule/Upload/ImageHeight.php

@@ -19,7 +19,7 @@ class ImageHeight extends AbstractRule
         self::OPTION_MIN => 0,
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!is_array($value) || !isset($value['tmp_name'])) {

src/Rule/Upload/ImageRatio.php

@@ -23,7 +23,7 @@ class ImageRatio extends AbstractRule
         self::OPTION_ERROR_MARGIN => 0,
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         $ratio = RuleHelper::normalizeImageRatio($this->options[self::OPTION_RATIO]);

src/Rule/Upload/ImageWidth.php

@@ -19,7 +19,7 @@ class ImageWidth extends AbstractRule
         self::OPTION_MIN => 0,
     ];
 
-    public function validate(mixed $value, string $valueIdentifier = null): bool
+    public function validate(mixed $value, ?string $valueIdentifier = null): bool
     {
         $this->value = $value;
         if (!is_array($value) || !isset($value['tmp_name'])) {