dispatch submit events for disabled forms too

xabbuh · xabbuh · commit 69520cb1bf06 · 2020-05-05T09:02:08.000+02:00
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -505,10 +505,27 @@ public function submit($submittedData, bool $clearMissing = true)
         // they are collectable during submission only
         $this->errors = [];
 
+        $dispatcher = $this->config->getEventDispatcher();
+
         // Obviously, a disabled form should not change its data upon submission.
-        if ($this->isDisabled()) {
+        if ($this->isDisabled() && $this->isRoot()) {
             $this->submitted = true;
 
+            if ($dispatcher->hasListeners(FormEvents::PRE_SUBMIT)) {
+                $event = new FormEvent($this, $submittedData);
+                $dispatcher->dispatch(FormEvents::PRE_SUBMIT, $event);
+            }
+
+            if ($dispatcher->hasListeners(FormEvents::SUBMIT)) {
+                $event = new FormEvent($this, $this->getNormData());
+                $dispatcher->dispatch(FormEvents::SUBMIT, $event);
+            }
+
+            if ($dispatcher->hasListeners(FormEvents::POST_SUBMIT)) {
+                $event = new FormEvent($this, $this->getViewData());
+                $dispatcher->dispatch(FormEvents::POST_SUBMIT, $event);
+            }
+
             return $this;
         }
 
@@ -538,8 +555,6 @@ public function submit($submittedData, bool $clearMissing = true)
             $this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, array given.');
         }
 
-        $dispatcher = $this->config->getEventDispatcher();
-
         $modelData = null;
         $normData = null;
         $viewData = null;
@@ -752,10 +767,6 @@ public function isValid()
             throw new LogicException('Cannot check if an unsubmitted form is valid. Call Form::isSubmitted() before Form::isValid().');
         }
 
-        if ($this->isDisabled()) {
-            return true;
-        }
-
         return 0 === \count($this->getErrors(true));
     }
 
diff --git a/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
@@ -55,7 +55,7 @@ public function testInvalidIfChildIsInvalid()
         $this->assertFalse($this->form->isValid());
     }
 
-    public function testDisabledFormsValidEvenIfChildrenInvalid()
+    public function testDisabledFormsInvalidEvenChildrenInvalid()
     {
         $form = $this->getBuilder('person')
             ->setDisabled(true)
@@ -68,7 +68,7 @@ public function testDisabledFormsValidEvenIfChildrenInvalid()
 
         $form->get('name')->addError(new FormError('Invalid'));
 
-        $this->assertTrue($form->isValid());
+        $this->assertFalse($form->isValid());
     }
 
     public function testSubmitForwardsNullIfNotClearMissingButValueIsExplicitlyNull()

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function testInvalidIfChildIsInvalid()`
`55`	`55`	`$this->assertFalse($this->form->isValid());`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function testDisabledFormsValidEvenIfChildrenInvalid()`
	`58`	`+ public function testDisabledFormsInvalidEvenChildrenInvalid()`
`59`	`59`	`{`
`60`	`60`	`$form = $this->getBuilder('person')`
`61`	`61`	`->setDisabled(true)`
`@@ -68,7 +68,7 @@ public function testDisabledFormsValidEvenIfChildrenInvalid()`
`68`	`68`
`69`	`69`	`$form->get('name')->addError(new FormError('Invalid'));`
`70`	`70`
`71`		`- $this->assertTrue($form->isValid());`
	`71`	`+ $this->assertFalse($form->isValid());`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public function testSubmitForwardsNullIfNotClearMissingButValueIsExplicitlyNull()`