From b90d033ae01584d3b17585f0c925287d82731446 Mon Sep 17 00:00:00 2001 From: Jason Adams Date: Fri, 13 Jun 2025 16:05:04 -0600 Subject: [PATCH] fix: corrects implicit nulling --- src/Contracts/ValidationRule.php | 2 +- src/Rules/Abstracts/ConditionalRule.php | 2 +- src/Rules/Boolean.php | 2 +- src/Rules/Currency.php | 2 +- src/Rules/DateTime.php | 4 ++-- src/Rules/Email.php | 2 +- src/Rules/Exclude.php | 2 +- src/Rules/In.php | 2 +- src/Rules/Integer.php | 2 +- src/Rules/Max.php | 2 +- src/Rules/Min.php | 2 +- src/Rules/Nullable.php | 2 +- src/Rules/Numeric.php | 2 +- src/Rules/Optional.php | 2 +- src/Rules/Required.php | 2 +- src/Rules/Size.php | 2 +- tests/unit/ValidatorTest.php | 8 ++++---- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Contracts/ValidationRule.php b/src/Contracts/ValidationRule.php index 1753b60..0861542 100644 --- a/src/Contracts/ValidationRule.php +++ b/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 diff --git a/src/Rules/Abstracts/ConditionalRule.php b/src/Rules/Abstracts/ConditionalRule.php index e17450c..ba8e669 100644 --- a/src/Rules/Abstracts/ConditionalRule.php +++ b/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'); diff --git a/src/Rules/Boolean.php b/src/Rules/Boolean.php index b4dba06..0d77869 100644 --- a/src/Rules/Boolean.php +++ b/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(); } diff --git a/src/Rules/Currency.php b/src/Rules/Currency.php index 091b79b..907fb94 100644 --- a/src/Rules/Currency.php +++ b/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(); } diff --git a/src/Rules/DateTime.php b/src/Rules/DateTime.php index c46d2bb..83abd46 100644 --- a/src/Rules/DateTime.php +++ b/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 { return new static($options); } @@ -41,7 +41,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; } diff --git a/src/Rules/Email.php b/src/Rules/Email.php index 018ed12..804d249 100644 --- a/src/Rules/Email.php +++ b/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(); } diff --git a/src/Rules/Exclude.php b/src/Rules/Exclude.php index f430f8b..b4e06cf 100644 --- a/src/Rules/Exclude.php +++ b/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(); } diff --git a/src/Rules/In.php b/src/Rules/In.php index 12fb241..768de92 100644 --- a/src/Rules/In.php +++ b/src/Rules/In.php @@ -37,7 +37,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.'); diff --git a/src/Rules/Integer.php b/src/Rules/Integer.php index 6ec3d58..1f10db5 100644 --- a/src/Rules/Integer.php +++ b/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(); } diff --git a/src/Rules/Max.php b/src/Rules/Max.php index f05233a..777227d 100644 --- a/src/Rules/Max.php +++ b/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'); diff --git a/src/Rules/Min.php b/src/Rules/Min.php index 7b862bb..2020e95 100644 --- a/src/Rules/Min.php +++ b/src/Rules/Min.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('Min validation rule requires a numeric value'); diff --git a/src/Rules/Nullable.php b/src/Rules/Nullable.php index ed061ef..72fc0e3 100644 --- a/src/Rules/Nullable.php +++ b/src/Rules/Nullable.php @@ -28,7 +28,7 @@ public static function id(): string /** * @since 1.1.0 */ - public static function fromString(string $options = null): ValidationRule + public static function fromString(?string $options = null): ValidationRule { return new self(); } diff --git a/src/Rules/Numeric.php b/src/Rules/Numeric.php index 64e15d9..1077b12 100644 --- a/src/Rules/Numeric.php +++ b/src/Rules/Numeric.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(); } diff --git a/src/Rules/Optional.php b/src/Rules/Optional.php index 2b294e9..19c66f8 100644 --- a/src/Rules/Optional.php +++ b/src/Rules/Optional.php @@ -27,7 +27,7 @@ public static function id(): string /** * @since 1.1.0 */ - public static function fromString(string $options = null): ValidationRule + public static function fromString(?string $options = null): ValidationRule { return new self(); } diff --git a/src/Rules/Required.php b/src/Rules/Required.php index bb90af6..d80a7f4 100644 --- a/src/Rules/Required.php +++ b/src/Rules/Required.php @@ -21,7 +21,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(); } diff --git a/src/Rules/Size.php b/src/Rules/Size.php index d65a389..8a0f40e 100644 --- a/src/Rules/Size.php +++ b/src/Rules/Size.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('Size validation rule requires a numeric value'); diff --git a/tests/unit/ValidatorTest.php b/tests/unit/ValidatorTest.php index 5b914f1..d5bc031 100644 --- a/tests/unit/ValidatorTest.php +++ b/tests/unit/ValidatorTest.php @@ -277,7 +277,7 @@ public static function id(): string return 'skip'; } - public static function fromString(string $options = null): ValidationRule + public static function fromString(?string $options = null): ValidationRule { return new self(); } @@ -301,7 +301,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(); } @@ -330,7 +330,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(); } @@ -361,7 +361,7 @@ public static function id(): string return 'exclude'; } - public static function fromString(string $options = null): ValidationRule + public static function fromString(?string $options = null): ValidationRule { return new self(); }