Commit 07bf168b authored by alexpott's avatar alexpott

Issue #1998140 by dawehner, ParisLiakos, tim.plunkett: Remove backward...

Issue #1998140 by dawehner, ParisLiakos, tim.plunkett: Remove backward compatible ControllerInterface.
parent 34ba7cc5
......@@ -80,7 +80,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\ControllerInterface', class_implements($class)) || in_array('Drupal\Core\ControllerInterface', class_implements($class))) {
if (in_array('Drupal\Core\Controller\ControllerInterface', class_implements($class))) {
$controller = $class::create($this->container);
}
else {
......
<?php
/**
* @file
* Contains \Drupal\Core\ControllerInterface;
*/
namespace Drupal\Core;
use Drupal\Core\Controller\ControllerInterface as BaseInterface;
/**
* BC shiv for controllers using the old interface name.
*
* @deprecated Use \Drupal\Core\Controller\ControllerInterface instead.
*/
interface ControllerInterface extends BaseInterface {
}
......@@ -7,7 +7,7 @@
namespace Drupal\Core\Entity\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -7,7 +7,7 @@
namespace Drupal\aggregator\Form;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Database\Connection;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Entity\Query\QueryFactory;
......
......@@ -63,7 +63,7 @@ public function __construct(ConfigFactory $config_factory, AggregatorPluginManag
}
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
......
......@@ -7,7 +7,7 @@
namespace Drupal\custom_block\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Extension\ModuleHandler;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -6,7 +6,7 @@
namespace Drupal\book\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\book\BookManager;
......
......@@ -7,7 +7,7 @@
namespace Drupal\config\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Config\StorageInterface;
use Drupal\Component\Archiver\ArchiveTar;
use Drupal\Core\Ajax\AjaxResponse;
......
......@@ -9,7 +9,7 @@
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Database\Connection;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -11,7 +11,7 @@
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
/**
* Defines route controller for entity reference.
......@@ -36,7 +36,7 @@ public function __construct(EntityReferenceAutocomplete $entity_reference_autcom
}
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
......
......@@ -8,7 +8,7 @@
namespace Drupal\field_ui\Form;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Drupal\field\Plugin\Core\Entity\FieldInstance;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -7,7 +7,7 @@
namespace Drupal\field_ui\Form;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Form\FormInterface;
use Drupal\field\FieldInstanceInterface;
......
......@@ -8,7 +8,7 @@
namespace Drupal\field_ui\Form;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Drupal\field\Plugin\Type\Widget\WidgetPluginManager;
use Drupal\field\FieldInstanceInterface;
......
......@@ -8,7 +8,7 @@
namespace Drupal\field_ui;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Form\FormInterface;
......
......@@ -6,7 +6,7 @@
namespace Drupal\help\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -7,7 +7,7 @@
namespace Drupal\language_test\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......@@ -16,7 +16,7 @@
class LanguageTestController implements ControllerInterface {
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static();
......
......@@ -6,7 +6,7 @@
namespace Drupal\layout\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\layout\Plugin\Type\LayoutManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -6,7 +6,7 @@
namespace Drupal\layout_test\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -8,7 +8,7 @@
namespace Drupal\node\Form;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Drupal\Component\Utility\String;
use Drupal\user\TempStoreFactory;
......
......@@ -8,7 +8,7 @@
namespace Drupal\path\Form;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Path\Path;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -42,7 +42,7 @@ public function __construct(Path $path) {
}
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
......
......@@ -6,7 +6,7 @@
namespace Drupal\shortcut\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -8,7 +8,7 @@
namespace Drupal\shortcut\Form;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Database\Connection;
use Drupal\Core\Extension\ModuleHandlerInterface;
......
......@@ -7,7 +7,7 @@
namespace Drupal\simpletest\Form;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Database\Connection;
use Drupal\Core\Form\FormInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -37,7 +37,7 @@ public function __construct(ConfigFactory $config_factory, ModuleHandler $module
}
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
......
......@@ -9,7 +9,7 @@
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Response;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Database\Connection;
use Drupal\system\SystemManager;
......
......@@ -8,7 +8,7 @@
namespace Drupal\system\Form;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Config\ConfigFactory;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -8,7 +8,7 @@
namespace Drupal\system\Form;
use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......
......@@ -8,7 +8,7 @@
namespace Drupal\system\Form;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Config\ConfigFactory;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -9,7 +9,7 @@
use Drupal\Component\Transliteration\TransliterationInterface;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -8,7 +8,7 @@
namespace Drupal\system;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\Config\Context\ContextInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -39,7 +39,7 @@ public function __construct(ConfigFactory $config_factory, ContextInterface $con
}
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
......
......@@ -7,7 +7,7 @@
namespace Drupal\common_test\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......@@ -16,7 +16,7 @@
class CommonTestController implements ControllerInterface {
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static();
......
......@@ -6,7 +6,7 @@
namespace Drupal\design_test\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
/**
* Controller routines for design_test routes.
......
......@@ -8,7 +8,7 @@
namespace Drupal\form_test;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
......@@ -25,7 +25,7 @@ public function getFormID() {
}
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
drupal_set_message(t('The FormTestControllerObject::create() method was used for this form.'));
......
......@@ -7,7 +7,7 @@
namespace Drupal\twig_theme_test;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......
......@@ -6,7 +6,7 @@
namespace Drupal\tour_test\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......
......@@ -7,7 +7,7 @@
namespace Drupal\update\Controller;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -41,7 +41,7 @@ public function __construct(ConfigFactory $config_factory, ContextInterface $con
}
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
......
......@@ -10,7 +10,7 @@
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\user\UserAutocomplete;
/**
......@@ -36,7 +36,7 @@ public function __construct(UserAutocomplete $user_autocomplete) {
}
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
......
......@@ -10,7 +10,7 @@
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
/**
......
......@@ -7,7 +7,7 @@
namespace Drupal\views\Routing;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\views\ViewExecutableFactory;
use Symfony\Component\DependencyInjection\ContainerInterface;
......
......@@ -9,7 +9,7 @@
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\views\ViewStorageInterface;
use Drupal\Core\Entity\EntityManager;
......@@ -55,7 +55,7 @@ public function __construct(EntityManager $entity_manager, TempStoreFactory $tem
}
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
......
......@@ -13,7 +13,7 @@
use Drupal\views\ViewsData;
use Drupal\user\TempStore;
use Drupal\user\TempStoreFactory;
use Drupal\Core\ControllerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Entity\EntityManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
......@@ -65,7 +65,7 @@ public function __construct(EntityManager $entity_manager, ViewsData $views_data
}
/**
* Implements \Drupal\Core\ControllerInterface::create().
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment