Commit cd7ca03c authored by alexpott's avatar alexpott

Issue #2033447 by tim.plunkett: Remove obsolete ContainerFactoryPluginBase.

parent 3b0e0c5b
......@@ -7,13 +7,13 @@
namespace Drupal\Core\Action;
use Drupal\Component\Plugin\PluginBase;
use Drupal\Core\Action\ActionInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginBase;
/**
* Provides a base implementation for an Action plugin.
*/
abstract class ActionBase extends ContainerFactoryPluginBase implements ActionInterface {
abstract class ActionBase extends PluginBase implements ActionInterface {
/**
* {@inheritdoc}
......
<?php
/**
* @file
* Contains \Drupal\Core\Plugin\ContainerFactoryPluginBase.
*/
namespace Drupal\Core\Plugin;
use Drupal\Component\Plugin\PluginBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Defines a base plugin that can pull its dependencies from the container.
*/
abstract class ContainerFactoryPluginBase extends PluginBase implements ContainerFactoryPluginInterface {
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
return new static($configuration, $plugin_id, $plugin_definition);
}
}
......@@ -11,6 +11,7 @@
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ConfigurableActionBase;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Utility\Token;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -23,7 +24,7 @@
* type = "system"
* )
*/
class EmailAction extends ConfigurableActionBase {
class EmailAction extends ConfigurableActionBase implements ContainerFactoryPluginInterface {
/**
* The token service.
......
......@@ -10,6 +10,7 @@
use Drupal\Core\Annotation\Action;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ConfigurableActionBase;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Routing\PathBasedGeneratorInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
......@@ -25,7 +26,7 @@
* type = "system"
* )
*/
class GotoAction extends ConfigurableActionBase {
class GotoAction extends ConfigurableActionBase implements ContainerFactoryPluginInterface {
/**
* The event dispatcher service.
......
......@@ -11,6 +11,7 @@
use Drupal\Core\Annotation\Action;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ConfigurableActionBase;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Utility\Token;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -23,7 +24,7 @@
* type = "system"
* )
*/
class MessageAction extends ConfigurableActionBase {
class MessageAction extends ConfigurableActionBase implements ContainerFactoryPluginInterface {
/**
* @var \Drupal\Core\Utility\Token
......
......@@ -11,6 +11,7 @@
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ConfigurableActionBase;
use Drupal\Core\Database\Connection;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......@@ -22,7 +23,7 @@
* type = "node"
* )
*/
class AssignOwnerNode extends ConfigurableActionBase {
class AssignOwnerNode extends ConfigurableActionBase implements ContainerFactoryPluginInterface {
/**
* The database connection.
......
......@@ -10,6 +10,7 @@
use Drupal\Core\Annotation\Action;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\user\TempStoreFactory;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -23,7 +24,7 @@
* confirm_form_path = "admin/content/node/delete"
* )
*/
class DeleteNode extends ActionBase {
class DeleteNode extends ActionBase implements ContainerFactoryPluginInterface {
/**
* The tempstore object.
......
......@@ -10,6 +10,7 @@
use Drupal\Core\Annotation\Action;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\user\TempStoreFactory;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -23,7 +24,7 @@
* confirm_form_path = "admin/people/cancel"
* )
*/
class CancelUser extends ActionBase {
class CancelUser extends ActionBase implements ContainerFactoryPluginInterface {
/**
* The tempstore factory.
......
......@@ -7,11 +7,13 @@
namespace Drupal\views\Plugin\views;
use Drupal\Core\Plugin\ContainerFactoryPluginBase;
use Drupal\Component\Plugin\PluginBase as ComponentPluginBase;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
use Symfony\Component\DependencyInjection\ContainerInterface;
abstract class PluginBase extends ContainerFactoryPluginBase {
abstract class PluginBase extends ComponentPluginBase implements ContainerFactoryPluginInterface {
/**
* Options for this plugin will be held here.
......@@ -62,6 +64,13 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
$this->definition = $plugin_definition + $configuration;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
return new static($configuration, $plugin_id, $plugin_definition);
}
/**
* Initialize the plugin.
*
......
......@@ -6,7 +6,8 @@
*/
namespace Drupal\views\Plugin\views\join;
use Drupal\Core\Plugin\ContainerFactoryPluginBase;
use Drupal\Component\Plugin\PluginBase;
/**
* @defgroup views_join_handlers Views join handlers
......@@ -49,7 +50,7 @@
*
* Extensions of this class can be used to create more interesting joins.
*/
class JoinPluginBase extends ContainerFactoryPluginBase {
class JoinPluginBase extends PluginBase {
/**
* The table to join (right table).
......
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