comparison core/lib/Drupal/Core/Controller/ControllerResolver.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1
author Chris Cannam
date Thu, 09 May 2019 15:34:47 +0100
parents a9cd425dd02b
children
comparison
equal deleted inserted replaced
4:a9cd425dd02b 5:12f9dff5fda9
64 64
65 if (strpos($controller, ':') === FALSE) { 65 if (strpos($controller, ':') === FALSE) {
66 if (function_exists($controller)) { 66 if (function_exists($controller)) {
67 return $controller; 67 return $controller;
68 } 68 }
69 elseif (method_exists($controller, '__invoke')) { 69 return $this->classResolver->getInstanceFromDefinition($controller);
70 return new $controller();
71 }
72 } 70 }
73 71
74 $callable = $this->createController($controller); 72 $callable = $this->createController($controller);
75 73
76 if (!is_callable($callable)) { 74 if (!is_callable($callable)) {