Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit dfb58832ab88 · 2020-05-04T17:32:48.000+02:00
* 3.4:
  Fix exception messages containing exception messages
diff --git a/ResolvedFormType.php b/ResolvedFormType.php
@@ -96,7 +96,7 @@ public function createBuilder(FormFactoryInterface $factory, $name, array $optio
         try {
             $options = $this->getOptionsResolver()->resolve($options);
         } catch (ExceptionInterface $e) {
-            throw new $e(sprintf('An error has occurred resolving the options of the form "%s": '.$e->getMessage(), \get_class($this->getInnerType())), $e->getCode(), $e);
+            throw new $e(sprintf('An error has occurred resolving the options of the form "%s": ', \get_class($this->getInnerType())).$e->getMessage(), $e->getCode(), $e);
         }
 
         // Should be decoupled from the specific option at some point

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function createBuilder(FormFactoryInterface $factory, $name, array $optio`
`96`	`96`	`try {`
`97`	`97`	`$options = $this->getOptionsResolver()->resolve($options);`
`98`	`98`	`} catch (ExceptionInterface $e) {`
`99`		`- throw new $e(sprintf('An error has occurred resolving the options of the form "%s": '.$e->getMessage(), \get_class($this->getInnerType())), $e->getCode(), $e);`
	`99`	`+ throw new $e(sprintf('An error has occurred resolving the options of the form "%s": ', \get_class($this->getInnerType())).$e->getMessage(), $e->getCode(), $e);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`// Should be decoupled from the specific option at some point`