Merge branch 'develop' into feat/update-php-7.4

Author: JasonTheAdams

src/Contracts/ValidationRule.php

@@ -25,7 +25,7 @@ public static function id(): string;
      *
      * @since 1.0.0
      */
-    public static function fromString(string $options = null): ValidationRule;
+    public static function fromString(?string $options = null): ValidationRule;
 
     /**
      * The invokable method used to validate the value. If the value is invalid, the fail callback should be invoked

src/Rules/Abstracts/ConditionalRule.php

@@ -39,7 +39,7 @@ public function __construct($conditions)
      *
      * @since 1.2.0
      */
-    public static function fromString(string $options = null): ValidationRule
+    public static function fromString(?string $options = null): ValidationRule
     {
         if (empty($options)) {
             Config::throwInvalidArgumentException(static::class . ' rule requires at least one condition');

src/Rules/Boolean.php

@@ -26,7 +26,7 @@ public static function id(): string
      *
      * @since 1.4.0
      */
-    public static function fromString(string $options = null): ValidationRule
+    public static function fromString(?string $options = null): ValidationRule
     {
         return new self();
     }

src/Rules/Currency.php

@@ -25,7 +25,7 @@ public static function id(): string
      *
      * @since 1.0.0
      */
-    public static function fromString(string $options = null): ValidationRule
+    public static function fromString(?string $options = null): ValidationRule
     {
         return new self();
     }

src/Rules/DateTime.php

@@ -33,7 +33,7 @@ public static function id(): string
     /**
      * @since 1.2.0
      */
-    public static function fromString(string $options = null): ValidationRule
+    public static function fromString(?string $options = null): ValidationRule
     {
         // @phpstan-ignore-next-line
         return new static($options);
@@ -42,7 +42,7 @@ public static function fromString(string $options = null): ValidationRule
     /**
      * @since 1.2.0
      */
-    public function __construct(string $format = null)
+    public function __construct(?string $format = null)
     {
         $this->format = $format;
     }

src/Rules/Email.php

@@ -28,7 +28,7 @@ public static function id(): string
      *
      * @since 1.0.0
      */
-    public static function fromString(string $options = null): ValidationRule
+    public static function fromString(?string $options = null): ValidationRule
     {
         return new self();
     }

src/Rules/Exclude.php

@@ -30,7 +30,7 @@ public static function id(): string
      *
      * @since 1.2.0
      */
-    public static function fromString(string $options = null): ValidationRule
+    public static function fromString(?string $options = null): ValidationRule
     {
         return new self();
     }

src/Rules/In.php

@@ -39,7 +39,7 @@ final public function __construct(...$acceptedValues)
     /**
      * @since 1.2.0
      */
-    public static function fromString(string $options = null): ValidationRule
+    public static function fromString(?string $options = null): ValidationRule
     {
         if (empty(trim($options))) {
             Config::throwInvalidArgumentException('The In rule requires at least one value to be specified.');

src/Rules/Integer.php

@@ -22,7 +22,7 @@ public static function id(): string
     /**
      * @inheritDoc
      */
-    public static function fromString(string $options = null): ValidationRule
+    public static function fromString(?string $options = null): ValidationRule
     {
         return new self();
     }

src/Rules/Max.php

@@ -47,7 +47,7 @@ public static function id(): string
      *
      * @since 1.0.0
      */
-    public static function fromString(string $options = null): ValidationRule
+    public static function fromString(?string $options = null): ValidationRule
     {
         if (!is_numeric($options)) {
             Config::throwInvalidArgumentException('Max validation rule requires a numeric value');