Deprecate age-related rules

Signed-off-by: Henrique Moody <[email protected]>
Respect · Nov 26, 2024 · de9e310 · de9e310
1 parent cf03f8a
commit de9e310
Show file tree

Hide file tree

Showing 32 changed files with 107 additions and 428 deletions.
diff --git a/docs/02-feature-guide.md b/docs/02-feature-guide.md
@@ -42,7 +42,7 @@ Is possible to validate its properties in a single chain:
 
 ```php
 $userValidator = v::property('name', v::stringType()->length(1, 32))
-                  ->property('birthdate', v::date()->minAge(18));
+                  ->property('birthdate', v::dateTimeDiff(v::greaterThanOrEqual(18), 'years'));
 
 $userValidator->validate($user); // true
 ```

diff --git a/docs/08-list-of-rules-by-category.md b/docs/08-list-of-rules-by-category.md
@@ -78,8 +78,6 @@
 - [DateTimeDiff](rules/DateTimeDiff.md)
 - [LeapDate](rules/LeapDate.md)
 - [LeapYear](rules/LeapYear.md)
-- [MaxAge](rules/MaxAge.md)
-- [MinAge](rules/MinAge.md)
 - [Time](rules/Time.md)
 
 ## File system
@@ -380,10 +378,8 @@
 - [Luhn](rules/Luhn.md)
 - [MacAddress](rules/MacAddress.md)
 - [Max](rules/Max.md)
-- [MaxAge](rules/MaxAge.md)
 - [Mimetype](rules/Mimetype.md)
 - [Min](rules/Min.md)
-- [MinAge](rules/MinAge.md)
 - [Multiple](rules/Multiple.md)
 - [Negative](rules/Negative.md)
 - [NfeAccessKey](rules/NfeAccessKey.md)

diff --git a/docs/rules/Date.md b/docs/rules/Date.md
@@ -48,6 +48,4 @@ See also:
 - [DateTimeDiff](DateTimeDiff.md)
 - [LeapDate](LeapDate.md)
 - [LeapYear](LeapYear.md)
-- [MaxAge](MaxAge.md)
-- [MinAge](MinAge.md)
 - [Time](Time.md)
diff --git a/docs/rules/DateTime.md b/docs/rules/DateTime.md
@@ -77,7 +77,6 @@ See also:
 - [DateTimeDiff](DateTimeDiff.md)
 - [LeapDate](LeapDate.md)
 - [LeapYear](LeapYear.md)
-- [MinAge](MinAge.md)
 - [Time](Time.md)
 
 [DateTimeImmutable::createFromFormat()]: https://www.php.net/datetimeimmutable.createfromformat

diff --git a/docs/rules/GreaterThanOrEqual.md b/docs/rules/GreaterThanOrEqual.md
@@ -38,6 +38,4 @@ See also:
 - [LessThan](LessThan.md)
 - [LessThanOrEqual](LessThanOrEqual.md)
 - [Max](Max.md)
-- [MaxAge](MaxAge.md)
 - [Min](Min.md)
-- [MinAge](MinAge.md)
diff --git a/docs/rules/LessThanOrEqual.md b/docs/rules/LessThanOrEqual.md
@@ -38,6 +38,4 @@ See also:
 - [Length](Length.md)
 - [LessThan](LessThan.md)
 - [Max](Max.md)
-- [MaxAge](MaxAge.md)
 - [Min](Min.md)
-- [MinAge](MinAge.md)
diff --git a/docs/rules/MaxAge.md b/docs/rules/MaxAge.md
diff --git a/docs/rules/MinAge.md b/docs/rules/MinAge.md
diff --git a/library/Factory.php b/library/Factory.php
@@ -18,6 +18,7 @@
 use Respect\Validation\Message\Parameter\Stringify;
 use Respect\Validation\Message\Parameter\Trans;
 use Respect\Validation\Transformers\Aliases;
+use Respect\Validation\Transformers\DeprecatedAge;
 use Respect\Validation\Transformers\DeprecatedAttribute;
 use Respect\Validation\Transformers\DeprecatedKey;
 use Respect\Validation\Transformers\DeprecatedKeyNested;
@@ -60,7 +61,9 @@ public function __construct()
             new DeprecatedKey(
                 new DeprecatedKeyValue(
                     new DeprecatedMinAndMax(
-                        new DeprecatedKeyNested(new DeprecatedLength(new DeprecatedType(new Aliases(new Prefix()))))
+                        new DeprecatedAge(
+                            new DeprecatedKeyNested(new DeprecatedLength(new DeprecatedType(new Aliases(new Prefix()))))
+                        )
                     )
                 )
             )

