fix a bug in all AbstractObjectSchema implementations

Author: dominikzogg

src/Schema/AssocSchema.php

@@ -15,24 +15,28 @@ final class AssocSchema extends AbstractObjectSchema implements ObjectSchemaInte
     /**
      * @param array<string, mixed> $input
      *
-     * @return array<string, mixed>
+     * @return null|array<string, mixed>
      */
-    protected function parseFields(array $input, Errors $childrenErrors): array
+    protected function parseFields(array $input, Errors $childrenErrors): ?array
     {
-        $output = [];
+        $fields = [];
 
         foreach ($this->getFieldToSchema() as $fieldName => $fieldSchema) {
             try {
                 if ($this->skip($input, $fieldName)) {
                     continue;
                 }
 
-                $output[$fieldName] = $fieldSchema->parse($input[$fieldName] ?? null);
+                $fields[$fieldName] = $fieldSchema->parse($input[$fieldName] ?? null);
             } catch (ErrorsException $e) {
                 $childrenErrors->add($e->errors, $fieldName);
             }
         }
 
-        return $output;
+        if ($childrenErrors->has()) {
+            return null;
+        }
+
+        return $fields;
     }
 }

src/Schema/ObjectSchema.php

@@ -16,15 +16,18 @@ final class ObjectSchema extends AbstractObjectSchema implements ObjectSchemaInt
      * @param array<mixed, mixed> $fieldToSchema
      * @param class-string        $classname
      */
-    public function __construct(array $fieldToSchema, private string $classname = \stdClass::class, private bool $construct = false)
-    {
+    public function __construct(
+        array $fieldToSchema,
+        private string $classname = \stdClass::class,
+        private bool $construct = false
+    ) {
         parent::__construct($fieldToSchema);
     }
 
     /**
      * @param array<string, mixed> $input
      */
-    protected function parseFields(array $input, Errors $childrenErrors): object
+    protected function parseFields(array $input, Errors $childrenErrors): ?object
     {
         $fields = [];
         foreach ($this->getFieldToSchema() as $fieldName => $fieldSchema) {
@@ -39,6 +42,10 @@ protected function parseFields(array $input, Errors $childrenErrors): object
             }
         }
 
+        if ($childrenErrors->has()) {
+            return null;
+        }
+
         if (!$this->construct) {
             $object = new ($this->classname);
 

tests/Unit/Schema/AssocSchemaTest.php

@@ -4,6 +4,7 @@
 
 namespace Chubbyphp\Tests\Parsing\Unit\Schema;
 
+use Chubbyphp\Parsing\Errors;
 use Chubbyphp\Parsing\ErrorsException;
 use Chubbyphp\Parsing\Schema\AssocSchema;
 use Chubbyphp\Parsing\Schema\BoolSchema;
@@ -289,6 +290,29 @@ public function testParseFailedWithFailedFields(): void
         }
     }
 
+    public function testParseFieldsReturnsNullWithChildrenErrors(): void
+    {
+        $schema = new AssocSchema(['field1' => new StringSchema(), 'field2' => new IntSchema()]);
+        $childrenErrors = new Errors();
+
+        $parseFields = new \ReflectionMethod(AssocSchema::class, 'parseFields');
+        $parseFields->setAccessible(true);
+
+        self::assertNull($parseFields->invoke($schema, ['field1' => 'test', 'field2' => 'invalid'], $childrenErrors));
+        self::assertSame([
+            [
+                'path' => 'field2',
+                'error' => [
+                    'code' => 'int.type',
+                    'template' => 'Type should be "int", {{given}} given',
+                    'variables' => [
+                        'given' => 'string',
+                    ],
+                ],
+            ],
+        ], $childrenErrors->jsonSerialize());
+    }
+
     public function testParseFailedWithOptionalButStillNotProvidedEnoughFields(): void
     {
         try {

tests/Unit/Schema/ObjectSchemaTest.php

@@ -4,6 +4,7 @@
 
 namespace Chubbyphp\Tests\Parsing\Unit\Schema;
 
+use Chubbyphp\Parsing\Errors;
 use Chubbyphp\Parsing\ErrorsException;
 use Chubbyphp\Parsing\Schema\BoolSchema;
 use Chubbyphp\Parsing\Schema\FloatSchema;
@@ -348,6 +349,29 @@ public function testParseFailedWithFailedFields(): void
         }
     }
 
+    public function testParseFieldsReturnsNullWithChildrenErrors(): void
+    {
+        $schema = new ObjectSchema(['field1' => new StringSchema(), 'field2' => new IntSchema()]);
+        $childrenErrors = new Errors();
+
+        $parseFields = new \ReflectionMethod(ObjectSchema::class, 'parseFields');
+        $parseFields->setAccessible(true);
+
+        self::assertNull($parseFields->invoke($schema, ['field1' => 'test', 'field2' => 'invalid'], $childrenErrors));
+        self::assertSame([
+            [
+                'path' => 'field2',
+                'error' => [
+                    'code' => 'int.type',
+                    'template' => 'Type should be "int", {{given}} given',
+                    'variables' => [
+                        'given' => 'string',
+                    ],
+                ],
+            ],
+        ], $childrenErrors->jsonSerialize());
+    }
+
     public function testParseFailedWithOptionalButStillNotProvidedEnoughFields(): void
     {
         try {