improved Validation with more tests

PHPPlatform · Apr 18, 2018 · 49c4454 · 49c4454
1 parent 7326b7d
commit 49c4454
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 10 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/RESTFul/Validation.php b/src/RESTFul/Validation.php
@@ -87,6 +87,16 @@ function required(){
 	    return $this;
 	}
 
+	function ifPresent(){
+	    if($this->continue){
+	        if(!isset($this->data)){
+	            $this->continue = false;
+	            unset($this->parentValidation->data[$this->key]);
+	        }
+	    }
+	    return $this;
+	}
+
 	function defaultValue($value){
 	    if($this->continue){
 	        if(!isset($this->data)){
@@ -128,6 +138,7 @@ function inRange($min = null,$max = null){
 	            $this->continue = false;
 	        }
 	    }
+	    return $this;
 	}
 
 	function isTimestamp(){

diff --git a/tests/RESTFul/TestValidation.php b/tests/RESTFul/TestValidation.php
@@ -229,7 +229,27 @@ function($validation){
                 },
                 ['a'=>'invalid']
             ],
-
+            'ifPresent if present and valid'=>[
+                ['a'=>'Raghavendragmail.com','b'=>true,'c'=>'z'],
+                function($validation){
+                    $validation->key('a')->ifPresent()->isString()->hasLength(1,100);
+                },
+                []
+            ],
+            'ifPresent if present and invalid'=>[
+                ['a'=>'Raghavendragmail.com','b'=>true,'c'=>'z'],
+                function($validation){
+                    $validation->key('a')->ifPresent()->isString()->hasLength(1,10);
+                },
+                ['a'=>'invalid']
+            ],
+            'ifPresent if not present'=>[
+                ['b'=>true,'c'=>'z'],
+                function($validation){
+                    $validation->key('a')->ifPresent()->isString()->hasLength(1,100);
+                },
+                []
+            ],
         ];
     }