diff --git a/library/Mixins/ChainedKey.php b/library/Mixins/ChainedKey.php
@@ -228,14 +228,10 @@ public function keyMacAddress(int|string $key): ChainedValidator;
 
     public function keyMax(int|string $key, Validatable $rule): ChainedValidator;
 
-    public function keyMaxAge(int|string $key, int $age, ?string $format = null): ChainedValidator;
-
     public function keyMimetype(int|string $key, string $mimetype): ChainedValidator;
 
     public function keyMin(int|string $key, Validatable $rule): ChainedValidator;
 
-    public function keyMinAge(int|string $key, int $age, ?string $format = null): ChainedValidator;
-
     public function keyMultiple(int|string $key, int $multipleOf): ChainedValidator;
 
     public function keyNegative(int|string $key): ChainedValidator;

diff --git a/library/Mixins/ChainedNot.php b/library/Mixins/ChainedNot.php
@@ -221,14 +221,10 @@ public function notMacAddress(): ChainedValidator;
 
     public function notMax(Validatable $rule): ChainedValidator;
 
-    public function notMaxAge(int $age, ?string $format = null): ChainedValidator;
-
     public function notMimetype(string $mimetype): ChainedValidator;
 
     public function notMin(Validatable $rule): ChainedValidator;
 
-    public function notMinAge(int $age, ?string $format = null): ChainedValidator;
-
     public function notMultiple(int $multipleOf): ChainedValidator;
 
     public function notNegative(): ChainedValidator;

diff --git a/library/Mixins/ChainedNullOr.php b/library/Mixins/ChainedNullOr.php
@@ -221,14 +221,10 @@ public function nullOrMacAddress(): ChainedValidator;
 
     public function nullOrMax(Validatable $rule): ChainedValidator;
 
-    public function nullOrMaxAge(int $age, ?string $format = null): ChainedValidator;
-
     public function nullOrMimetype(string $mimetype): ChainedValidator;
 
     public function nullOrMin(Validatable $rule): ChainedValidator;
 
-    public function nullOrMinAge(int $age, ?string $format = null): ChainedValidator;
-
     public function nullOrMultiple(int $multipleOf): ChainedValidator;
 
     public function nullOrNegative(): ChainedValidator;

diff --git a/library/Mixins/ChainedProperty.php b/library/Mixins/ChainedProperty.php
@@ -240,14 +240,10 @@ public function propertyMacAddress(string $propertyName): ChainedValidator;
 
     public function propertyMax(string $propertyName, Validatable $rule): ChainedValidator;
 
-    public function propertyMaxAge(string $propertyName, int $age, ?string $format = null): ChainedValidator;
-
     public function propertyMimetype(string $propertyName, string $mimetype): ChainedValidator;
 
     public function propertyMin(string $propertyName, Validatable $rule): ChainedValidator;
 
-    public function propertyMinAge(string $propertyName, int $age, ?string $format = null): ChainedValidator;
-
     public function propertyMultiple(string $propertyName, int $multipleOf): ChainedValidator;
 
     public function propertyNegative(string $propertyName): ChainedValidator;

diff --git a/library/Mixins/ChainedUndefOr.php b/library/Mixins/ChainedUndefOr.php
@@ -225,14 +225,10 @@ public function undefOrMacAddress(): ChainedValidator;
 
     public function undefOrMax(Validatable $rule): ChainedValidator;
 
-    public function undefOrMaxAge(int $age, ?string $format = null): ChainedValidator;
-
     public function undefOrMimetype(string $mimetype): ChainedValidator;
 
     public function undefOrMin(Validatable $rule): ChainedValidator;
 
-    public function undefOrMinAge(int $age, ?string $format = null): ChainedValidator;
-
     public function undefOrMultiple(int $multipleOf): ChainedValidator;
 
     public function undefOrNegative(): ChainedValidator;

diff --git a/library/Mixins/ChainedValidator.php b/library/Mixins/ChainedValidator.php
@@ -230,14 +230,10 @@ public function macAddress(): ChainedValidator;
 
     public function max(Validatable $rule): ChainedValidator;
 
-    public function maxAge(int $age, ?string $format = null): ChainedValidator;
-
     public function mimetype(string $mimetype): ChainedValidator;
 
     public function min(Validatable $rule): ChainedValidator;
 
-    public function minAge(int $age, ?string $format = null): ChainedValidator;
-
     public function multiple(int $multipleOf): ChainedValidator;
 
     public function negative(): ChainedValidator;

