Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
cd7ca03c
Commit
cd7ca03c
authored
Jul 10, 2013
by
alexpott
Browse files
Issue
#2033447
by tim.plunkett: Remove obsolete ContainerFactoryPluginBase.
parent
3b0e0c5b
Changes
10
Hide whitespace changes
Inline
Side-by-side
core/lib/Drupal/Core/Action/ActionBase.php
View file @
cd7ca03c
...
...
@@ -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
ContainerFactory
PluginBase
implements
ActionInterface
{
abstract
class
ActionBase
extends
PluginBase
implements
ActionInterface
{
/**
* {@inheritdoc}
...
...
core/lib/Drupal/Core/Plugin/ContainerFactoryPluginBase.php
deleted
100644 → 0
View file @
3b0e0c5b
<?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
);
}
}
core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php
View file @
cd7ca03c
...
...
@@ -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.
...
...
core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php
View file @
cd7ca03c
...
...
@@ -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.
...
...
core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php
View file @
cd7ca03c
...
...
@@ -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
...
...
core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php
View file @
cd7ca03c
...
...
@@ -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.
...
...
core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php
View file @
cd7ca03c
...
...
@@ -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.
...
...
core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php
View file @
cd7ca03c
...
...
@@ -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.
...
...
core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php
View file @
cd7ca03c
...
...
@@ -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
ContainerFactoryPlugin
Bas
e
{
abstract
class
PluginBase
extends
ComponentPluginBase
implements
ContainerFactoryPlugin
Interfac
e
{
/**
* 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.
*
...
...
core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php
View file @
cd7ca03c
...
...
@@ -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
ContainerFactory
PluginBase
{
class
JoinPluginBase
extends
PluginBase
{
/**
* The table to join (right table).
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment