Change all occurrences of rawModelDataInput to modelData (#56)

Change all occurrences of `rawModelDataInput` to `modelData` (compare #55)

Author: wol-soft

src/PropertyProcessor/Property/BaseProcessor.php

@@ -43,7 +43,7 @@ class BaseProcessor extends AbstractPropertyProcessor
         'count(
             array_unique(
                 array_merge(
-                    array_keys($this->_rawModelDataInput),
+                    array_keys($this->_modelData),
                     array_keys($modelData)
                 )
             )

src/SchemaProcessor/PostProcessor/AdditionalPropertiesAccessorPostProcessor.php

@@ -151,7 +151,7 @@ private function addRemoveAdditionalPropertyMethod(
                 new Property($schema->getClassName(), null, $schema->getJsonSchema()),
                 sprintf(
                     '%s < %d',
-                    'count($this->_rawModelDataInput) - 1',
+                    'count($this->_modelData) - 1',
                     $json['minProperties']
                 ),
                 MinPropertiesException::class,

src/SchemaProcessor/PostProcessor/Internal/ExtendObjectPropertiesMatchingPatternPropertiesPostProcessor.php

@@ -64,7 +64,7 @@ public function getCode(PropertyInterface $property, bool $batchUpdate = false):
                     // TODO: call only the pattern property validation at this location to avoid executing unnecessary
                     // TODO: validators
                     return sprintf('
-                            $modelData = array_merge($this->_rawModelDataInput, ["%s" => $value]);
+                            $modelData = array_merge($this->_modelData, ["%s" => $value]);
                             $this->executeBaseValidators($modelData);
                         ',
                         $property->getName()

src/SchemaProcessor/PostProcessor/Templates/AdditionalProperties/RemoveAdditionalProperty.phptpl

@@ -14,7 +14,7 @@ public function removeAdditionalProperty(string $property): bool
         foreach ($this->_patternProperties as $patternHash => $_) {
             if (isset($this->_patternProperties[$patternHash][$property])) {
                 unset($this->_patternProperties[$patternHash][$property]);
-                unset($this->_rawModelDataInput[$property]);
+                unset($this->_modelData[$property]);
             }
         }
     }
@@ -39,7 +39,7 @@ public function removeAdditionalProperty(string $property): bool
         {% endif %}
     {% endif %}
 
-    unset($this->_rawModelDataInput[$property]);
+    unset($this->_modelData[$property]);
     unset($this->_additionalProperties[$property]);
 
     return true;

src/SchemaProcessor/PostProcessor/Templates/AdditionalProperties/SetAdditionalProperty.phptpl

@@ -40,7 +40,7 @@ public function setAdditionalProperty(
         $this->_additionalProperties[$property] = $value;
     {% endif %}
 
-    $this->_rawModelDataInput[$property] = $value;
+    $this->_modelData[$property] = $value;
 
     {% if validationProperty %}{{ schemaHookResolver.resolveSetterAfterValidationHook(validationProperty) }}{% endif %}
 

src/SchemaProcessor/PostProcessor/Templates/CompositionValidation.phptpl

@@ -8,7 +8,7 @@
 private function validateComposition_{{ index }}(array &$modifiedModelData): void
 {
     $validatorIndex = {{ index }};
-    $value = $modelData = array_merge($this->_rawModelDataInput, $modifiedModelData);
+    $value = $modelData = array_merge($this->_modelData, $modifiedModelData);
 
     {{ validator.getValidatorSetUp() }}
     if ({{ validator.getCheck() }}) {

src/SchemaProcessor/PostProcessor/Templates/Populate.phptpl

@@ -59,7 +59,7 @@ public function populate(array $modelData): self
         }
     {% endif %}
 
-    $this->_rawModelDataInput = array_merge($this->_rawModelDataInput, $modelData);
+    $this->_modelData = array_merge($this->_modelData, $modelData);
 
     {% foreach schema.getProperties() as property %}
         {% if not property.isInternal() %}

src/Templates/Model.phptpl

@@ -32,7 +32,7 @@ class {{ class }} {% if schema.getInterfaces() %}implements {{ viewHelper.joinCl
         {% if property.isInternal() %}private{% else %}protected{% endif %} ${{ property.getAttribute() }}{% if not viewHelper.isNull(property.getDefaultValue()) %} = {{ property.getDefaultValue() }}{% endif %};
     {% endforeach %}
     /** @var array */
-    protected $_rawModelDataInput = [];
+    protected $_modelData = [];
 
     {% if generatorConfiguration.collectErrors() %}
         /** @var {{ viewHelper.getSimpleClassName(generatorConfiguration.getErrorRegistryClass()) }} Collect all validation errors */
@@ -70,7 +70,7 @@ class {{ class }} {% if schema.getInterfaces() %}implements {{ viewHelper.joinCl
             }
         {% endif %}
 
-        $this->_rawModelDataInput = $modelData;
+        $this->_modelData = $modelData;
 
         {{ schemaHookResolver.resolveConstructorAfterValidationHook() }}
     }
@@ -100,7 +100,7 @@ class {{ class }} {% if schema.getInterfaces() %}implements {{ viewHelper.joinCl
      */
     public function getRawModelDataInput(): array
     {
-        return $this->_rawModelDataInput;
+        return $this->_modelData;
     }
 
     {% foreach schema.getProperties() as property %}
@@ -154,7 +154,7 @@ class {{ class }} {% if schema.getInterfaces() %}implements {{ viewHelper.joinCl
                     {% endif %}
 
                     $this->{{ property.getAttribute() }} = $value;
-                    $this->_rawModelDataInput['{{ property.getName() }}'] = ${{ property.getAttribute() }};
+                    $this->_modelData['{{ property.getName() }}'] = ${{ property.getAttribute() }};
 
                     {{ schemaHookResolver.resolveSetterAfterValidationHook(property) }}