diff --git a/library/Mixins/StaticKey.php b/library/Mixins/StaticKey.php
@@ -232,14 +232,10 @@ public static function keyMacAddress(int|string $key): ChainedValidator;
 
     public static function keyMax(int|string $key, Validatable $rule): ChainedValidator;
 
-    public static function keyMaxAge(int|string $key, int $age, ?string $format = null): ChainedValidator;
-
     public static function keyMimetype(int|string $key, string $mimetype): ChainedValidator;
 
     public static function keyMin(int|string $key, Validatable $rule): ChainedValidator;
 
-    public static function keyMinAge(int|string $key, int $age, ?string $format = null): ChainedValidator;
-
     public static function keyMultiple(int|string $key, int $multipleOf): ChainedValidator;
 
     public static function keyNegative(int|string $key): ChainedValidator;

diff --git a/library/Mixins/StaticNot.php b/library/Mixins/StaticNot.php
@@ -225,14 +225,10 @@ public static function notMacAddress(): ChainedValidator;
 
     public static function notMax(Validatable $rule): ChainedValidator;
 
-    public static function notMaxAge(int $age, ?string $format = null): ChainedValidator;
-
     public static function notMimetype(string $mimetype): ChainedValidator;
 
     public static function notMin(Validatable $rule): ChainedValidator;
 
-    public static function notMinAge(int $age, ?string $format = null): ChainedValidator;
-
     public static function notMultiple(int $multipleOf): ChainedValidator;
 
     public static function notNegative(): ChainedValidator;

diff --git a/library/Mixins/StaticNullOr.php b/library/Mixins/StaticNullOr.php
@@ -233,14 +233,10 @@ public static function nullOrMacAddress(): ChainedValidator;
 
     public static function nullOrMax(Validatable $rule): ChainedValidator;
 
-    public static function nullOrMaxAge(int $age, ?string $format = null): ChainedValidator;
-
     public static function nullOrMimetype(string $mimetype): ChainedValidator;
 
     public static function nullOrMin(Validatable $rule): ChainedValidator;
 
-    public static function nullOrMinAge(int $age, ?string $format = null): ChainedValidator;
-
     public static function nullOrMultiple(int $multipleOf): ChainedValidator;
 
     public static function nullOrNegative(): ChainedValidator;

diff --git a/library/Mixins/StaticProperty.php b/library/Mixins/StaticProperty.php
@@ -264,14 +264,10 @@ public static function propertyMacAddress(string $propertyName): ChainedValidato
 
     public static function propertyMax(string $propertyName, Validatable $rule): ChainedValidator;
 
-    public static function propertyMaxAge(string $propertyName, int $age, ?string $format = null): ChainedValidator;
-
     public static function propertyMimetype(string $propertyName, string $mimetype): ChainedValidator;
 
     public static function propertyMin(string $propertyName, Validatable $rule): ChainedValidator;
 
-    public static function propertyMinAge(string $propertyName, int $age, ?string $format = null): ChainedValidator;
-
     public static function propertyMultiple(string $propertyName, int $multipleOf): ChainedValidator;
 
     public static function propertyNegative(string $propertyName): ChainedValidator;

diff --git a/library/Mixins/StaticUndefOr.php b/library/Mixins/StaticUndefOr.php
@@ -233,14 +233,10 @@ public static function undefOrMacAddress(): ChainedValidator;
 
     public static function undefOrMax(Validatable $rule): ChainedValidator;
 
-    public static function undefOrMaxAge(int $age, ?string $format = null): ChainedValidator;
-
     public static function undefOrMimetype(string $mimetype): ChainedValidator;
 
     public static function undefOrMin(Validatable $rule): ChainedValidator;
 
-    public static function undefOrMinAge(int $age, ?string $format = null): ChainedValidator;
-
     public static function undefOrMultiple(int $multipleOf): ChainedValidator;
 
     public static function undefOrNegative(): ChainedValidator;

diff --git a/library/Mixins/StaticValidator.php b/library/Mixins/StaticValidator.php
@@ -233,14 +233,10 @@ public static function macAddress(): ChainedValidator;
 
     public static function max(Validatable $rule): ChainedValidator;
 
-    public static function maxAge(int $age, ?string $format = null): ChainedValidator;
-
     public static function mimetype(string $mimetype): ChainedValidator;
 
     public static function min(Validatable $rule): ChainedValidator;
 
-    public static function minAge(int $age, ?string $format = null): ChainedValidator;
-
     public static function multiple(int $multipleOf): ChainedValidator;
 
     public static function negative(): ChainedValidator;