Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
38fc484e
Commit
38fc484e
authored
Mar 04, 2014
by
webchick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2204307
by EclipseGc: Move PluginBag Implementations from \Drupal\Component to \Drupal\Core.
parent
dd6eb01c
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
37 additions
and
30 deletions
+37
-30
core/lib/Drupal/Core/Action/ActionBag.php
core/lib/Drupal/Core/Action/ActionBag.php
+1
-1
core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
+5
-2
core/lib/Drupal/Core/Plugin/DefaultSinglePluginBag.php
core/lib/Drupal/Core/Plugin/DefaultSinglePluginBag.php
+6
-2
core/modules/block/lib/Drupal/block/BlockPluginBag.php
core/modules/block/lib/Drupal/block/BlockPluginBag.php
+1
-1
core/modules/filter/lib/Drupal/filter/FilterBag.php
core/modules/filter/lib/Drupal/filter/FilterBag.php
+1
-1
core/modules/image/lib/Drupal/image/ImageEffectBag.php
core/modules/image/lib/Drupal/image/ImageEffectBag.php
+1
-1
core/modules/search/lib/Drupal/search/Plugin/SearchPluginBag.php
...dules/search/lib/Drupal/search/Plugin/SearchPluginBag.php
+1
-1
core/modules/tour/lib/Drupal/tour/TipsBag.php
core/modules/tour/lib/Drupal/tour/TipsBag.php
+1
-1
core/modules/views/lib/Drupal/views/DisplayBag.php
core/modules/views/lib/Drupal/views/DisplayBag.php
+1
-1
core/tests/Drupal/Tests/Core/Plugin/ConfigurablePluginBagTest.php
...ts/Drupal/Tests/Core/Plugin/ConfigurablePluginBagTest.php
+3
-3
core/tests/Drupal/Tests/Core/Plugin/DefaultPluginBagTest.php
core/tests/Drupal/Tests/Core/Plugin/DefaultPluginBagTest.php
+8
-8
core/tests/Drupal/Tests/Core/Plugin/DefaultSinglePluginBagTest.php
...s/Drupal/Tests/Core/Plugin/DefaultSinglePluginBagTest.php
+4
-4
core/tests/Drupal/Tests/Core/Plugin/PluginBagTestBase.php
core/tests/Drupal/Tests/Core/Plugin/PluginBagTestBase.php
+4
-4
No files found.
core/lib/Drupal/Core/Action/ActionBag.php
View file @
38fc484e
...
...
@@ -7,7 +7,7 @@
namespace
Drupal\Core\Action
;
use
Drupal\Co
mponent
\Plugin\DefaultSinglePluginBag
;
use
Drupal\Co
re
\Plugin\DefaultSinglePluginBag
;
/**
* Provides a container for lazily loading Action plugins.
...
...
core/lib/Drupal/Co
mponent
/Plugin/DefaultPluginBag.php
→
core/lib/Drupal/Co
re
/Plugin/DefaultPluginBag.php
View file @
38fc484e
...
...
@@ -2,12 +2,15 @@
/**
* @file
* Contains \Drupal\Co
mponent
\Plugin\DefaultPluginBag.
* Contains \Drupal\Co
re
\Plugin\DefaultPluginBag.
*/
namespace
Drupal\Co
mponent
\Plugin
;
namespace
Drupal\Co
re
\Plugin
;
use
Drupal\Component\Plugin\Exception\PluginNotFoundException
;
use
Drupal\Component\Plugin\PluginBag
;
use
Drupal\Component\Plugin\PluginManagerInterface
;
use
Drupal\Component\Plugin\ConfigurablePluginInterface
;
/**
* Provides a default plugin bag for a plugin type.
...
...
core/lib/Drupal/Co
mponent
/Plugin/DefaultSinglePluginBag.php
→
core/lib/Drupal/Co
re
/Plugin/DefaultSinglePluginBag.php
View file @
38fc484e
...
...
@@ -2,10 +2,14 @@
/**
* @file
* Contains \Drupal\Co
mponent
\Plugin\DefaultSinglePluginBag.
* Contains \Drupal\Co
re
\Plugin\DefaultSinglePluginBag.
*/
namespace
Drupal\Component\Plugin
;
namespace
Drupal\Core\Plugin
;
use
Drupal\Component\Plugin\PluginManagerInterface
;
use
Drupal\Component\Plugin\PluginBag
;
use
Drupal\Component\Plugin\ConfigurablePluginInterface
;
/**
* Provides a default plugin bag for a plugin type.
...
...
core/modules/block/lib/Drupal/block/BlockPluginBag.php
View file @
38fc484e
...
...
@@ -10,7 +10,7 @@
use
Drupal\Component\Plugin\Exception\PluginException
;
use
Drupal\Component\Plugin\PluginManagerInterface
;
use
Drupal\Component\Utility\String
;
use
Drupal\Co
mponent
\Plugin\DefaultSinglePluginBag
;
use
Drupal\Co
re
\Plugin\DefaultSinglePluginBag
;
/**
* Provides a collection of block plugins.
...
...
core/modules/filter/lib/Drupal/filter/FilterBag.php
View file @
38fc484e
...
...
@@ -8,7 +8,7 @@
namespace
Drupal\filter
;
use
Drupal\Component\Utility\NestedArray
;
use
Drupal\Co
mponent
\Plugin\DefaultPluginBag
;
use
Drupal\Co
re
\Plugin\DefaultPluginBag
;
/**
* A collection of filters.
...
...
core/modules/image/lib/Drupal/image/ImageEffectBag.php
View file @
38fc484e
...
...
@@ -7,7 +7,7 @@
namespace
Drupal\image
;
use
Drupal\Co
mponent
\Plugin\DefaultPluginBag
;
use
Drupal\Co
re
\Plugin\DefaultPluginBag
;
/**
* A collection of image effects.
...
...
core/modules/search/lib/Drupal/search/Plugin/SearchPluginBag.php
View file @
38fc484e
...
...
@@ -7,7 +7,7 @@
namespace
Drupal\search\Plugin
;
use
Drupal\Co
mponent
\Plugin\DefaultSinglePluginBag
;
use
Drupal\Co
re
\Plugin\DefaultSinglePluginBag
;
use
Drupal\Component\Plugin\PluginManagerInterface
;
/**
...
...
core/modules/tour/lib/Drupal/tour/TipsBag.php
View file @
38fc484e
...
...
@@ -7,7 +7,7 @@
namespace
Drupal\tour
;
use
Drupal\Co
mponent
\Plugin\DefaultPluginBag
;
use
Drupal\Co
re
\Plugin\DefaultPluginBag
;
/**
* A collection of tips.
...
...
core/modules/views/lib/Drupal/views/DisplayBag.php
View file @
38fc484e
...
...
@@ -9,7 +9,7 @@
use
Drupal\Component\Plugin\Exception\PluginException
;
use
Drupal\Component\Plugin\PluginManagerInterface
;
use
Drupal\Co
mponent
\Plugin\DefaultPluginBag
;
use
Drupal\Co
re
\Plugin\DefaultPluginBag
;
/**
* A class which wraps the displays of a view so you can lazy-initialize them.
...
...
core/tests/Drupal/Tests/Co
mponent
/Plugin/ConfigurablePluginBagTest.php
→
core/tests/Drupal/Tests/Co
re
/Plugin/ConfigurablePluginBagTest.php
View file @
38fc484e
...
...
@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\Tests\Co
mponent
\Plugin\ConfigurablePluginBagTest.
* Contains \Drupal\Tests\Co
re
\Plugin\ConfigurablePluginBagTest.
*/
namespace
Drupal\Tests\Co
mponent
\Plugin
;
namespace
Drupal\Tests\Co
re
\Plugin
;
use
Drupal\Component\Plugin\ConfigurablePluginInterface
;
use
Drupal\Component\Plugin\PluginBase
;
...
...
@@ -14,7 +14,7 @@
* Tests the default plugin bag with configurable plugins.
*
* @see \Drupal\Component\Plugin\ConfigurablePluginInterface
* @see \Drupal\Co
mponent
\Plugin\DefaultPluginBag
* @see \Drupal\Co
re
\Plugin\DefaultPluginBag
*
* @group Drupal
* @group Drupal_Plugin
...
...
core/tests/Drupal/Tests/Co
mponent
/Plugin/DefaultPluginBagTest.php
→
core/tests/Drupal/Tests/Co
re
/Plugin/DefaultPluginBagTest.php
View file @
38fc484e
...
...
@@ -2,15 +2,15 @@
/**
* @file
* Contains \Drupal\Tests\Co
mponent
\Plugin\DefaultPluginBagTest.
* Contains \Drupal\Tests\Co
re
\Plugin\DefaultPluginBagTest.
*/
namespace
Drupal\Tests\Co
mponent
\Plugin
;
namespace
Drupal\Tests\Co
re
\Plugin
;
/**
* Tests the default plugin bag.
*
* @see \Drupal\Co
mponent
\Plugin\DefaultPluginBag
* @see \Drupal\Co
re
\Plugin\DefaultPluginBag
*
* @group Drupal
* @group Drupal_Plugin
...
...
@@ -31,7 +31,7 @@ public static function getInfo() {
/**
* Tests the has method.
*
* @see \Drupal\Co
mponent
\Plugin\DefaultPluginBag::has()
* @see \Drupal\Co
re
\Plugin\DefaultPluginBag::has()
*/
public
function
testHas
()
{
$this
->
setupPluginBag
();
...
...
@@ -47,7 +47,7 @@ public function testHas() {
/**
* Tests the get method.
*
* @see \Drupal\Co
mponent
\Plugin\DefaultPluginBag::get()
* @see \Drupal\Co
re
\Plugin\DefaultPluginBag::get()
*/
public
function
testGet
()
{
$this
->
setupPluginBag
(
$this
->
once
());
...
...
@@ -105,7 +105,7 @@ public function testSortHelper($plugin_id_1, $plugin_id_2, $expected) {
/**
* Tests the configuration getter method.
*
* @see \Drupal\Co
mponent
\Plugin\DefaultPluginBag::getConfiguration()
* @see \Drupal\Co
re
\Plugin\DefaultPluginBag::getConfiguration()
*/
public
function
testGetConfiguration
()
{
$this
->
setupPluginBag
(
$this
->
exactly
(
3
));
...
...
@@ -130,7 +130,7 @@ public function testGetConfiguration() {
/**
* Tests the removeInstanceId() method.
*
* @see \Drupal\Co
mponent
\Plugin\DefaultPluginBag::removeInstanceId()
* @see \Drupal\Co
re
\Plugin\DefaultPluginBag::removeInstanceId()
*/
public
function
testRemoveInstanceId
()
{
$this
->
setupPluginBag
(
$this
->
exactly
(
2
));
...
...
@@ -142,7 +142,7 @@ public function testRemoveInstanceId() {
/**
* Tests the setInstanceConfiguration() method.
*
* @see \Drupal\Co
mponent
\Plugin\DefaultPluginBag::setInstanceConfiguration()
* @see \Drupal\Co
re
\Plugin\DefaultPluginBag::setInstanceConfiguration()
*/
public
function
testSetInstanceConfiguration
()
{
$this
->
setupPluginBag
(
$this
->
exactly
(
3
));
...
...
core/tests/Drupal/Tests/Co
mponent
/Plugin/DefaultSinglePluginBagTest.php
→
core/tests/Drupal/Tests/Co
re
/Plugin/DefaultSinglePluginBagTest.php
View file @
38fc484e
...
...
@@ -2,17 +2,17 @@
/**
* @file
* Contains \Drupal\Tests\Co
mponent
\Plugin\DefaultSinglePluginBagTest.
* Contains \Drupal\Tests\Co
re
\Plugin\DefaultSinglePluginBagTest.
*/
namespace
Drupal\Tests\Co
mponent
\Plugin
;
namespace
Drupal\Tests\Co
re
\Plugin
;
use
Drupal\Co
mponent
\Plugin\DefaultSinglePluginBag
;
use
Drupal\Co
re
\Plugin\DefaultSinglePluginBag
;
/**
* Tests the default single plugin bag.
*
* @see \Drupal\Co
mponent
\Plugin\DefaultSinglePluginBag
* @see \Drupal\Co
re
\Plugin\DefaultSinglePluginBag
*
* @group Drupal
* @group Drupal_Plugin
...
...
core/tests/Drupal/Tests/Co
mponent
/Plugin/PluginBagTestBase.php
→
core/tests/Drupal/Tests/Co
re
/Plugin/PluginBagTestBase.php
View file @
38fc484e
...
...
@@ -2,12 +2,12 @@
/**
* @file
* Contains \Drupal\Tests\Co
mponent
\Plugin\PluginBagTestBase.
* Contains \Drupal\Tests\Co
re
\Plugin\PluginBagTestBase.
*/
namespace
Drupal\Tests\Co
mponent
\Plugin
;
namespace
Drupal\Tests\Co
re
\Plugin
;
use
Drupal\Co
mponent
\Plugin\DefaultPluginBag
;
use
Drupal\Co
re
\Plugin\DefaultPluginBag
;
use
Drupal\Tests\UnitTestCase
;
/**
...
...
@@ -25,7 +25,7 @@ abstract class PluginBagTestBase extends UnitTestCase {
/**
* The tested plugin bag.
*
* @var \Drupal\Co
mponent
\Plugin\DefaultPluginBag|\PHPUnit_Framework_MockObject_MockObject
* @var \Drupal\Co
re
\Plugin\DefaultPluginBag|\PHPUnit_Framework_MockObject_MockObject
*/
protected
$defaultPluginBag
;
...
...
Write
Preview
Markdown
is supported
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