Fix rollback in PopulatePostProcessor with error collection disabled

Author: wol-soft

src/SchemaProcessor/PostProcessor/Templates/Populate.phptpl

@@ -10,10 +10,13 @@
  */
 public function populate(array $modelData): self
 {
+    $rollbackValues = [];
+
     {% if generatorConfiguration.collectErrors() %}
         $this->errorRegistry = new {{ viewHelper.getSimpleClassName(generatorConfiguration.getErrorRegistryClass()) }}();
+    {% else %}
+        try {
     {% endif %}
-    $rollbackValues = [];
 
     {% if schema.getBaseValidators() %}
         $this->executeBaseValidators($modelData);
@@ -34,6 +37,14 @@ public function populate(array $modelData): self
 
             throw $this->errorRegistry;
         }
+    {% else %}
+        } catch (ValidationException $exception) {
+            foreach ($rollbackValues as $property => $value) {
+                $this->{$property} = $value;
+            }
+
+            throw $exception;
+        }
     {% endif %}
 
     $this->rawModelDataInput = array_merge($this->rawModelDataInput, $modelData);

tests/PostProcessor/PopulatePostProcessorTest.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use PHPModelGenerator\Exception\ErrorRegistryException;
+use PHPModelGenerator\Exception\Generic\InvalidTypeException;
 use PHPModelGenerator\Exception\Object\InvalidAdditionalPropertiesException;
 use PHPModelGenerator\Exception\Object\InvalidPropertyNamesException;
 use PHPModelGenerator\Exception\Object\MaxPropertiesException;
@@ -75,7 +76,7 @@ public function testInvalidPopulateThrowsAnException(
 
         $className = $this->generateClassFromFile(
             'BasicSchema.json',
-            (new GeneratorConfiguration())->setCollectErrors($collectErrors)
+            (new GeneratorConfiguration())->setCollectErrors($collectErrors)->setSerialization(true)
         );
         $object = new $className(['name' => 'Albert', 'age' => 30]);
 
@@ -85,6 +86,7 @@ public function testInvalidPopulateThrowsAnException(
         } catch (Exception $exception) {
             // test if the internal state hasn't been changed
             $this->assertSame(['name' => 'Albert', 'age' => 30], $object->getRawModelDataInput());
+            $this->assertSame(['name' => 'Albert', 'age' => 30], $object->toArray());
 
             throw $exception;
         }
@@ -99,6 +101,18 @@ public function invalidPopulateDataProvider(): array
                 PatternException::class,
                 "Value for name doesn't match pattern ^[a-zA-Z]*$"
             ],
+            'No error collection - first value ok second invalid' => [
+                ['name' => 'Hannes', 'age' => false],
+                false,
+                InvalidTypeException::class,
+                "Invalid type for age. Requires int, got boolean"
+            ],
+            'Error collection - first value ok second invalid' => [
+                ['name' => 'Hannes', 'age' => false],
+                true,
+                ErrorRegistryException::class,
+                "Invalid type for age. Requires int, got boolean"
+            ],
             'Error collection - multiple violations' => [
                 ['name' => 'Anne-Marie', 'age' => false],
                 true,