Remove double generated code

Author: wol-soft

composer.json

@@ -18,7 +18,7 @@
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0"
+        "phpunit/phpunit": "^8.4"
     },
     "autoload": {
         "psr-4": {

src/Templates/Model.phptpl

@@ -122,12 +122,7 @@ class {{ class }}
                     $this->errorRegistry = new {{ viewHelper.getSimpleClassName(generatorConfiguration.getErrorRegistryClass()) }}();
                 {% endif%}
 
-                {% foreach property.getOrderedValidators() as validator %}
-                    {{ validator.getValidatorSetUp() }}
-                    if ({{ validator.getCheck() }}) {
-                        {{ viewHelper.validationError(validator.getExceptionMessage()) }}
-                    }
-                {% endforeach %}
+                $value = $this->validate{{ viewHelper.ucfirst(property.getAttribute()) }}($value, $modelData);
 
                 {% if generatorConfiguration.collectErrors() %}
                     if ($this->errorRegistry->getErrors()) {
@@ -154,14 +149,22 @@ class {{ class }}
 
             {{ viewHelper.resolvePropertyDecorator(property) }}
 
+            $this->{{ property.getAttribute() }} = $this->validate{{ viewHelper.ucfirst(property.getAttribute()) }}($value, $modelData);
+        }
+
+        /**
+         * Execute all validators for the property {{ property.getAttribute() }}
+         */
+        protected function validate{{ viewHelper.ucfirst(property.getAttribute()) }}($value, array $modelData)
+        {
             {% foreach property.getOrderedValidators() as validator %}
                 {{ validator.getValidatorSetUp() }}
                 if ({{ validator.getCheck() }}) {
                     {{ viewHelper.validationError(validator.getExceptionMessage()) }}
                 }
             {% endforeach %}
 
-            $this->{{ property.getAttribute() }} = $value;
+            return $value;
         }
     {% endforeach %}
 }