Renamed when-methods to if-methods

Fixed handling conditional methods Finished unit tests
hollodotme · Feb 7, 2016 · 7743c03 · 7743c03
1 parent e06fa38
commit 7743c03
Show file tree

Hide file tree

Showing 5 changed files with 201 additions and 159 deletions.
diff --git a/README.md b/README.md
@@ -71,55 +71,55 @@ public function isFalseOrNull( $value, $message ) : FluidValidator;
 ## Conditional methods
 
 ```php
-public function when( $expression, $continue = 1 ) : FluidValidator;
-public function whenIsString( $value, $continue = 1 ) : FluidValidator;
-public function whenIsStringOrNull( $value, $continue = 1 ) : FluidValidator;
-public function whenIsNonEmptyString( $value, $continue = 1 ) : FluidValidator;
-public function whenIsNonEmptyStringOrNull( $value, $continue = 1 ) : FluidValidator;
-public function whenIsNotEmpty( $value, $continue = 1 ) : FluidValidator;
-public function whenIsNotEmptyOrNull( $value, $continue = 1 ) : FluidValidator;
-public function whenIsArray( $value, $continue = 1 ) : FluidValidator;
-public function whenIsArrayOrNull( $value, $continue = 1 ) : FluidValidator;
-public function whenIsInt( $value, $continue = 1 ) : FluidValidator;
-public function whenIsIntOrNull( $value, $continue = 1 ) : FluidValidator;
-public function whenIsIntInRange( $value, array $range, $continue = 1 ) : FluidValidator;
-public function whenIsIntInRangeOrNull( $value, array $range, $continue = 1 ) : FluidValidator;
-public function whenIsOneStringOf( $value, array $list, $continue = 1 ) : FluidValidator;
-public function whenIsOneStringOfOrNull( $value, array $list, $continue = 1 ) : FluidValidator;
-public function whenIsSubsetOf( $values, array $list, $continue = 1 ) : FluidValidator;
-public function whenIsSubsetOfOrNull( $values, array $list, $continue = 1 ) : FluidValidator;
-public function whenIsUuid( $value, $continue = 1 ) : FluidValidator;
-public function whenIsUuidOrNull( $value, $continue = 1 ) : FluidValidator;
-public function whenIsEqual( $value1, $value2, $continue = 1 ) : FluidValidator;
-public function whenIsNotEqual( $value1, $value2, $continue = 1 ) : FluidValidator;
-public function whenIsSame( $value1, $value2, $continue = 1 ) : FluidValidator;
-public function whenIsNotSame( $value1, $value2, $continue = 1 ) : FluidValidator;
-public function whenIsNull( $value, $continue = 1 ) : FluidValidator;
-public function whenIsNotNull( $value, $continue = 1 ) : FluidValidator;
-public function whenMatchesRegex( $value, $regex, $continue = 1 ) : FluidValidator;
-public function whenMatchesRegexOrNull( $value, $regex, $continue = 1 ) : FluidValidator;
-public function whenHasLength( $value, $length, $continue = 1 ) : FluidValidator;
-public function whenHasLengthOrNull( $value, $length, $continue = 1 ) : FluidValidator;
-public function whenHasMinLength( $value, $minLength, $continue = 1 ) : FluidValidator;
-public function whenHasMinLengthOrNull( $value, $minLength, $continue = 1 ) : FluidValidator;
-public function whenHasMaxLength( $value, $maxLength, $continue = 1 ) : FluidValidator;
-public function whenHasMaxLengthOrNull( $value, $maxLength, $continue = 1 ) : FluidValidator;
-public function whenCounts( $values, $count, $continue = 1 ) : FluidValidator;
-public function whenCountsOrNull( $values, $count, $continue = 1 ) : FluidValidator;
-public function whenIsEmail( $value, $continue = 1 ) : FluidValidator;
-public function whenIsEmailOrNull( $value, $continue = 1 ) : FluidValidator;
-public function whenIsUrl( $value, $continue = 1 ) : FluidValidator;
-public function whenIsUrlNull( $value, $continue = 1 ) : FluidValidator;
-public function whenIsJson( $value, $continue = 1 ) : FluidValidator;
-public function whenIsJsonOrNull( $value, $continue = 1 ) : FluidValidator;
-public function whenHasKey( $values, $key, $continue = 1 ) : FluidValidator;
-public function whenHasKeyOrNull( $values, $key, $continue = 1 ) : FluidValidator;
-public function whenIsDate( $dateString, $format = 'Y-m-d', $continue = 1 ) : FluidValidator;
-public function whenIsDateOrNull( $dateString, $format = 'Y-m-d', $continue = 1 ) : FluidValidator;
-public function whenIsTrue( $value, $continue = 1 ) : FluidValidator;
-public function whenIsTrueOrNull( $value, $continue = 1 ) : FluidValidator;
-public function whenIsFalse( $value, $continue = 1 ) : FluidValidator;
-public function whenIsFalseOrNull( $value, $continue = 1 ) : FluidValidator;
+public function checkIf( $expression, $continue = 1 ) : FluidValidator;
+public function ifIsString( $value, $continue = 1 ) : FluidValidator;
+public function ifIsStringOrNull( $value, $continue = 1 ) : FluidValidator;
+public function ifIsNonEmptyString( $value, $continue = 1 ) : FluidValidator;
+public function ifIsNonEmptyStringOrNull( $value, $continue = 1 ) : FluidValidator;
+public function ifIsNotEmpty( $value, $continue = 1 ) : FluidValidator;
+public function ifIsNotEmptyOrNull( $value, $continue = 1 ) : FluidValidator;
+public function ifIsArray( $value, $continue = 1 ) : FluidValidator;
+public function ifIsArrayOrNull( $value, $continue = 1 ) : FluidValidator;
+public function ifIsInt( $value, $continue = 1 ) : FluidValidator;
+public function ifIsIntOrNull( $value, $continue = 1 ) : FluidValidator;
+public function ifIsIntInRange( $value, array $range, $continue = 1 ) : FluidValidator;
+public function ifIsIntInRangeOrNull( $value, array $range, $continue = 1 ) : FluidValidator;
+public function ifIsOneStringOf( $value, array $list, $continue = 1 ) : FluidValidator;
+public function ifIsOneStringOfOrNull( $value, array $list, $continue = 1 ) : FluidValidator;
+public function ifIsSubsetOf( $values, array $list, $continue = 1 ) : FluidValidator;
+public function ifIsSubsetOfOrNull( $values, array $list, $continue = 1 ) : FluidValidator;
+public function ifIsUuid( $value, $continue = 1 ) : FluidValidator;
+public function ifIsUuidOrNull( $value, $continue = 1 ) : FluidValidator;
+public function ifIsEqual( $value1, $value2, $continue = 1 ) : FluidValidator;
+public function ifIsNotEqual( $value1, $value2, $continue = 1 ) : FluidValidator;
+public function ifIsSame( $value1, $value2, $continue = 1 ) : FluidValidator;
+public function ifIsNotSame( $value1, $value2, $continue = 1 ) : FluidValidator;
+public function ifIsNull( $value, $continue = 1 ) : FluidValidator;
+public function ifIsNotNull( $value, $continue = 1 ) : FluidValidator;
+public function ifMatchesRegex( $value, $regex, $continue = 1 ) : FluidValidator;
+public function ifMatchesRegexOrNull( $value, $regex, $continue = 1 ) : FluidValidator;
+public function ifHasLength( $value, $length, $continue = 1 ) : FluidValidator;
+public function ifHasLengthOrNull( $value, $length, $continue = 1 ) : FluidValidator;
+public function ifHasMinLength( $value, $minLength, $continue = 1 ) : FluidValidator;
+public function ifHasMinLengthOrNull( $value, $minLength, $continue = 1 ) : FluidValidator;
+public function ifHasMaxLength( $value, $maxLength, $continue = 1 ) : FluidValidator;
+public function ifHasMaxLengthOrNull( $value, $maxLength, $continue = 1 ) : FluidValidator;
+public function ifCounts( $values, $count, $continue = 1 ) : FluidValidator;
+public function ifCountsOrNull( $values, $count, $continue = 1 ) : FluidValidator;
+public function ifIsEmail( $value, $continue = 1 ) : FluidValidator;
+public function ifIsEmailOrNull( $value, $continue = 1 ) : FluidValidator;
+public function ifIsUrl( $value, $continue = 1 ) : FluidValidator;
+public function ifIsUrlNull( $value, $continue = 1 ) : FluidValidator;
+public function ifIsJson( $value, $continue = 1 ) : FluidValidator;
+public function ifIsJsonOrNull( $value, $continue = 1 ) : FluidValidator;
+public function ifHasKey( $values, $key, $continue = 1 ) : FluidValidator;
+public function ifHasKeyOrNull( $values, $key, $continue = 1 ) : FluidValidator;
+public function ifIsDate( $dateString, $format = 'Y-m-d', $continue = 1 ) : FluidValidator;
+public function ifIsDateOrNull( $dateString, $format = 'Y-m-d', $continue = 1 ) : FluidValidator;
+public function ifIsTrue( $value, $continue = 1 ) : FluidValidator;
+public function ifIsTrueOrNull( $value, $continue = 1 ) : FluidValidator;
+public function ifIsFalse( $value, $continue = 1 ) : FluidValidator;
+public function ifIsFalseOrNull( $value, $continue = 1 ) : FluidValidator;
 ```
 
 ## Non-validation methods

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "hollodotme/fluid-validator",
-	"description": "Validating values with a fluid interfaced class",
+	"description": "Validating values with a fluent interfaced class",
 	"minimum-stability": "dev",
 	"prefer-stable": true,
 	"license": "MIT",

diff --git a/composer.lock b/composer.lock