Skip to content

Commit 9733f1c

Browse files
Merge branch '5.3' into 5.4
* 5.3: [5.3] cs fixes [Cache] Fix saving items with no expiration through ProxyAdapter CS fixes [HttpClient] Fix tracing requests made after calling withOptions() [Cache] disable lock on CLI [VarDumper] add more "transient-on-macos" groups
2 parents 6b9dadd + 90de783 commit 9733f1c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Controller/ControllerResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function getController(Request $request)
4747
if (isset($controller[0]) && \is_string($controller[0]) && isset($controller[1])) {
4848
try {
4949
$controller[0] = $this->instantiateController($controller[0]);
50-
} catch (\Error | \LogicException $e) {
50+
} catch (\Error|\LogicException $e) {
5151
try {
5252
// We cannot just check is_callable but have to use reflection because a non-static method
5353
// can still be called statically in PHP but we don't want that. This is deprecated in PHP 7, so we
@@ -118,7 +118,7 @@ protected function createController(string $controller)
118118

119119
try {
120120
$controller = [$this->instantiateController($class), $method];
121-
} catch (\Error | \LogicException $e) {
121+
} catch (\Error|\LogicException $e) {
122122
try {
123123
if ((new \ReflectionMethod($class, $method))->isStatic()) {
124124
return $class.'::'.$method;

0 commit comments

Comments
 (0)