Merge pull request #2 from VladimirBerdnik/master

Add 'sometimes' rule modifier

Author: populov

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes History
 
+1.0.4
+-----
+Add 'sometimes' rule modifier 
+
 1.0.3
 -----
 Add ServiceProvider - allows to use rule builder without explicit ->toString()

src/DatabaseRuleSet.php

@@ -32,7 +32,7 @@ public function __construct(array $rules = [])
      * @return GenericRuleSet
      * @see \Illuminate\Validation\Rules\Exists
      */
-    public function exists($table, $column = 'NULL', \Closure $callback = null): GenericRuleSet
+    public function exists(string $table, string $column = 'NULL', \Closure $callback = null): GenericRuleSet
     {
         $rule = \Illuminate\Validation\Rule::exists($table, $column);
         if ($callback !== null) {

src/RequiredRules.php

@@ -63,7 +63,7 @@ public function requiredWithoutAll(string ...$otherFields)
     }
 
     /**
-     * The field under validation must be present and not empty if the anotherfield field is equal to any value.
+     * The field under validation must be present and not empty if the anotherField field is equal to any value.
      * @param string $anotherField
      * @param mixed $value
      * @return static
@@ -74,7 +74,7 @@ public function requiredIf(string $anotherField, $value)
     }
 
     /**
-     * The field under validation must be present and not empty unless the anotherfield field is equal to any value.
+     * The field under validation must be present and not empty unless the anotherField field is equal to any value.
      * @param string $anotherField
      * @param mixed $value
      * @return static

src/Rule.php

@@ -24,6 +24,7 @@
  * @method static GenericRuleSet min($minValue) The field under validation must have a minimum value. Strings, numerics, arrays, and files are evaluated in the same fashion as the size rule.
  * @method static GenericRuleSet max($maxValue) The field under validation must be less than or equal to a maximum value. Strings, numerics, arrays, and files are evaluated in the same fashion as the size rule.
  * @method static GenericRuleSet inArray(string $anotherField) The field under validation must exist in $anotherField's values.
+ * @method static GenericRuleSet sometimes() Run validation checks against a field only if that field is present in the input array.
  * @method static GenericRuleSet requiredWith(string ...$otherFields) This field is required, if another field has value
  * @method static GenericRuleSet requiredWithAll(string ...$otherFields) The field under validation must be present and not empty only if all of the other specified fields are present.
  * @method static GenericRuleSet requiredWithout(string ...$otherFields) This field is required, if another field has no value

src/RuleSet.php

@@ -49,6 +49,7 @@ class RuleSet implements IRule
         'max',
         'between',
         'size',
+        'sometimes',
     ];
 
     /** @var array */

src/SimpleRules.php

@@ -8,7 +8,7 @@
 trait SimpleRules
 {
     /**
-     * The field under validation must exist in anotherfield's values.
+     * The field under validation must exist in anotherField's values.
      * @param string $anotherFiled
      * @return static
      */
@@ -117,4 +117,13 @@ public function size(int $value)
     {
         return $this->appendIfNotExists("size:$value");
     }
+
+    /**
+     * Run validation checks against a field only if that field is present in the input array.
+     * @return static
+     */
+    public function sometimes()
+    {
+        return $this->appendIfNotExists("sometimes");
+    }
 }

tests/RuleTest.php

@@ -54,6 +54,11 @@ public function testSize()
         $this->assertEquals('size:20', Rule::size(20));
     }
 
+    public function testSometimes()
+    {
+        $this->assertEquals('sometimes', Rule::sometimes());
+    }
+
     /**
      * Rule 'in' can accept values as list of parameters or as array
      */