summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Catchpole2013-12-03 12:07:05 (GMT)
committerNathaniel Catchpole2013-12-03 12:07:05 (GMT)
commitdcc8a0c3920b5eba9388814251c411566a5ad636 (patch)
tree2c4c46c6a3cf40bb52da8e08651fc25358a69d16
parent0eb6d0832f471853a06a0f1f1973723959bcef7d (diff)
Issue #2084279 by herom, andypost, David Hernández, dawehner, Xano: Remove plugin.manager.entity service in favor of entity.manager.
-rw-r--r--core/core.services.yml2
-rw-r--r--core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php4
-rw-r--r--core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php2
-rw-r--r--core/modules/content_translation/content_translation.services.yml4
-rw-r--r--core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php2
-rw-r--r--core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php2
-rw-r--r--core/modules/forum/forum.services.yml2
-rw-r--r--core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php2
-rw-r--r--core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php2
-rw-r--r--core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php2
-rw-r--r--core/modules/node/node.services.yml2
-rw-r--r--core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php2
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php2
13 files changed, 14 insertions, 16 deletions
diff --git a/core/core.services.yml b/core/core.services.yml
index 20b8651..a32dd04 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -176,8 +176,6 @@ services:
entity.manager:
class: Drupal\Core\Entity\EntityManager
arguments: ['@container.namespaces', '@service_container', '@module_handler', '@cache.cache', '@language_manager', '@string_translation']
- plugin.manager.entity:
- alias: entity.manager
plugin.manager.field.field_type:
class: Drupal\Core\Field\FieldTypePluginManager
arguments: ['@container.namespaces', '@cache.field', '@language_manager', '@module_handler']
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php
index 96f0e5a..46335c2 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php
@@ -74,8 +74,8 @@ abstract class AggregatorCategorizeFormBase extends FormBase {
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getViewBuilder('aggregator_item'),
- $container->get('plugin.manager.entity')->getStorageController('aggregator_item'),
+ $container->get('entity.manager')->getViewBuilder('aggregator_item'),
+ $container->get('entity.manager')->getStorageController('aggregator_item'),
$container->get('aggregator.category.storage')
);
}
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
index fa34b8a..341e92d 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
@@ -70,7 +70,7 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt
$configuration,
$plugin_id,
$plugin_definition,
- $container->get('plugin.manager.entity')->getStorageController('aggregator_feed'),
+ $container->get('entity.manager')->getStorageController('aggregator_feed'),
$container->get('database')
);
}
diff --git a/core/modules/content_translation/content_translation.services.yml b/core/modules/content_translation/content_translation.services.yml
index 73ad8ea..764dd39 100644
--- a/core/modules/content_translation/content_translation.services.yml
+++ b/core/modules/content_translation/content_translation.services.yml
@@ -11,13 +11,13 @@ services:
content_translation.overview_access:
class: Drupal\content_translation\Access\ContentTranslationOverviewAccess
- arguments: ['@plugin.manager.entity']
+ arguments: ['@entity.manager']
tags:
- { name: access_check }
content_translation.manage_access:
class: Drupal\content_translation\Access\ContentTranslationManageAccessCheck
- arguments: ['@plugin.manager.entity']
+ arguments: ['@entity.manager']
tags:
- { name: access_check }
diff --git a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
index 7be4f58..b193e25 100644
--- a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
+++ b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
@@ -65,7 +65,7 @@ class EditFieldForm implements FormInterface, ContainerInjectionInterface {
return new static(
$container->get('user.tempstore'),
$container->get('module_handler'),
- $container->get('plugin.manager.entity')->getStorageController('node_type')
+ $container->get('entity.manager')->getStorageController('node_type')
);
}
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php b/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php
index 746a1c2..10a1de0 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php
@@ -66,7 +66,7 @@ class Fid extends Numeric implements ContainerFactoryPluginInterface {
$configuration,
$plugin_id,
$plugin_definition,
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('entity.query')
);
}
diff --git a/core/modules/forum/forum.services.yml b/core/modules/forum/forum.services.yml
index 8ea4dac..f27ffc0 100644
--- a/core/modules/forum/forum.services.yml
+++ b/core/modules/forum/forum.services.yml
@@ -1,7 +1,7 @@
services:
forum_manager:
class: Drupal\forum\ForumManager
- arguments: ['@config.factory', '@plugin.manager.entity', '@database', '@field.info', '@string_translation']
+ arguments: ['@config.factory', '@entity.manager', '@database', '@field.info', '@string_translation']
forum.breadcrumb:
class: Drupal\forum\ForumBreadcrumbBuilder
arguments: ['@entity.manager', '@config.factory', '@forum_manager']
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
index 70f411e..6b1fa37 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
@@ -398,7 +398,7 @@ class ForumTest extends WebTestBase {
$parent_tid = db_query("SELECT t.parent FROM {taxonomy_term_hierarchy} t WHERE t.tid = :tid", array(':tid' => $tid))->fetchField();
$this->assertTrue($parent == $parent_tid, 'The ' . $type . ' is linked to its container');
- $forum = $this->container->get('plugin.manager.entity')->getStorageController('taxonomy_term')->load($tid);
+ $forum = $this->container->get('entity.manager')->getStorageController('taxonomy_term')->load($tid);
$this->assertEqual(($type == 'forum container'), (bool) $forum->forum_container->value);
return $term;
}
diff --git a/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php b/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php
index 362de0c..a253854 100644
--- a/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php
+++ b/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php
@@ -48,7 +48,7 @@ class ContentLanguageSettingsForm extends ConfigFormBase {
return new static(
$container->get('config.factory'),
$container->get('config.context.free'),
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
index 0dbd1ac..547562b 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
@@ -108,7 +108,7 @@ class NodeSearch extends SearchPluginBase implements AccessibleInterface, Search
$plugin_id,
$plugin_definition,
$container->get('database'),
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('module_handler'),
$container->get('config.factory')->get('search.settings'),
$container->get('keyvalue')->get('state'),
diff --git a/core/modules/node/node.services.yml b/core/modules/node/node.services.yml
index 0b839a5..47809f4 100644
--- a/core/modules/node/node.services.yml
+++ b/core/modules/node/node.services.yml
@@ -9,6 +9,6 @@ services:
- { name: access_check }
access_check.node.add:
class: Drupal\node\Access\NodeAddAccessCheck
- arguments: ['@plugin.manager.entity']
+ arguments: ['@entity.manager']
tags:
- { name: access_check }
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php b/core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php
index 3921dcb..75399f8 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php
@@ -63,7 +63,7 @@ class UserSearch extends SearchPluginBase implements AccessibleInterface {
static public function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
return new static(
$container->get('database'),
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('module_handler'),
$container->get('current_user'),
$configuration,
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php
index aca9114..27655a8 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php
@@ -41,7 +41,7 @@ class ViewEditTest extends UITestBase {
$this->drupalPostForm(NULL, array(), t('Delete'));
$this->assertUrl('admin/structure/views');
- $view = $this->container->get('plugin.manager.entity')->getStorageController('view')->load('test_view');
+ $view = $this->container->get('entity.manager')->getStorageController('view')->load('test_view');
$this->assertFalse($view instanceof View);
}