invalidate forms on transformation failures

xabbuh · xabbuh · commit 0309d2c2d7d5 · 2018-10-19T10:42:13.000+02:00
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -664,6 +664,22 @@ public function submit($submittedData, $clearMissing = true)
             $dispatcher->dispatch(FormEvents::POST_SUBMIT, $event);
         }
 
+        if (null !== $this->transformationFailure && null === $this->config->getOption('invalid_message') && $this->isValid()) {
+            $childrenSynchronized = true;
+
+            foreach ($this->children as $child) {
+                if (!$child->isSynchronized()) {
+                    $childrenSynchronized = false;
+                    break;
+                }
+            }
+
+            if ($childrenSynchronized) {
+                $clientDataAsString = is_scalar($this->getViewData()) ? (string) $this->getViewData() : \gettype($this->getViewData());
+                $this->addError(new FormError('This value is not valid.', 'This value is not valid.', array('{{ value }}' => $clientDataAsString), null, $this->transformationFailure));
+            }
+        }
+
         return $this;
     }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
@@ -385,14 +385,16 @@ function () {
 
         $form->submit('Foobar');
 
+        $submittedData = $this->dataExtractor->extractSubmittedData($form);
+
+        $this->assertInternalType('array', $submittedData);
+        $this->assertArrayHasKey('submitted_data', $submittedData);
         $this->assertSame(array(
-            'submitted_data' => array(
-                'norm' => "'Foobar'",
-                'model' => 'NULL',
-            ),
-            'errors' => array(),
-            'synchronized' => 'false',
-        ), $this->dataExtractor->extractSubmittedData($form));
+            'norm' => "'Foobar'",
+            'model' => 'NULL',
+        ), $submittedData['submitted_data']);
+        $this->assertArrayHasKey('synchronized', $submittedData);
+        $this->assertSame('false', $submittedData['synchronized']);
     }
 
     public function testExtractViewVariables()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -182,7 +182,7 @@ public function testAbortMappingIfNotSynchronized()
         $this->mapper->mapViolation($violation, $parent);
 
         $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
-        $this->assertCount(0, $child->getErrors(), $child->getName().' should not have an error, but has one');
+        $this->assertCount(1, $child->getErrors(), $child->getName().' should have an error as it is not synchronized');
         $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');
     }
 
@@ -206,7 +206,7 @@ public function testAbortDotRuleMappingIfNotSynchronized()
         $this->mapper->mapViolation($violation, $parent);
 
         $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
-        $this->assertCount(0, $child->getErrors(), $child->getName().' should not have an error, but has one');
+        $this->assertCount(1, $child->getErrors(), $child->getName().' should have an error as it is not synchronized');
         $this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public function testAbortMappingIfNotSynchronized()`
`182`	`182`	`$this->mapper->mapViolation($violation, $parent);`
`183`	`183`
`184`	`184`	`$this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');`
`185`		`- $this->assertCount(0, $child->getErrors(), $child->getName().' should not have an error, but has one');`
	`185`	`+ $this->assertCount(1, $child->getErrors(), $child->getName().' should have an error as it is not synchronized');`
`186`	`186`	`$this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');`
`187`	`187`	`}`
`188`	`188`
`@@ -206,7 +206,7 @@ public function testAbortDotRuleMappingIfNotSynchronized()`
`206`	`206`	`$this->mapper->mapViolation($violation, $parent);`
`207`	`207`
`208`	`208`	`$this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');`
`209`		`- $this->assertCount(0, $child->getErrors(), $child->getName().' should not have an error, but has one');`
	`209`	`+ $this->assertCount(1, $child->getErrors(), $child->getName().' should have an error as it is not synchronized');`
`210`	`210`	`$this->assertCount(0, $grandChild->getErrors(), $grandChild->getName().' should not have an error, but has one');`
`211`	`211`	`}`
`212`	`212`