Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 888761a58cba · 2020-05-04T17:32:48.000+02:00
* 3.4:
  Fix exception messages containing exception messages
diff --git a/Controller/ControllerResolver.php b/Controller/ControllerResolver.php
@@ -85,7 +85,7 @@ public function getController(Request $request)
         try {
             $callable = $this->createController($controller);
         } catch (\InvalidArgumentException $e) {
-            throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: '.$e->getMessage(), $request->getPathInfo()), 0, $e);
+            throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$e->getMessage(), 0, $e);
         }
 
         if (!\is_callable($callable)) {

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function getController(Request $request)`
`85`	`85`	`try {`
`86`	`86`	`$callable = $this->createController($controller);`
`87`	`87`	`} catch (\InvalidArgumentException $e) {`
`88`		`- throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: '.$e->getMessage(), $request->getPathInfo()), 0, $e);`
	`88`	`+ throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$e->getMessage(), 0, $e);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (!\is_callable($callable)) {`