Fix array configs

Author: SerafimArts

resources/config.schema.json

@@ -6,16 +6,6 @@
     "description": "A mapper configuration schema",
     "additionalProperties": false,
     "properties": {
-        "type_error_message": {
-            "type": "string",
-            "minLength": 1,
-            "description": "Custom error message on property type error"
-        },
-        "undefined_error_message": {
-            "type": "string",
-            "minLength": 1,
-            "description": "Custom error message on property value missing error"
-        },
         "normalize_as_array": {
             "type": "boolean",
             "description": "Responsible for enabling or disabling the conversion to an associative array"
@@ -71,6 +61,16 @@
                                     "description": "Specific property type",
                                     "minLength": 1
                                 },
+                                "type_error_message": {
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "description": "Custom error message on property type error"
+                                },
+                                "undefined_error_message": {
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "description": "Custom error message on property value missing error"
+                                },
                                 "skip": {
                                     "description": "Rules according to which a property should be excluded during normalization",
                                     "anyOf": [

src/Mapping/Driver/ArrayConfigDriver.php

@@ -19,6 +19,28 @@
 use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
 use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
 
+/**
+ * @phpstan-type PropertyConfigType array{
+ *     name?: non-empty-string,
+ *     type?: non-empty-string,
+ *     skip?: 'null'|'empty'|non-empty-string|list<'null'|'empty'|non-empty-string>,
+ *     type_error_message?: non-empty-string,
+ *     undefined_error_message?: non-empty-string,
+ *     ...
+ * }
+ *
+ * @phpstan-type ClassDiscriminatorConfigType array{
+ *     field: non-empty-string,
+ *     map: array<non-empty-string, non-empty-string>,
+ *     otherwise?: non-empty-string,
+ * }
+ *
+ * @phpstan-type ClassConfigType array{
+ *     normalize_as_array?: bool,
+ *     discriminator?: ClassDiscriminatorConfigType,
+ *     properties?: array<non-empty-string, non-empty-string|PropertyConfigType>
+ * }
+ */
 abstract class ArrayConfigDriver extends LoadableDriver
 {
     private static ?bool $supportsSchemaValidation = null;
@@ -42,22 +64,7 @@ abstract protected function getConfiguration(\ReflectionClass $class): ?array;
     /**
      * @param \ReflectionClass<object> $class
      *
-     * @return array{
-     *     normalize_as_array?: bool,
-     *     type_error_message?: non-empty-string,
-     *     undefined_error_message?: non-empty-string,
-     *     discriminator?: array{
-     *         field: non-empty-string,
-     *         map: array<non-empty-string, non-empty-string>,
-     *         otherwise?: non-empty-string,
-     *     },
-     *     properties?: array<non-empty-string, non-empty-string|array{
-     *         name?: non-empty-string,
-     *         type?: non-empty-string,
-     *         skip?: 'null'|'empty'|non-empty-string|list<'null'|'empty'|non-empty-string>,
-     *         ...
-     *     }>
-     * }|null
+     * @return ClassConfigType|null
      * @throws \InvalidArgumentException
      */
     private function getConfigurationAndValidate(\ReflectionClass $class): ?array