Merge branch '3.4' into 4.4

* 3.4:
  Various cleanups

Author: nicolas-grekas

Controller/ControllerResolver.php

@@ -64,7 +64,7 @@ public function getController(Request $request)
             }
 
             if (!\is_callable($controller)) {
-                throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: '.$this->getControllerError($controller), $request->getPathInfo()));
+                throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$this->getControllerError($controller));
             }
 
             return $controller;