diff 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
line wrap: on
line diff
--- a/core/lib/Drupal/Core/Controller/ControllerResolver.php	Thu Feb 28 13:11:55 2019 +0000
+++ b/core/lib/Drupal/Core/Controller/ControllerResolver.php	Thu May 09 15:34:47 2019 +0100
@@ -66,9 +66,7 @@
       if (function_exists($controller)) {
         return $controller;
       }
-      elseif (method_exists($controller, '__invoke')) {
-        return new $controller();
-      }
+      return $this->classResolver->getInstanceFromDefinition($controller);
     }
 
     $callable = $this->createController($controller);