feat: Support array of types

src/ErrorInfo.php → src/ErrorHolder.php

@@ -30,7 +30,7 @@
 use Exception;
 use Respect\Validation\Exceptions\NestedValidationException as RespectNestedValidationException;
 
-class ErrorInfo
+class ErrorHolder
 {
     private Context $context;
 
@@ -62,18 +62,19 @@ public function hasErrors(): bool
     public function addError(Exception|string $error): void
     {
         $propertyPath = $this->context->getOptional('internal.currentProperty', []);
-        $errors = &$this->errors;
-        foreach ($propertyPath as $property) {
-            if (! isset($errors[$property])) {
-                $errors[$property] = [];
-            }
-
-            $errors = &$errors[$property];
-        }
+        $fullPropertyPath = implode('.', $propertyPath);
         if ($error instanceof RespectNestedValidationException) {
-            $errors += array_values($error->getMessages());
+            foreach (array_values($error->getMessages()) as $message) {
+                $this->errors[] = [
+                    'field' => $fullPropertyPath,
+                    'reason' => $message,
+                ];
+            }
         } else {
-            $errors[] = is_string($error) ? $error : $error->getMessage();
+            $this->errors[] = [
+                'field' => $fullPropertyPath,
+                'reason' => is_string($error) ? $error : $error->getMessage(),
+            ];
         }
 
         if ($this->context->get('option.stopFirstError')) {

src/Exceptions/BaseException.php

@@ -4,22 +4,22 @@
 
 namespace Attributes\Validation\Exceptions;
 
-use Attributes\Validation\ErrorInfo;
+use Attributes\Validation\ErrorHolder;
 use Exception;
 use Throwable;
 
 abstract class BaseException extends Exception
 {
-    private ?ErrorInfo $result;
+    private ?ErrorHolder $errorHolder;
 
-    public function __construct(string $message, ?ErrorInfo $result = null, ?Throwable $previous = null)
+    public function __construct(string $message, ?ErrorHolder $errorHolder = null, ?Throwable $previous = null)
     {
-        $this->result = $result;
+        $this->errorHolder = $errorHolder;
         parent::__construct($message, 0, $previous);
     }
 
-    public function getInfo(): ?ErrorInfo
+    public function getErrors(): array
     {
-        return $this->result;
+        return $this->errorHolder ? $this->errorHolder->getErrors() : [];
     }
 }

src/Property.php

@@ -12,13 +12,10 @@ class Property
 
     private mixed $value;
 
-    private string $modelClass;
-
-    public function __construct(ReflectionProperty $property, mixed $value, string $modelClass)
+    public function __construct(ReflectionProperty $property, mixed $value)
     {
         $this->property = $property;
         $this->value = $value;
-        $this->modelClass = $modelClass;
     }
 
     public function getName(): string
@@ -40,9 +37,4 @@ public function getReflection(): ReflectionProperty
     {
         return $this->property;
     }
-
-    public function getModelClass(): string
-    {
-        return $this->modelClass;
-    }
 }

src/Types/ArrArr.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Attributes\Validation\Types;
+
+class ArrArr extends ArrayOf
+{
+    private array $type;
+}

src/Types/ArrayOf.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Attributes\Validation\Types;
+
+use ArrayObject;
+use Attributes\Validation\Exceptions\ValidationException;
+
+abstract class ArrayOf extends ArrayObject
+{
+    public function __construct(array $array = [])
+    {
+        if (! property_exists($this, 'type')) {
+            throw new ValidationException('Missing property \'type\' in '.self::class);
+        }
+        parent::__construct($array);
+    }
+}

src/Types/BoolArr.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Attributes\Validation\Types;
+
+class BoolArr extends ArrayOf
+{
+    private bool $type;
+}

src/Types/FloatArr.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Attributes\Validation\Types;
+
+class FloatArr extends ArrayOf
+{
+    private float $type;
+}

src/Types/IntArr.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Attributes\Validation\Types;
+
+class IntArr extends ArrayOf
+{
+    private int $type;
+}

src/Types/ObjArr.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Attributes\Validation\Types;
+
+class ObjArr extends ArrayOf
+{
+    private object $type;
+}

src/Types/StrArr.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Attributes\Validation\Types;
+
+class StrArr extends ArrayOf
+{
+    private string $type;
+}

src/Validator.php

@@ -70,8 +70,8 @@ public function validate(array $data, string|object $model): object
 
         $validModel = is_string($model) ? new $model : $model;
         $reflectionClass = new ReflectionClass($validModel);
-        $errorInfo = $this->context->getOptional(ErrorInfo::class) ?: new ErrorInfo($this->context);
-        $this->context->set(ErrorInfo::class, $errorInfo, override: true);
+        $errorInfo = $this->context->getOptional(ErrorHolder::class) ?: new ErrorHolder($this->context);
+        $this->context->set(ErrorHolder::class, $errorInfo, override: true);
         $defaultAliasGenerator = $this->getDefaultAliasGenerator($reflectionClass);
         foreach ($reflectionClass->getProperties() as $reflectionProperty) {
             $propertyName = $reflectionProperty->getName();
@@ -89,7 +89,7 @@ public function validate(array $data, string|object $model): object
             }
 
             $propertyValue = $data[$aliasName];
-            $property = new Property($reflectionProperty, $propertyValue, $validModel::class);
+            $property = new Property($reflectionProperty, $propertyValue);
             $this->context->set(Property::class, $property, override: true);
 
             try {

src/Validators/AttributesValidator.php

@@ -5,7 +5,7 @@
 namespace Attributes\Validation\Validators;
 
 use Attributes\Validation\Context;
-use Attributes\Validation\ErrorInfo;
+use Attributes\Validation\ErrorHolder;
 use Attributes\Validation\Exceptions\ContextPropertyException;
 use Attributes\Validation\Property;
 use ReflectionAttribute;
@@ -33,7 +33,7 @@ public function validate(Property $property, Context $context): void
             return;
         }
 
-        $errorInfo = $context->get(ErrorInfo::class);
+        $errorInfo = $context->get(ErrorHolder::class);
         foreach ($allAttributes as $attribute) {
             $className = $attribute->getName();
             if ($className == Rules\DateTime::class) {

src/Validators/ChainValidator.php

@@ -5,7 +5,7 @@
 namespace Attributes\Validation\Validators;
 
 use Attributes\Validation\Context;
-use Attributes\Validation\ErrorInfo;
+use Attributes\Validation\ErrorHolder;
 use Attributes\Validation\Exceptions\ContinueValidationException;
 use Attributes\Validation\Exceptions\ValidationException;
 use Attributes\Validation\Property;
@@ -25,7 +25,7 @@ class ChainValidator implements PropertyValidator
      */
     public function validate(Property $property, Context $context): void
     {
-        $errorInfo = $context->get(ErrorInfo::class);
+        $errorInfo = $context->get(ErrorHolder::class);
         foreach ($this->allValidators as $validator) {
             try {
                 $validator->validate($property, $context);

src/Validators/TypeHintValidator.php

@@ -4,6 +4,7 @@
 
 namespace Attributes\Validation\Validators;
 
+use ArrayObject;
 use Attributes\Validation\Context;
 use Attributes\Validation\Exceptions\ContextPropertyException;
 use Attributes\Validation\Exceptions\ValidationException;
@@ -138,8 +139,8 @@ private function getDefaultRules(): array
             'enum' => new TypeValidators\RawEnum,
             'null' => new TypeValidators\RawNull,
             DateTime::class => new TypeValidators\DateTime,
-            DateTimeInterface::class => new TypeValidators\DateTime,
             'interface' => new TypeValidators\StrictType,
+            ArrayObject::class => new TypeValidators\ArrayObject,
             'default' => new TypeValidators\AnyClass,
         ];
     }
@@ -156,6 +157,10 @@ public function getTypeValidator(ReflectionNamedType|ReflectionType $propertyTyp
         $typeHintName = $propertyType->getName();
         $typeName = isset($this->typeHintRules[$typeHintName]) ? $typeHintName : 'default';
         if ($typeName == 'default') {
+            if (is_subclass_of($typeHintName, ArrayObject::class)) {
+                return $this->typeHintRules[ArrayObject::class];
+            }
+
             if (enum_exists($typeHintName)) {
                 return $this->typeHintRules['enum'];
             }