Merge branch '4.4' into 5.0

fabpot · fabpot · commit 74f2554ab648 · 2020-04-12T16:40:17.000+02:00
* 4.4:
  Tweak the code to avoid fabbot false positives
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. %s.', $request->getPathInfo(), $e->getMessage()), 0, $e);
+            throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: '.$e->getMessage(), $request->getPathInfo()), 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. %s.', $request->getPathInfo(), $e->getMessage()), 0, $e);`
	`88`	`+ throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: '.$e->getMessage(), $request->getPathInfo()), 0, $e);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (!\is_callable($callable)) {`