Add ValidationConverterInterface

Make CakeValidationValidationConverter non static

Author: odan

src/Converter/CakeValidationConverter.php …er/CakeValidationValidationConverter.phpsrc/Converter/CakeValidationConverter.php renamed to src/Converter/CakeValidationValidationConverter.php src/Converter/CakeValidationConverter.php renamed to src/Converter/CakeValidationValidationConverter.php

@@ -7,20 +7,20 @@
 /**
  * CakePHP validation error convert.
  */
-final class CakeValidationConverter
+final class CakeValidationValidationConverter implements ValidationConverterInterface
 {
     /**
      * Create validation result from array with errors.
      *
-     * @param array<mixed> $errors The validation errors
+     * @param array $errors The validation errors
      *
      * @return ValidationResult The result
      */
-    public static function createValidationResult(array $errors): ValidationResult
+    public function createValidationResult($errors): ValidationResult
     {
         $result = new ValidationResult();
 
-        static::addErrors($result, $errors);
+        $this->addErrors($result, (array)$errors);
 
         return $result;
     }
@@ -29,15 +29,17 @@ public static function createValidationResult(array $errors): ValidationResult
      * Add errors.
      *
      * @param ValidationResult $result The result
-     * @param array<mixed> $errors The errors
+     * @param array $errors The errors
      * @param string $path The path
+     *
+     * @return void
      */
-    private static function addErrors(ValidationResult $result, array $errors, string $path = ''): void
+    private function addErrors(ValidationResult $result, array $errors, string $path = ''): void
     {
         foreach ($errors as $field => $error) {
             $oldPath = $path;
             $path .= ($path === '' ? '' : '.') . $field;
-            static::addSubErrors($result, $error, $path);
+            $this->addSubErrors($result, $error, $path);
             $path = $oldPath;
         }
     }
@@ -46,14 +48,16 @@ private static function addErrors(ValidationResult $result, array $errors, strin
      * Add sub errors.
      *
      * @param ValidationResult $result The result
-     * @param array<mixed> $error The error
+     * @param array $error The error
      * @param string $path The path
+     *
+     * @return void
      */
-    private static function addSubErrors(ValidationResult $result, array $error, string $path = ''): void
+    private function addSubErrors(ValidationResult $result, array $error, string $path = ''): void
     {
         foreach ($error as $field2 => $errorMessage) {
             if (is_array($errorMessage)) {
-                static::addErrors($result, [$field2 => $errorMessage], $path);
+                $this->addErrors($result, [$field2 => $errorMessage], $path);
             } else {
                 $result->addError($path, $errorMessage);
             }

src/Converter/ValidationConverterInterface.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Selective\Validation\Converter;
+
+use Selective\Validation\ValidationResult;
+
+/**
+ * Converter interface.
+ */
+interface ValidationConverterInterface
+{
+    /**
+     * Create validation result from array with errors.
+     *
+     * @param mixed $errors The constraint violations to add to the list
+     *
+     * @return ValidationResult The result
+     */
+    public function createValidationResult($errors): ValidationResult;
+}

src/Factory/CakeValidationFactory.php

@@ -3,13 +3,11 @@
 namespace Selective\Validation\Factory;
 
 use Cake\Validation\Validator;
-use Selective\Validation\Converter\CakeValidationConverter;
+use Selective\Validation\Converter\CakeValidationValidationConverter;
 use Selective\Validation\ValidationResult;
 
 /**
  * Cake Validation factory.
- *
- * @deprecated
  */
 final class CakeValidationFactory
 {
@@ -32,6 +30,6 @@ public function createValidator(): Validator
      */
     public function createValidationResult(array $errors): ValidationResult
     {
-        return (new CakeValidationConverter())->createValidationResult($errors);
+        return (new CakeValidationValidationConverter())->createValidationResult($errors);
     }
 }

tests/Converter/CakeValidationFactoryTest.php

@@ -3,7 +3,7 @@
 namespace Selective\Validation\Test\Converter;
 
 use PHPUnit\Framework\TestCase;
-use Selective\Validation\Converter\CakeValidationConverter;
+use Selective\Validation\Converter\CakeValidationValidationConverter;
 use Selective\Validation\Transformer\ErrorDetailsResultTransformer;
 use Selective\Validation\ValidationResult;
 
@@ -31,7 +31,7 @@ private function getValidationResultAsArray(ValidationResult $validationResult):
      */
     public function testCreateResultFromErrorsSimple()
     {
-        $result = CakeValidationConverter::createValidationResult([
+        $result = (new CakeValidationValidationConverter())->createValidationResult([
             'first_name' => [
                 '_empty' => 'This field cannot be left empty',
             ],
@@ -104,7 +104,7 @@ public function testCreateResultFromErrorsSimple()
      */
     public function testCreateResultFromErrorsNestedArray()
     {
-        $result = CakeValidationConverter::createValidationResult([
+        $result = (new CakeValidationValidationConverter())->createValidationResult([
             'bills' => [
                 0 => [
                     'billing_number' => [