diff --git a/core/lib/Drupal/Core/Controller/ControllerResolver.php b/core/lib/Drupal/Core/Controller/ControllerResolver.php index b62e722..a25b01e 100644 --- a/core/lib/Drupal/Core/Controller/ControllerResolver.php +++ b/core/lib/Drupal/Core/Controller/ControllerResolver.php @@ -81,7 +81,7 @@ protected function createController($controller) { throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class)); } // @todo Remove the second in_array() once that interface has been removed. - if (in_array('Drupal\Core\Controller\ContainerControllerInterface', class_implements($class))) { + if (in_array('Drupal\Core\Controller\ContainerFactoryControllerInterface', class_implements($class))) { $controller = $class::create($this->container); } else { diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php index 72da113..df29d83 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php @@ -57,7 +57,7 @@ protected function setUp() { $this->installSchema('system', 'menu_router'); - $this->pageController = new ViewPageController($this->container->get('plugin.manager.entity')->getStorageController('view'), new ViewExecutableFactory()); + $this->pageController = ViewPageController::create($this->container); } /**