Strict boolean and numeric as individual functions (#58)

* update: increased minimum laravel version

* update: added strict boolean option

* update: added strict numeric option

* refactor: switch to separate rule function rather than flag

* docs: added deprecation note

Author: erik-perri

UPGRADE.md

@@ -2,6 +2,12 @@
 
 ## v6
 
+### Upgrading from v6.1 to v6.2
+
+- Minimum Laravel version increased from `12.16` to `12.21`.
+- The `distinct` rule helper parameters have been deprecated in favor of the `distinctStrict` and `distinctIgnoreCase`
+  helpers. The parameters are planned to be removed in a future major version.
+
 ### Upgrading from v6.0 to v6.1
 
 - Minimum Laravel version increased from `12.0` to `12.16`.

composer.json

@@ -6,7 +6,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": "^8.2||^8.3||^8.4",
-        "laravel/framework": "^12.16"
+        "laravel/framework": "^12.21"
     },
     "require-dev": {
         "ext-json": "*",

src/Rule.php

@@ -255,6 +255,16 @@ public static function boolean(): string
         return 'boolean';
     }
 
+    /**
+     * The field under validation must a boolean.
+     *
+     * @link https://laravel.com/docs/12.x/validation#rule-boolean
+     */
+    public static function booleanStrict(): string
+    {
+        return 'boolean:strict';
+    }
+
     /**
      * The field under validation must pass a Gate check for the specified ability.
      *
@@ -426,19 +436,43 @@ public static function dimensions(array $constraints = []): Dimensions
      *
      * @link https://laravel.com/docs/12.x/validation#rule-distinct
      */
-    public static function distinct(bool $strict = false, bool $ignoreCase = false): string
-    {
+    public static function distinct(
+        /** @deprecated Use `distinctStrict()` instead */
+        bool $strict = false,
+        /** @deprecated Use `distinctIgnoreCase()` instead */
+        bool $ignoreCase = false,
+    ): string {
         if ($ignoreCase) {
-            return 'distinct:ignore_case';
+            return self::distinctIgnoreCase();
         }
 
         if ($strict) {
-            return 'distinct:strict';
+            return self::distinctStrict();
         }
 
         return 'distinct';
     }
 
+    /**
+     * When validating arrays, the field under validation must not have any duplicate values.
+     *
+     * @link https://laravel.com/docs/12.x/validation#rule-distinct
+     */
+    public static function distinctIgnoreCase(): string
+    {
+        return 'distinct:ignore_case';
+    }
+
+    /**
+     * When validating arrays, the field under validation must not have any duplicate values.
+     *
+     * @link https://laravel.com/docs/12.x/validation#rule-distinct
+     */
+    public static function distinctStrict(): string
+    {
+        return 'distinct:strict';
+    }
+
     /**
      * The field under validation must not end with one of the given values.
      *
@@ -973,6 +1007,17 @@ public static function numeric(): string
         return 'numeric';
     }
 
+    /**
+     * The field under validation must be numeric and typed as an integer or float.
+     *
+     * @link https://laravel.com/docs/12.x/validation#rule-numeric
+     * @link https://www.php.net/manual/en/function.is-numeric.php
+     */
+    public static function numericStrict(): string
+    {
+        return 'numeric:strict';
+    }
+
     /**
      * The field under validation must be a string with an adequate level of complexity for a password. Defaults to a
      * minimum of 8 characters if no size is provided and {@see Password::defaults} was not used.

src/RuleSet.php

@@ -299,6 +299,16 @@ public function boolean(): self
         return $this->rule(Rule::boolean());
     }
 
+    /**
+     * The field under validation must a boolean.
+     *
+     * @link https://laravel.com/docs/12.x/validation#rule-boolean
+     */
+    public function booleanStrict(): self
+    {
+        return $this->rule(Rule::booleanStrict());
+    }
+
     /**
      * The field under validation must pass a Gate check for the specified ability.
      *
@@ -479,11 +489,35 @@ public function dimensions(array $constraints = [], ?callable $modifier = null):
      *
      * @link https://laravel.com/docs/12.x/validation#rule-distinct
      */
-    public function distinct(bool $strict = false, bool $ignoreCase = false): self
-    {
+    public function distinct(
+        /** @deprecated Use `distinctStrict()` instead */
+        bool $strict = false,
+        /** @deprecated Use `distinctIgnoreCase()` instead */
+        bool $ignoreCase = false,
+    ): self {
         return $this->rule(Rule::distinct($strict, $ignoreCase));
     }
 
+    /**
+     * When validating arrays, the field under validation must not have any duplicate values.
+     *
+     * @link https://laravel.com/docs/12.x/validation#rule-distinct
+     */
+    public function distinctIgnoreCase(): self
+    {
+        return $this->rule(Rule::distinctIgnoreCase());
+    }
+
+    /**
+     * When validating arrays, the field under validation must not have any duplicate values.
+     *
+     * @link https://laravel.com/docs/12.x/validation#rule-distinct
+     */
+    public function distinctStrict(): self
+    {
+        return $this->rule(Rule::distinctStrict());
+    }
+
     /**
      * The field under validation must not end with one of the given values.
      *
@@ -1060,6 +1094,17 @@ public function numeric(): self
         return $this->rule(Rule::numeric());
     }
 
+    /**
+     * The field under validation must be numeric and typed as an integer or float.
+     *
+     * @link https://laravel.com/docs/12.x/validation#rule-numeric
+     * @link https://www.php.net/manual/en/function.is-numeric.php
+     */
+    public function numericStrict(): self
+    {
+        return $this->rule(Rule::numericStrict());
+    }
+
     /**
      * The field under validation must be a string with an adequate level of complexity for a password. Defaults to a
      * minimum of 8 characters if no size is provided and {@see Password::defaults} was not used.

tests/Unit/RuleTest.php

@@ -589,6 +589,21 @@ public static function ruleDataProvider(): array
                 'rules' => fn() => RuleSet::create()->boolean(),
                 'fails' => true,
             ],
+            'booleanStrict valid' => [
+                'data' => true,
+                'rules' => fn() => RuleSet::create()->booleanStrict(),
+                'fails' => false,
+            ],
+            'booleanStrict invalid' => [
+                'data' => 'false',
+                'rules' => fn() => RuleSet::create()->booleanStrict(),
+                'fails' => true,
+            ],
+            'booleanStrict invalid number' => [
+                'data' => '0',
+                'rules' => fn() => RuleSet::create()->booleanStrict(),
+                'fails' => true,
+            ],
             'can valid' => [
                 'data' => 'value-a',
                 'rules' => function () {
@@ -2000,6 +2015,16 @@ public static function ruleDataProvider(): array
                 'rules' => fn() => RuleSet::create()->numeric(),
                 'fails' => true,
             ],
+            'numericStrict valid' => [
+                'data' => 1.25,
+                'rules' => fn() => RuleSet::create()->numericStrict(),
+                'fails' => false,
+            ],
+            'numericStrict invalid' => [
+                'data' => '1.25',
+                'rules' => fn() => RuleSet::create()->numericStrict(),
+                'fails' => true,
+            ],
             'password using default valid' => [
                 'data' => 'pass1!',
                 'rules' => function () {