Skip to content

Commit abfecf1

Browse files
Merge branch '4.4' into 5.0
* 4.4: Fix abstract method name in PHP doc block Various cleanups [HttpClient] fix issues in tests Fixes sprintf(): Too few arguments in form transformer [Console] Fix QuestionHelper::disableStty() [Validator] Use Mime component to determine mime type for file validator validate subforms in all validation groups Update Hungarian translations Add meaningful message when Process is not installed (ProcessHelper) [PropertyAccess] Fix TypeError parsing again. [TwigBridge] fix fallback html-to-txt body converter [Form] add missing Czech validators translation [Validator] add missing Czech translations never directly validate Existence (Required/Optional) constraints
2 parents e8d6287 + 4c19b5b commit abfecf1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Controller/ControllerResolver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ public function getController(Request $request)
6464
}
6565

6666
if (!\is_callable($controller)) {
67-
throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: '.$this->getControllerError($controller), $request->getPathInfo()));
67+
throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$this->getControllerError($controller));
6868
}
6969

7070
return $controller;
7171
}
7272

7373
if (\is_object($controller)) {
7474
if (!\is_callable($controller)) {
75-
throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: '.$this->getControllerError($controller), $request->getPathInfo()));
75+
throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$this->getControllerError($controller));
7676
}
7777

7878
return $controller;
@@ -89,7 +89,7 @@ public function getController(Request $request)
8989
}
9090

9191
if (!\is_callable($callable)) {
92-
throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: '.$this->getControllerError($callable), $request->getPathInfo()));
92+
throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$this->getControllerError($callable));
9393
}
9494

9595
return $callable;

0 commit comments

Comments
 (0)