Fix wrong behavior when calling not() rule

Respect · Jan 19, 2015 · fb54341 · fb54341
1 parent 856d8fd
commit fb54341
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/library/Validator.php b/library/Validator.php
@@ -146,8 +146,8 @@ public static function buildRule($ruleSpec, $arguments = array())
      */
     public function __call($method, $arguments)
     {
-        if ('not' === $method) {
-            return $arguments ? static::buildRule($method, $arguments) : new Rules\Not($this);
+        if ('not' === $method && empty($arguments)) {
+            return new static(new Rules\Not($this));
         }
 
         return $this->addRule(static::buildRule($method, $arguments));

diff --git a/tests/library/Respect/Validation/ValidatorTest.php b/tests/library/Respect/Validation/ValidatorTest.php
@@ -90,5 +90,24 @@ public function testKeysAsValidatorNames()
     \-"" must be a valid date', $e->getFullMessage());
         }
     }
-}
 
+    /**
+     * Regression test #174.
+     */
+    public function testShouldReturnANewValidatorInstanceWhenTheNotRuleIsCalledWithoutAnyArgument()
+    {
+        $validator = new Validator();
+
+        $this->assertInstanceOf('Respect\Validation\Validator', $validator->not());
+    }
+
+    /**
+     * Regression test #174.
+     */
+    public function testShouldReturnValidatorInstanceWhenTheNotRuleIsCalledWithArguments()
+    {
+        $validator = new Validator();
+
+        $this->assertSame($validator, $validator->not($validator->notEmpty()));
+    }
+}