Merge pull request #4 from KaririCode-Framework/develop

Develop

src/Contract/ValidationResult.php

@@ -6,11 +6,7 @@
 
 interface ValidationResult
 {
-    public function addError(string $property, string $errorKey, string $message): void;
-
-    public function setValidatedData(string $property, mixed $value): void;
-
-    public function hasErrors(): bool;
+    public function isValid(): bool;
 
     public function getErrors(): array;
 

src/Result/ValidationResult.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KaririCode\Validator\Result;
+
+use KaririCode\ProcessorPipeline\Result\ProcessingResultCollection;
+use KaririCode\Validator\Contract\ValidationResult as ValidationResultContract;
+
+final class ValidationResult implements ValidationResultContract
+{
+    public function __construct(
+        private readonly ProcessingResultCollection $results
+    ) {
+    }
+
+    public function isValid(): bool
+    {
+        return !$this->results->hasErrors();
+    }
+
+    public function getErrors(): array
+    {
+        return $this->results->getErrors();
+    }
+
+    public function getValidatedData(): array
+    {
+        return $this->results->getProcessedData();
+    }
+
+    public function toArray(): array
+    {
+        return $this->results->toArray();
+    }
+}

src/Validator.php

@@ -6,34 +6,41 @@
 
 use KaririCode\Contract\Processor\ProcessorRegistry;
 use KaririCode\Contract\Validator\Validator as ValidatorContract;
+use KaririCode\ProcessorPipeline\Handler\ProcessorAttributeHandler;
 use KaririCode\ProcessorPipeline\ProcessorBuilder;
 use KaririCode\PropertyInspector\AttributeAnalyzer;
-use KaririCode\PropertyInspector\AttributeHandler;
 use KaririCode\PropertyInspector\Utility\PropertyInspector;
 use KaririCode\Validator\Attribute\Validate;
-use KaririCode\Validator\Processor\DefaultValidationResultProcessor;
+use KaririCode\Validator\Result\ValidationResult;
 
-class Validator implements ValidatorContract
+final class Validator implements ValidatorContract
 {
     private const IDENTIFIER = 'validator';
 
-    private ProcessorBuilder $builder;
+    private readonly ProcessorBuilder $builder;
 
     public function __construct(
-        private readonly ProcessorRegistry $registry,
+        private readonly ProcessorRegistry $registry
     ) {
         $this->builder = new ProcessorBuilder($this->registry);
     }
 
     public function validate(mixed $object): ValidationResult
     {
+        $handler = new ProcessorAttributeHandler(
+            self::IDENTIFIER,
+            $this->builder
+        );
+
         $propertyInspector = new PropertyInspector(
             new AttributeAnalyzer(Validate::class)
         );
-        $attributeHandler = new AttributeHandler(self::IDENTIFIER, $this->builder);
-        $resultProcessor = new DefaultValidationResultProcessor();
-        $handler = $propertyInspector->inspect($object, $attributeHandler);
 
-        return $resultProcessor->process($handler);
+        /** @var PropertyAttributeHandler */
+        $handler = $propertyInspector->inspect($object, $handler);
+
+        return new ValidationResult(
+            $handler->getProcessingResults()
+        );
     }
 }