Merge branch '0.7' into 0.8

Respect · Feb 20, 2015 · 472be85 · 472be85
2 parents 378e114 + fa90e9a
commit 472be85
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 7 deletions.
diff --git a/library/Rules/AbstractRelated.php b/library/Rules/AbstractRelated.php
@@ -65,12 +65,15 @@ public function check($input)
 
     public function validate($input)
     {
-        $hasReference = $this->hasReference($input);
+        if ($input === '') {
+            return true;
+        }
 
+        $hasReference = $this->hasReference($input);
         if ($this->mandatory && !$hasReference) {
             return false;
         }
 
-        return $this->decision('validate', $hasReference, $input) || $this->getReferenceValue($input) === '';
+        return $this->decision('validate', $hasReference, $input);
     }
 }
diff --git a/tests/Rules/KeyTest.php b/tests/Rules/KeyTest.php
@@ -13,14 +13,43 @@ public function testArrayWithPresentKeyShouldReturnTrue()
         $this->assertTrue($validator->validate($obj));
     }
 
+    public function testEmptyInputMustReturnTrue()
+    {
+        $validator = new Key('someEmptyKey');
+        $input = '';
+
+        $this->assertTrue($validator->assert($input));
+        $this->assertTrue($validator->check($input));
+        $this->assertTrue($validator->validate($input));
+    }
+
     public function testArrayWithEmptyKeyShouldReturnTrue()
     {
         $validator = new Key('someEmptyKey');
-        $obj = array();
-        $obj['someEmptyKey'] = '';
-        $this->assertTrue($validator->assert($obj));
-        $this->assertTrue($validator->check($obj));
-        $this->assertTrue($validator->validate($obj));
+        $input = array();
+        $input['someEmptyKey'] = '';
+
+        $this->assertTrue($validator->assert($input));
+        $this->assertTrue($validator->check($input));
+        $this->assertTrue($validator->validate($input));
+    }
+
+    public function testShouldHaveTheSameReturnValueForAllValidators()
+    {
+        $rule   = new Key('key', new NotEmpty());
+        $input  = array('key' => '');
+
+        try {
+            $rule->assert($input);
+            $this->fail('`assert()` must throws exception');
+        } catch (\Exception $e) {}
+
+        try {
+            $rule->check($input);
+            $this->fail('`check()` must throws exception');
+        } catch (\Exception $e) {}
+
+        $this->assertFalse($rule->validate($input));
     }
 
     /**