Merge pull request #68 from rakit/improve-rules-check-method

Rule::check must return bool

Author: emsifa

src/Rule.php

@@ -27,7 +27,7 @@ abstract class Rule
     /** @var string */
     protected $message = "The :attribute is invalid";
 
-    abstract public function check($value);
+    abstract public function check($value): bool;
 
     /**
      * Set Validation class instance

src/Rules/Defaults.php

@@ -17,13 +17,13 @@ class Defaults extends Rule
      * Check the $value is valid
      *
      * @param mixed $value
-     * @return mixed
+     * @return bool
      */
-    public function check($value)
+    public function check($value): bool
     {
         $this->requireParameters($this->fillableParams);
 
         $default = $this->parameter('default');
-        return $default;
+        return true;
     }
 }

src/Validation.php

@@ -134,7 +134,7 @@ protected function validateAttribute(Attribute $attribute)
             $ruleValidator->setAttribute($attribute);
 
             if ($isEmptyValue && $ruleValidator instanceof Defaults) {
-                $value = $ruleValidator->check(null);
+                $value = $ruleValidator->parameter('default');
                 $isEmptyValue = $this->isEmptyValue($value);
                 continue;
             }

tests/Fixtures/Even.php

@@ -9,7 +9,7 @@ class Even extends Rule
 
     protected $message = "The :attribute must be even";
 
-    public function check($value)
+    public function check($value): bool
     {
         if (! is_numeric($value)) {
             return false;

tests/Fixtures/Required.php

@@ -7,7 +7,7 @@
 class Required extends Rule
 {
 
-    public function check($value)
+    public function check($value): bool
     {
         return true;
     }

tests/Rules/DefaultsTest.php

@@ -7,16 +7,16 @@
 
 class DefaultsTest extends TestCase
 {
-
     public function setUp()
     {
         $this->rule = new Defaults;
     }
 
     public function testDefaults()
     {
-        $this->assertEquals($this->rule->fillParameters([10])->check(null), 10);
-        $this->assertEquals($this->rule->fillParameters(['something'])->check(null), 'something');
-        $this->assertEquals($this->rule->fillParameters([[1,2,3]])->check('anything'), [1,2,3]);
+        $this->assertTrue($this->rule->fillParameters([10])->check(0));
+        $this->assertTrue($this->rule->fillParameters(['something'])->check(null));
+        $this->assertTrue($this->rule->fillParameters([[1,2,3]])->check(false));
+        $this->assertTrue($this->rule->fillParameters([[1,2,3]])->check([]));
     }
 }