chore: changed rule validate to assert for coherence with validator and added bool validate

Author: andrepimpao

src/ChainedValidatorInterface.php

@@ -6,18 +6,16 @@
 
 interface ChainedValidatorInterface
 {
-    // --- Common ---
-
-    public function validate(mixed $value): bool;
-
     /**
      * @throws ValidationException
      */
     public function assert(mixed $value, string $name): void;
 
+    public function validate(mixed $value): bool;
+
     // --- Rules ---
 
-    public function notBlank(?string $message = null): ChainedValidatorInterface;
+    public function notBlank(string $message = null): ChainedValidatorInterface;
 
-    public function greaterThan(mixed $constraint, ?string $message = null): ChainedValidatorInterface;
+    public function greaterThan(mixed $constraint, string $message = null): ChainedValidatorInterface;
 }

src/Rule/AbstractRule.php

@@ -2,19 +2,24 @@
 
 namespace ProgrammatorDev\YetAnotherPhpValidator\Rule;
 
-class AbstractRule
-{
-    private string $name;
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 
-    public function setName(string $name): static
+abstract class AbstractRule
+{
+    public function validate($value): bool
     {
-        $this->name = $name;
+        try {
+            $this->assert($value, 'null');
+        }
+        catch (ValidationException) {
+            return false;
+        }
 
-        return $this;
+        return true;
     }
+
+    /**
+     * @throws ValidationException
+     */
+    public abstract function assert(mixed $value, string $name): void;
 }

src/Rule/GreaterThan.php

@@ -18,7 +18,7 @@ public function __construct(
     /**
      * @throws GreaterThanException
      */
-    public function validate(mixed $value): void
+    public function assert(mixed $value, string $name): void
     {
         if (!$this->canBeCompared($this->constraint, $value)) {
             throw new \LogicException(
@@ -34,7 +34,7 @@ public function validate(mixed $value): void
             throw new GreaterThanException(
                 message: $this->message,
                 parameters: [
-                    'name' => $this->getName(),
+                    'name' => $name,
                     'constraint' => $this->constraint,
                     'value' => $value
                 ]

src/Rule/NotBlank.php

@@ -16,14 +16,14 @@ public function __construct(string $message = null)
     /**
      * @throws NotBlankException
      */
-    public function validate(mixed $value): void
+    public function assert(mixed $value, string $name): void
     {
         // Do not allow null, false, [] and ''
         if ($value === false || (empty($value) && $value != '0')) {
             throw new NotBlankException(
                 message: $this->message,
                 parameters: [
-                    'name' => $this->getName(),
+                    'name' => $name,
                     'value' => $value
                 ]
             );

src/Rule/RuleInterface.php

@@ -9,9 +9,7 @@ interface RuleInterface
     /**
      * @throws ValidationException
      */
-    public function validate(mixed $value): void;
+    public function assert(mixed $value, string $name): void;
 
-    public function getName(): string;
-
-    public function setName(string $name): static;
+    public function validate(mixed $value): bool;
 }

src/StaticValidatorInterface.php

@@ -4,7 +4,7 @@
 
 interface StaticValidatorInterface
 {
-    public static function notBlank(?string $message = null): ChainedValidatorInterface;
+    public static function notBlank(string $message = null): ChainedValidatorInterface;
 
-    public static function greaterThan(mixed $constraint, ?string $message = null): ChainedValidatorInterface;
+    public static function greaterThan(mixed $constraint, string $message = null): ChainedValidatorInterface;
 }

src/Validator.php

@@ -48,7 +48,7 @@ public function __call(string $ruleName, array $arguments = []): self
     public function assert(mixed $value, string $name): void
     {
         foreach ($this->getRules() as $rule) {
-            $rule->setName($name)->validate($value);
+            $rule->assert($value, $name);
         }
     }