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

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

core/lib/Drupal/Core/Controller/ControllerResolver.php

@@ -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 {

core/lib/Drupal/Core/ControllerInterface.php

-<?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 {
-}

core/lib/Drupal/Core/Entity/Controller/EntityListController.php

@@ -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;
 

core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php

@@ -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;

core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php

@@ -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(

core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php

@@ -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;

core/modules/book/lib/Drupal/book/Controller/BookController.php

@@ -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;

core/modules/config/lib/Drupal/config/Controller/ConfigController.php

@@ -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;

core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php

@@ -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;
 

core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceController.php

@@ -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(

core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php

@@ -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;

core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php

@@ -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;

core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceFormBase.php

@@ -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;

core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php

@@ -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;
 

core/modules/help/lib/Drupal/help/Controller/HelpController.php

@@ -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;
 

core/modules/language/tests/language_test/lib/Drupal/language_test/Controller/LanguageTestController.php

@@ -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();

core/modules/layout/lib/Drupal/layout/Controller/LayoutController.php

@@ -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;
 

core/modules/layout/tests/lib/Drupal/layout_test/Controller/LayoutTestController.php

@@ -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;
 

core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php

@@ -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;

core/modules/path/lib/Drupal/path/Form/DeleteForm.php

@@ -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(