Commit dcc8a0c3 authored by catch's avatar catch

Issue #2084279 by herom, andypost, David Hernández, dawehner, Xano: Remove...

Issue #2084279 by herom, andypost, David Hernández, dawehner, Xano: Remove plugin.manager.entity service in favor of entity.manager.
parent 0eb6d083
......@@ -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']
......
......@@ -74,8 +74,8 @@ public function __construct(EntityViewBuilderInterface $aggregator_item_renderer
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')
);
}
......
......@@ -70,7 +70,7 @@ public static function create(ContainerInterface $container, array $configuratio
$configuration,
$plugin_id,
$plugin_definition,
$container->get('plugin.manager.entity')->getStorageController('aggregator_feed'),
$container->get('entity.manager')->getStorageController('aggregator_feed'),
$container->get('database')
);
}
......
......@@ -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 }
......
......@@ -65,7 +65,7 @@ public static function create(ContainerInterface $container) {
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')
);
}
......
......@@ -66,7 +66,7 @@ public static function create(ContainerInterface $container, array $configuratio
$configuration,
$plugin_id,
$plugin_definition,
$container->get('plugin.manager.entity'),
$container->get('entity.manager'),
$container->get('entity.query')
);
}
......
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']
......
......@@ -398,7 +398,7 @@ function createForum($type, $parent = 0) {
$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;
}
......
......@@ -48,7 +48,7 @@ public static function create(ContainerInterface $container) {
return new static(
$container->get('config.factory'),
$container->get('config.context.free'),
$container->get('plugin.manager.entity')
$container->get('entity.manager')
);
}
......
......@@ -108,7 +108,7 @@ static public function create(ContainerInterface $container, array $configuratio
$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'),
......
......@@ -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 }
......@@ -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,
......
......@@ -41,7 +41,7 @@ public function testDeleteLink() {
$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);
}
......
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