diff --git a/core/core.services.yml b/core/core.services.yml
index 891c2d5760027d684fd2f8fea4ff043febe98fc4..65882afeb987e0a40e8e0ee52ee8ee5c76995b51 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -157,11 +157,11 @@ services:
arguments: [ '%container.namespaces%' ]
tags:
- { name: persist }
- plugin.manager.entity:
+ entity.manager:
class: Drupal\Core\Entity\EntityManager
arguments: ['@container.namespaces', '@service_container', '@module_handler', '@cache.cache', '@language_manager', '@string_translation']
- entity.manager:
- alias: plugin.manager.entity
+ plugin.manager.entity:
+ alias: entity.manager
plugin.manager.entity.field.field_type:
class: Drupal\Core\Entity\Field\FieldTypePluginManager
arguments: ['@container.namespaces', '@cache.entity', '@language_manager', '@module_handler']
@@ -265,7 +265,7 @@ services:
- [add, ['@legacy_router']]
entity.query:
class: Drupal\Core\Entity\Query\QueryFactory
- arguments: ['@plugin.manager.entity']
+ arguments: ['@entity.manager']
calls:
- [setContainer, ['@service_container']]
entity.query.config:
@@ -314,12 +314,12 @@ services:
class: Drupal\Core\ParamConverter\EntityConverter
tags:
- { name: paramconverter }
- arguments: ['@plugin.manager.entity']
+ arguments: ['@entity.manager']
route_subscriber.entity:
class: Drupal\Core\EventSubscriber\EntityRouteAlterSubscriber
tags:
- { name: event_subscriber }
- arguments: ['@plugin.manager.entity']
+ arguments: ['@entity.manager']
reverse_proxy_subscriber:
class: Drupal\Core\EventSubscriber\ReverseProxySubscriber
tags:
@@ -406,7 +406,7 @@ services:
- { name: access_check }
access_check.entity_create:
class: Drupal\Core\Entity\EntityCreateAccessCheck
- arguments: ['@plugin.manager.entity']
+ arguments: ['@entity.manager']
tags:
- { name: access_check }
maintenance_mode_subscriber:
@@ -537,7 +537,7 @@ services:
arguments: ['@module_handler']
date:
class: Drupal\Core\Datetime\Date
- arguments: ['@plugin.manager.entity', '@language_manager']
+ arguments: ['@entity.manager', '@language_manager']
feed.bridge.reader:
class: Drupal\Component\Bridge\ZfExtensionManagerSfContainer
calls:
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 04fac027ca61d0850b8b74e7ae932085cad851f1..a0d61ee1af20e6f82a2e435e70985f096b931c2d 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -163,7 +163,7 @@ public static function currentUser() {
* The entity manager service.
*/
public static function entityManager() {
- return static::$container->get('plugin.manager.entity');
+ return static::$container->get('entity.manager');
}
/**
diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php
index 16789174541ed04a309d5927bb81ed2497508b46..be6a669d5c7ce9eaddfcadb8d602b42c1f6f2904 100644
--- a/core/lib/Drupal/Core/Controller/ControllerBase.php
+++ b/core/lib/Drupal/Core/Controller/ControllerBase.php
@@ -38,7 +38,7 @@ abstract class ControllerBase extends ContainerAware {
* The entity manager service.
*/
protected function entityManager() {
- return $this->container->get('plugin.manager.entity');
+ return $this->container->get('entity.manager');
}
/**
diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
index 4b185c975a5754e0b724e817d1b7b9ad7ff633e7..ab0f099e9205fe238ce0f9459fe9b9df1e38cbfd 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
@@ -39,7 +39,7 @@ public function __construct(EntityManager $entity_manager) {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/lib/Drupal/Core/Entity/EntityListController.php b/core/lib/Drupal/Core/Entity/EntityListController.php
index 246b73af995e0aac22913086d16864bc4c0eedcd..3b1b580476f248e58c5c309c5ea44522a35c05d8 100644
--- a/core/lib/Drupal/Core/Entity/EntityListController.php
+++ b/core/lib/Drupal/Core/Entity/EntityListController.php
@@ -61,7 +61,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
return new static(
$entity_type,
$entity_info,
- $container->get('plugin.manager.entity')->getStorageController($entity_type),
+ $container->get('entity.manager')->getStorageController($entity_type),
$container->get('module_handler')
);
}
diff --git a/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php b/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php
index 8f62a405a555bc8d08b2e53cc0c9c373a9f227fc..86d8094ce1e50f1c61fbe93cd1ee8b1486855004 100644
--- a/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php
+++ b/core/lib/Drupal/Core/Entity/HtmlEntityFormController.php
@@ -46,7 +46,7 @@ public function content(Request $request, $_entity_form) {
* @endcode
*/
protected function getFormObject(Request $request, $form_arg) {
- $manager = $this->container->get('plugin.manager.entity');
+ $manager = $this->container->get('entity.manager');
// If no operation is provided, use 'default'.
$form_arg .= '.default';
diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php
index 4abe86e2a7369e43b2686b21047e06d5f4c32f9c..4de5d6eec262a62e3ff7057ea9b76276ca9832a7 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php
@@ -56,7 +56,7 @@ public function __construct($base_plugin_id, EntityManager $entity_manager) {
public static function create(ContainerInterface $container, $base_plugin_id) {
return new static(
$base_plugin_id,
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/action/lib/Drupal/action/ActionAddFormController.php b/core/modules/action/lib/Drupal/action/ActionAddFormController.php
index b1a6dac62acc709b9220ae03ae1c2cf42c69e11a..a1cf893b1860ad79cd78678570b99249f285add6 100644
--- a/core/modules/action/lib/Drupal/action/ActionAddFormController.php
+++ b/core/modules/action/lib/Drupal/action/ActionAddFormController.php
@@ -43,7 +43,7 @@ public function __construct(EntityStorageControllerInterface $storage_controller
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('action'),
+ $container->get('entity.manager')->getStorageController('action'),
$container->get('plugin.manager.action')
);
}
diff --git a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php b/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php
index 4f50ce3b2735d0395d3669a7ee1c873233f9f4e3..021ec93214e3eed2356437721e45ef02939f440b 100644
--- a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php
+++ b/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php
@@ -46,7 +46,7 @@ public function __construct(EntityStorageControllerInterface $storage_controller
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('action')
+ $container->get('entity.manager')->getStorageController('action')
);
}
diff --git a/core/modules/action/lib/Drupal/action/ActionListController.php b/core/modules/action/lib/Drupal/action/ActionListController.php
index 770099f05c97fa002e40dd24a863d487fc6b0bcc..b5577f11954064757761c788c0ec80b80caaf86e 100644
--- a/core/modules/action/lib/Drupal/action/ActionListController.php
+++ b/core/modules/action/lib/Drupal/action/ActionListController.php
@@ -61,7 +61,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
return new static(
$entity_type,
$entity_info,
- $container->get('plugin.manager.entity')->getStorageController($entity_type),
+ $container->get('entity.manager')->getStorageController($entity_type),
$container->get('plugin.manager.action'),
$container->get('module_handler')
);
diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php b/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php
index 77e5f2123dca122e4f4bf747a1350b8469fdfd10..970f1a63a7c8e03d84d0699bb9d0a49944901c44 100644
--- a/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php
+++ b/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php
@@ -67,7 +67,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
return new static($configuration, $plugin_id, $plugin_definition,
$container->get('token'),
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
index e809abc8c48d0ef5bafebcd2e73fb19c6edeb464..0873ded86a085861c7b60881410559a7f24c91da 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
@@ -86,7 +86,7 @@ public function __construct(EntityManager $entity_manager, Connection $database,
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('database'),
$container->get('config.factory'),
$container->get('module_handler'),
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php
index 2571c3215860ecaa3274cf19e98a79dae9ec1018..c8c28e724bef6705ee1e70bd7b8d22381419b2b4 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php
@@ -70,7 +70,7 @@ public function __construct(ModuleHandlerInterface $module_handler, EntityManage
public static function create(ContainerInterface $container) {
return new static (
$container->get('module_handler'),
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('aggregator.category.storage')
);
}
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php
index 15dabe3ebde022a5e7e46ed3d5701cb519ad466e..498e09e59065273c1e323228a8496e5239f0872a 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php
@@ -76,7 +76,7 @@ public static function create(ContainerInterface $container) {
return new static(
$container->get('database'),
$container->get('entity.query'),
- $container->get('plugin.manager.entity')->getStorageController('aggregator_feed'),
+ $container->get('entity.manager')->getStorageController('aggregator_feed'),
$container->get('http_default_client')
);
}
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
index a9ee26c69d3d0f5e9d17af81091846e07ab323d2..309a2639b658a1c32293fbb1b5ef0da2fa080b50 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
@@ -50,7 +50,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
* {@inheritdoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
- return new static($configuration, $plugin_id, $plugin_definition, $container->get('plugin.manager.entity'));
+ return new static($configuration, $plugin_id, $plugin_definition, $container->get('entity.manager'));
}
/**
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
index 29150c2ea12ceba158ec5c27597046e4ff6d7f15..61192732ba862893206db97269f20350ced07011 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
@@ -50,7 +50,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
* {@inheritdoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
- return new static($configuration, $plugin_id, $plugin_definition, $container->get('plugin.manager.entity'));
+ return new static($configuration, $plugin_id, $plugin_definition, $container->get('entity.manager'));
}
/**
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php
index da85242ae6ce6ce23ce534cf3749a0f01fbc70d2..53621cfef2984e343be31523d6b918a36fbc63b5 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php
@@ -58,8 +58,8 @@ protected function setUp() {
ViewTestData::importTestViews(get_class($this), array('aggregator_test_views'));
- $this->itemStorageController = $this->container->get('plugin.manager.entity')->getStorageController('aggregator_item');
- $this->feedStorageController = $this->container->get('plugin.manager.entity')->getStorageController('aggregator_feed');
+ $this->itemStorageController = $this->container->get('entity.manager')->getStorageController('aggregator_item');
+ $this->feedStorageController = $this->container->get('entity.manager')->getStorageController('aggregator_feed');
}
/**
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php
index b23fc8a5c149f571ec21cfad2e3c7646c5074693..b54a9f53ab116ab90eb7e814683c3ec67d14e46b 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php
@@ -41,7 +41,7 @@ class CustomBlockController implements ContainerInjectionInterface {
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
- $entity_manager = $container->get('plugin.manager.entity');
+ $entity_manager = $container->get('entity.manager');
return new static(
$entity_manager,
$entity_manager->getStorageController('custom_block'),
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php
index 438b4f98f35aac8e211e39e73d38f6e01d1acfea..573d04886a21d18cebf96165ac7bf699fa9847bd 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php
@@ -83,7 +83,7 @@ public function testListing() {
// Edit the entity using the operations link.
$blocks = $this->container
- ->get('plugin.manager.entity')
+ ->get('entity.manager')
->getStorageController('custom_block')
->loadByProperties(array('info' => $label));
$block = reset($blocks);
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php
index d5322e122a09baba761d6a7724d9f363fe543172..ad4c2e92a10ad3521770c77b3ea517c68ffbc3ab 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php
@@ -151,7 +151,7 @@ public function testsCustomBlockAddTypes() {
// Get the custom block storage controller.
$storage_controller = $this->container
- ->get('plugin.manager.entity')
+ ->get('entity.manager')
->getStorageController('custom_block');
// Test that adding a block from the 'place blocks' form sends you to the
diff --git a/core/modules/block/lib/Drupal/block/BlockFormController.php b/core/modules/block/lib/Drupal/block/BlockFormController.php
index 83d10afeea2d3dd12ee759e868df31b11ed2b457..c3812dc1d3accfa5fdc58b8201cb5c1f8b86a359 100644
--- a/core/modules/block/lib/Drupal/block/BlockFormController.php
+++ b/core/modules/block/lib/Drupal/block/BlockFormController.php
@@ -69,7 +69,7 @@ public function __construct(EntityManager $entity_manager, QueryFactory $entity_
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('entity.query'),
$container->get('language_manager')
);
diff --git a/core/modules/block/lib/Drupal/block/BlockListController.php b/core/modules/block/lib/Drupal/block/BlockListController.php
index b9d6218fcdab261164c80ce2baf6255cf3b9070a..7ebb06e731b10b8028b35cb1e387f0881b412e26 100644
--- a/core/modules/block/lib/Drupal/block/BlockListController.php
+++ b/core/modules/block/lib/Drupal/block/BlockListController.php
@@ -70,7 +70,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
return new static(
$entity_type,
$entity_info,
- $container->get('plugin.manager.entity')->getStorageController($entity_type),
+ $container->get('entity.manager')->getStorageController($entity_type),
$container->get('module_handler'),
$container->get('plugin.manager.block')
);
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockRenderOrderTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockRenderOrderTest.php
index 680a94fd3e271bd196c764f94384c44178ce0dfb..f92e8500d76cf7bc702e9f64cd7e7033243034f6 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockRenderOrderTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockRenderOrderTest.php
@@ -72,7 +72,7 @@ function testBlockRenderOrder() {
$this->drupalGet('');
$test_content = $this->drupalGetContent('');
- $controller = $this->container->get('plugin.manager.entity')->getStorageController('block');
+ $controller = $this->container->get('entity.manager')->getStorageController('block');
foreach ($controller->loadMultiple() as $return_block) {
$settings = $return_block->get('settings');
$id = $return_block->get('id');
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
index 1b9c6df91d49a2a2eb37f723c936980700e7feaf..1e72237af799b3d6e6cb8a49753af574c4cca4d2 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
@@ -48,7 +48,7 @@ public static function getInfo() {
protected function setUp() {
parent::setUp();
- $this->controller = $this->container->get('plugin.manager.entity')->getStorageController('block');
+ $this->controller = $this->container->get('entity.manager')->getStorageController('block');
}
/**
diff --git a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
index 8da0d69aabeae2c8247d1f9212ec1aca381e3546..65a9ed9e0e6a34f14fa4b69de2f88cf03a8ebc71 100644
--- a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
@@ -66,7 +66,7 @@ protected function testDeleteBlockDisplay() {
$this->assertBlockAppears($block_3);
$this->assertBlockAppears($block_4);
- $block_storage_controller = $this->container->get('plugin.manager.entity')->getStorageController('block');
+ $block_storage_controller = $this->container->get('entity.manager')->getStorageController('block');
// Remove the block display, so both block entities from the first view
// should both dissapear.
@@ -113,7 +113,7 @@ public function testViewsBlockForm() {
$this->assertNoFieldById('edit-machine-name', 'stark.views_block__test_view_block_1', 'The machine name is hidden on the views block form.');
// Save the block.
$this->drupalPost(NULL, array(), t('Save block'));
- $storage = $this->container->get('plugin.manager.entity')->getStorageController('block');
+ $storage = $this->container->get('entity.manager')->getStorageController('block');
$block = $storage->load('stark.views_block__test_view_block_block_1');
// This will only return a result if our new block has been created with the
// expected machine name.
diff --git a/core/modules/book/book.services.yml b/core/modules/book/book.services.yml
index 9d8c1402ba036ec5f78281d692ecce7c22d52d44..f8c9d96a600e45d4661471ea1f9aa8ef31bed615 100644
--- a/core/modules/book/book.services.yml
+++ b/core/modules/book/book.services.yml
@@ -1,4 +1,4 @@
services:
book.manager:
class: Drupal\book\BookManager
- arguments: ['@database', '@plugin.manager.entity']
+ arguments: ['@database', '@entity.manager']
diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
index f4aebc88ec85b1b8bcb7ae5cf7195ee3df666aa4..1a4a80c0cb120e9349ea8c334652140e0d38d296 100644
--- a/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -188,7 +188,7 @@ function _breakpoint_import_breakpoint_groups($source, $source_type) {
*/
function _breakpoint_delete_breakpoints($list, $source_type) {
$ids = config_get_storage_names_with_prefix('breakpoint.breakpoint_group.' . $source_type . '.');
- $entity_info = Drupal::service('plugin.manager.entity')->getDefinition('breakpoint_group');
+ $entity_info = Drupal::service('entity.manager')->getDefinition('breakpoint_group');
// Remove the breakpoint.breakpoint part of the breakpoint identifier.
foreach ($ids as &$id) {
@@ -203,7 +203,7 @@ function _breakpoint_delete_breakpoints($list, $source_type) {
// Get all breakpoints defined by this theme/module.
$breakpoint_ids = Drupal::service('config.storage')->listAll('breakpoint.breakpoint.' . $source_type . '.' . $breakpoint_group->id() . '.');
- $entity_info = Drupal::service('plugin.manager.entity')->getDefinition('breakpoint');
+ $entity_info = Drupal::service('entity.manager')->getDefinition('breakpoint');
// Remove the breakpoint.breakpoint part of the breakpoint identifier.
foreach ($breakpoint_ids as &$breakpoint_id) {
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php
index 88a0d7c1ee1204b271f3360ae373aab65394f78d..e69507a1e0d5854443d5f2eb09cea33c51e8b288 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php
@@ -39,7 +39,7 @@ function setUp() {
user_install_picture_field();
// Add the basic_html filter format from the standard install profile.
- $filter_format_storage_controller = $this->container->get('plugin.manager.entity')->getStorageController('filter_format');
+ $filter_format_storage_controller = $this->container->get('entity.manager')->getStorageController('filter_format');
$filter_format = $filter_format_storage_controller->create(array(
'format' => 'basic_html',
'name' => 'Basic HTML',
diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php
index 2cd58541088064ee469d72282ede651a70717793..8f6f87bad78c022a3d913d120bd8092feceedc8b 100644
--- a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php
+++ b/core/modules/config/lib/Drupal/config/Form/ConfigSync.php
@@ -107,7 +107,7 @@ public static function create(ContainerInterface $container) {
$container->get('lock'),
$container->get('event_dispatcher'),
$container->get('config.factory'),
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('url_generator')
);
}
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
index acf2dd0fbea5c1df41848dfd2ab6f3174c411ebd..f1a370375909e1949d79d13926563efb9681f2a5 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
@@ -35,7 +35,7 @@ public static function getInfo() {
* Tests entity list controller methods.
*/
function testList() {
- $controller = $this->container->get('plugin.manager.entity')
+ $controller = $this->container->get('entity.manager')
->getListController('config_test');
// Test getStorageController() method.
@@ -123,7 +123,7 @@ function testList() {
// Test that config entities that do not support status, do not have
// enable/disable operations.
- $controller = $this->container->get('plugin.manager.entity')
+ $controller = $this->container->get('entity.manager')
->getListController('config_test_no_status');
$list = $controller->load();
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php
index 8be10550fecce9df754d8d2586a3ecc03522cfa3..2481208128c22849550b50b04dd07c5c8cf334ef 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php
@@ -33,7 +33,7 @@ public static function getInfo() {
* Tests storage controller methods.
*/
public function testStorageControllerMethods() {
- $controller = $this->container->get('plugin.manager.entity')->getStorageController('config_test');
+ $controller = $this->container->get('entity.manager')->getStorageController('config_test');
$info = entity_get_info('config_test');
$expected = $info['config_prefix'] . '.';
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php
index f51e221ac6332ce028d0fd13e42de570575d0887..b17c48b8d3f18629708e802c3d99423b8e0b979b 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php
@@ -59,7 +59,7 @@ function setUp() {
$config_comparer->createChangelist(),
$this->container->get('event_dispatcher'),
$this->container->get('config.factory'),
- $this->container->get('plugin.manager.entity'),
+ $this->container->get('entity.manager'),
$this->container->get('lock')
);
$this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.staging'));
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php b/core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php
index 7a1120d71d90da4a80157234e73d86892ca2c14a..baa6f3f53b56f6044cd1d3f089d03a31fe1228dc 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php
@@ -40,7 +40,7 @@ protected function setUp() {
* Test some of the methods.
*/
public function testMessageMethods() {
- $message_storage = $this->container->get('plugin.manager.entity')->getStorageController('contact_message');
+ $message_storage = $this->container->get('entity.manager')->getStorageController('contact_message');
$message = $message_storage->create(array('category' => 'feedback'));
// Check for empty values first.
diff --git a/core/modules/content_translation/content_translation.services.yml b/core/modules/content_translation/content_translation.services.yml
index 1a4a9397106fe7f8dd1c4ddd454d0c56824a0111..678724dc0e5210b170fe6e1a6d99bb9b535f53a5 100644
--- a/core/modules/content_translation/content_translation.services.yml
+++ b/core/modules/content_translation/content_translation.services.yml
@@ -1,4 +1,4 @@
services:
content_translation.synchronizer:
class: Drupal\content_translation\FieldTranslationSynchronizer
- arguments: ['@plugin.manager.entity']
+ arguments: ['@entity.manager']
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncUnitTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncUnitTest.php
index ab59812ac91aff581d8c8a22597d2ae9ee92b0b2..a1e080535261844a04ecaa6bae9d9b01aa5a4b90 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncUnitTest.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncUnitTest.php
@@ -71,7 +71,7 @@ public static function getInfo() {
protected function setUp() {
parent::setUp();
- $this->synchronizer = new FieldTranslationSynchronizer($this->container->get('plugin.manager.entity'));
+ $this->synchronizer = new FieldTranslationSynchronizer($this->container->get('entity.manager'));
$this->synchronized = array('sync1', 'sync2');
$this->columns = array_merge($this->synchronized, array('var1', 'var2'));
$this->langcodes = array('en', 'it', 'fr', 'de', 'es');
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php
index 0ea5ae6f9d31acc3a26ba9e59da9c80ef7cdbb58..b43d9213940a1bc4f2e43febc1f1d06a0a24117b 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php
@@ -203,7 +203,7 @@ protected function createEntity($values, $langcode, $bundle_name = NULL) {
if (!empty($info['entity_keys']['bundle'])) {
$entity_values[$info['entity_keys']['bundle']] = $bundle_name ?: $this->bundle;
}
- $controller = $this->container->get('plugin.manager.entity')->getStorageController($this->entityType);
+ $controller = $this->container->get('entity.manager')->getStorageController($this->entityType);
if (!($controller instanceof DatabaseStorageControllerNG)) {
foreach ($values as $property => $value) {
if (is_array($value)) {
diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php
index a2ea342770d89ca3ded9e1b1a1d2687625f36fab..a46e06489c6edd1ee6b74433e87e59d800f66861 100644
--- a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php
+++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php
@@ -88,7 +88,7 @@ public static function create(ContainerInterface $container, array $configuratio
$configuration['label'],
$configuration['view_mode'],
$container->get('date'),
- $container->get('plugin.manager.entity')->getStorageController('date_format')
+ $container->get('entity.manager')->getStorageController('date_format')
);
}
diff --git a/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php b/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php
index cf02bd41a70defedd73845296ca493d0d9f5596d..5ae1ad31b2eea9486114ad5ac6374953e1ee69bc 100644
--- a/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php
+++ b/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php
@@ -56,7 +56,7 @@ public static function create(ContainerInterface $container) {
$container->get('database'),
$container->get('module_handler'),
$container->get('date'),
- $container->get('plugin.manager.entity')->getStorageController('user')
+ $container->get('entity.manager')->getStorageController('user')
);
}
diff --git a/core/modules/edit/lib/Drupal/edit/EditController.php b/core/modules/edit/lib/Drupal/edit/EditController.php
index b0bb94109527c89f70f8ec75511a118d57e5eab5..ce1773d49fc54a608ebb7dfb7e5c70812c954ef8 100644
--- a/core/modules/edit/lib/Drupal/edit/EditController.php
+++ b/core/modules/edit/lib/Drupal/edit/EditController.php
@@ -95,7 +95,7 @@ public static function create(ContainerInterface $container) {
$container->get('user.tempstore'),
$container->get('edit.metadata.generator'),
$container->get('edit.editor.selector'),
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('field.info')
);
}
diff --git a/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php b/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php
index 8ca3cbaf875006bf9fef3d226930758b9158278e..153c547c95c8e07329d1d59905c47a32c1b318fe 100644
--- a/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php
+++ b/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php
@@ -38,7 +38,7 @@ public function __construct(PluginManagerInterface $entity_manager) {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php
index 879350278058527f9855ec3cdbb86cf654a8c720..6bc6bd8f9e5dca27baffa9e2af1d2fdd34c1c0a4 100644
--- a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php
+++ b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php
@@ -49,7 +49,7 @@ public function __construct($entity_type, array $entity_info, EntityStorageContr
* {@inheritdoc}
*/
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
- $entity_manager = $container->get('plugin.manager.entity');
+ $entity_manager = $container->get('entity.manager');
return new static(
$entity_type,
$entity_info,
diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php b/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php
index 6f638b716f9c066abea9fc28e57930033e61d48b..1536071d1dee373ea2bcd033f0c8b7dbdea11362 100644
--- a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php
+++ b/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php
@@ -57,7 +57,7 @@ public function __construct(QueryFactory $query_factory, EntityManager $entity_m
public static function create(ContainerInterface $container) {
return new static(
$container->get('entity.query'),
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/entity_reference/entity_reference.services.yml b/core/modules/entity_reference/entity_reference.services.yml
index e06ef888f0fdda4bcd4784e08d560f61c804c68a..2f8906b8a11427413a610ce5947c0df5c68e794f 100644
--- a/core/modules/entity_reference/entity_reference.services.yml
+++ b/core/modules/entity_reference/entity_reference.services.yml
@@ -4,4 +4,4 @@ services:
arguments: ['@container.namespaces', '@cache.cache', '@language_manager', '@module_handler']
entity_reference.autocomplete:
class: Drupal\entity_reference\EntityReferenceAutocomplete
- arguments: ['@plugin.manager.entity', '@plugin.manager.entity_reference.selection']
+ arguments: ['@entity.manager', '@plugin.manager.entity_reference.selection']
diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
index 2649c6adb58279de5f04e1383904c5a02db43864..4a86e01ab292826193602d19dde7ef0e088ee484 100644
--- a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
+++ b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
@@ -83,7 +83,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
$container->get('config.factory'),
$container->get('config.storage'),
$container->get('entity.query'),
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('module_handler'),
$container->get('state')
);
diff --git a/core/modules/field/lib/Drupal/field/FieldStorageController.php b/core/modules/field/lib/Drupal/field/FieldStorageController.php
index 8b0f92ed42df0ce4005a00a8e0a7d8475c4d83d0..08b7a869909e5669b0e097297baa9dd4670e3178 100644
--- a/core/modules/field/lib/Drupal/field/FieldStorageController.php
+++ b/core/modules/field/lib/Drupal/field/FieldStorageController.php
@@ -79,7 +79,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
$container->get('config.factory'),
$container->get('config.storage'),
$container->get('entity.query'),
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('module_handler'),
$container->get('state')
);
diff --git a/core/modules/field/lib/Drupal/field/Tests/FormTest.php b/core/modules/field/lib/Drupal/field/Tests/FormTest.php
index 4ad739a687419f5b393cd79804a73251e4a57b31..2a8f43c0781be9d74e79b5e83d43dcbfe42da589 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FormTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FormTest.php
@@ -153,7 +153,7 @@ function testFieldFormSingle() {
);
$this->drupalPost(NULL, $edit, t('Save'));
$this->assertText(t('entity_test @id has been updated.', array('@id' => $id)), 'Entity was updated');
- $this->container->get('plugin.manager.entity')->getStorageController('entity_test')->resetCache(array($id));
+ $this->container->get('entity.manager')->getStorageController('entity_test')->resetCache(array($id));
$entity = entity_load('entity_test', $id);
$this->assertEqual($entity->{$field_name}->value, $value, 'Field value was updated');
@@ -166,7 +166,7 @@ function testFieldFormSingle() {
);
$this->drupalPost('entity_test/manage/' . $id . '/edit', $edit, t('Save'));
$this->assertText(t('entity_test @id has been updated.', array('@id' => $id)), 'Entity was updated');
- $this->container->get('plugin.manager.entity')->getStorageController('entity_test')->resetCache(array($id));
+ $this->container->get('entity.manager')->getStorageController('entity_test')->resetCache(array($id));
$entity = entity_load('entity_test', $id);
$this->assertTrue($entity->{$field_name}->isEmpty(), 'Field was emptied');
}
@@ -577,7 +577,7 @@ function testFieldFormAccess() {
$this->drupalPost($entity_type . '/manage/' . $id . '/edit', $edit, t('Save'));
// Check that the new revision has the expected values.
- $this->container->get('plugin.manager.entity')->getStorageController($entity_type)->resetCache(array($id));
+ $this->container->get('entity.manager')->getStorageController($entity_type)->resetCache(array($id));
$entity = entity_load($entity_type, $id);
$this->assertEqual($entity->$field_name_no_access->value, 99, 'New revision has the expected value for the field with no edit access.');
$this->assertEqual($entity->$field_name->value, 2, 'New revision has the expected value for the field with edit access.');
diff --git a/core/modules/field_ui/field_ui.services.yml b/core/modules/field_ui/field_ui.services.yml
index cec753a3dd50a8f6beae62a663b2f4896af9a00d..2ab3051a1a16605b21f5a480977e3e2ef7542bbf 100644
--- a/core/modules/field_ui/field_ui.services.yml
+++ b/core/modules/field_ui/field_ui.services.yml
@@ -1,7 +1,7 @@
services:
field_ui.subscriber:
class: Drupal\field_ui\Routing\RouteSubscriber
- arguments: ['@plugin.manager.entity']
+ arguments: ['@entity.manager']
tags:
- { name: event_subscriber }
access_check.field_ui.view_mode:
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
index 22c4c19ba3e456ed28425fd4f9df7dcbb36d3ae1..dfc6a1376faddc15bb4a92c41f37b8c41ef5e142 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
@@ -22,7 +22,7 @@ class DisplayOverview extends DisplayOverviewBase {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('plugin.manager.entity.field.field_type'),
$container->get('plugin.manager.field.formatter')
);
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php
index 075ffe842067279855dd7411b7748401a8b71d83..555510bf683fe6f3851c8bdc38480ddd462174a6 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php
@@ -79,7 +79,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
return new static(
$entity_type,
$entity_info,
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('module_handler'),
$container->get('plugin.manager.entity.field.field_type')
);
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
index b42675914b4ce4f903ccda0a0b2a95218d7bd844..294370119598a899b30c32416a8c16ff44f085cc 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
@@ -54,7 +54,7 @@ public function __construct(EntityManager $entity_manager, FieldTypePluginManage
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('plugin.manager.entity.field.field_type'),
$container->get('module_handler')
);
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php
index 8037ac4f4ffc29edffb5e36d65d9d89c299596a3..afaa1d55ab9c018af977930ecc047d9b6c1e7a33 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php
@@ -38,7 +38,7 @@ public function __construct(EntityManager $entity_manager) {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
index 135a938d6d856feaf34c589b8635c4a3e1cf70d1..ec90d420ab0eba8210fe0e0b4e8a63236a1e8c35 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
@@ -78,7 +78,7 @@ public function __construct(EntityManager $entity_manager, FieldInfo $field_info
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('field.info'),
$container->get('typed_data')
);
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
index 4aff6da089147171b8613db432be1720f404cb4a..1ca81a2351c7dc53072392f246ac2b837f39ccd3 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
@@ -49,7 +49,7 @@ public function __construct(EntityManager $entity_manager) {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
index 0a79f0b9222eca4f2c8f10a8db256ceec3c8364e..1186fc20e75e503f356886268a9dd5430c36706c 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
@@ -22,7 +22,7 @@ class FormDisplayOverview extends DisplayOverviewBase {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('plugin.manager.entity.field.field_type'),
$container->get('plugin.manager.field.widget')
);
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
index d0c54b75050c624604398c04c35a198aa6960c90..2e1f73fbad633b510c4f6f1e780dcab0574a9a24 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
@@ -66,7 +66,7 @@ public function __construct(EntityManager $entity_manager) {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php
index 9558047bed644ae29d4dc3efe1fce4e9d3b64c80..866da45058d785123c7dcabfbd4e05ea572a79fb 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php
@@ -212,7 +212,7 @@ function assertFileExists($file, $message = NULL) {
* Asserts that a file exists in the database.
*/
function assertFileEntryExists($file, $message = NULL) {
- $this->container->get('plugin.manager.entity')->getStorageController('file')->resetCache();
+ $this->container->get('entity.manager')->getStorageController('file')->resetCache();
$db_file = file_load($file->id());
$message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', array('%file' => $file->getFileUri()));
$this->assertEqual($db_file->getFileUri(), $file->getFileUri(), $message);
@@ -230,7 +230,7 @@ function assertFileNotExists($file, $message = NULL) {
* Asserts that a file does not exist in the database.
*/
function assertFileEntryNotExists($file, $message) {
- $this->container->get('plugin.manager.entity')->getStorageController('file')->resetCache();
+ $this->container->get('entity.manager')->getStorageController('file')->resetCache();
$message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', array('%file' => $file->getFileUri()));
$this->assertFalse(file_load($file->id()), $message);
}
diff --git a/core/modules/file/lib/Drupal/file/Tests/SpaceUsedTest.php b/core/modules/file/lib/Drupal/file/Tests/SpaceUsedTest.php
index 157de9e8a0789147448cf60c3b23dbec2649337f..4925cbfbf3fa28f714f9f4b2e7221cf3e4a33eff 100644
--- a/core/modules/file/lib/Drupal/file/Tests/SpaceUsedTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/SpaceUsedTest.php
@@ -43,7 +43,7 @@ function setUp() {
* Test different users with the default status.
*/
function testFileSpaceUsed() {
- $file = $this->container->get('plugin.manager.entity')->getStorageController('file');
+ $file = $this->container->get('entity.manager')->getStorageController('file');
// Test different users with default status.
$this->assertEqual($file->spaceUsed(2), 70);
$this->assertEqual($file->spaceUsed(3), 300);
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php b/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php
index 098aa7ddf378d142e68872011b28b0d0a2d401ae..3e1debf93d7b6bc82292b4e85fa5c130c56fd0b7 100644
--- a/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php
+++ b/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php
@@ -60,7 +60,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
return new static(
$entity_type,
$entity_info,
- $container->get('plugin.manager.entity')->getStorageController($entity_type),
+ $container->get('entity.manager')->getStorageController($entity_type),
$container->get('module_handler'),
$container->get('config.factory')
);
diff --git a/core/modules/forum/forum.services.yml b/core/modules/forum/forum.services.yml
index 19033e856cfe2396d65e5a14e35c5c0607cbe779..e2467110ce7960e965689cf0b69d148a42446801 100644
--- a/core/modules/forum/forum.services.yml
+++ b/core/modules/forum/forum.services.yml
@@ -1,6 +1,6 @@
services:
forum.breadcrumb:
class: Drupal\forum\ForumBreadcrumbBuilder
- arguments: ['@plugin.manager.entity', '@config.factory']
+ arguments: ['@entity.manager', '@config.factory']
tags:
- { name: breadcrumb_builder, priority: 1001 }
diff --git a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php b/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php
index 2a8a694f63c8f7f95af5f0dc7a44ad143cb1beb9..e9fec4b30dea1994db392223b468732f441dea29 100644
--- a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php
+++ b/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php
@@ -44,9 +44,9 @@ class ForumController implements ContainerInjectionInterface {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('config.factory'),
- $container->get('plugin.manager.entity')->getStorageController('taxonomy_term')
+ $container->get('entity.manager')->getStorageController('taxonomy_term')
);
}
diff --git a/core/modules/forum/lib/Drupal/forum/Form/ForumFormController.php b/core/modules/forum/lib/Drupal/forum/Form/ForumFormController.php
index fc4b52cc6981f11b9e11aea2e8d808e5e3b24d60..56bbb5169b7df6e6245471c86571975366e69bd1 100644
--- a/core/modules/forum/lib/Drupal/forum/Form/ForumFormController.php
+++ b/core/modules/forum/lib/Drupal/forum/Form/ForumFormController.php
@@ -66,7 +66,7 @@ public function __construct(VocabularyStorageControllerInterface $vocab_storage,
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
- $entity_manager = $container->get('plugin.manager.entity');
+ $entity_manager = $container->get('entity.manager');
return new static(
$entity_manager->getStorageController('taxonomy_vocabulary'),
$container->get('config.factory'),
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php b/core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php
index cfcdfa24f70ecdcca8fdcad49768ae5827577b94..2a04b4c1b88004ad725758369b62e5e48167612c 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php
@@ -49,7 +49,7 @@ protected function setUp() {
*/
public function testForumIntegration() {
// Create a forum.
- $entity_manager = $this->container->get('plugin.manager.entity');
+ $entity_manager = $this->container->get('entity.manager');
$term = $entity_manager->getStorageController('taxonomy_term')->create(array('vid' => 'forums'));
$term->save();
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php b/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php
index 40f1d1ac79594541127910b62f52077064071297..8381a8a5e1c98a8640ccc7ec86f67b0bdabae8f0 100644
--- a/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php
+++ b/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php
@@ -43,7 +43,7 @@ public function __construct(EntityStorageControllerInterface $image_style_storag
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('image_style'),
+ $container->get('entity.manager')->getStorageController('image_style'),
$container->get('plugin.manager.image.effect')
);
}
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php b/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
index 787af3c4ce770535a90ad629f801de75022c42fb..3091bbf430c580691fb54da48251634873e44eb0 100644
--- a/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
+++ b/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
@@ -38,7 +38,7 @@ public function __construct(EntityStorageControllerInterface $image_style_storag
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('image_style')
+ $container->get('entity.manager')->getStorageController('image_style')
);
}
diff --git a/core/modules/image/lib/Drupal/image/ImageStyleListController.php b/core/modules/image/lib/Drupal/image/ImageStyleListController.php
index f6a253486460a68faea072b36fbc1524aba7f48f..984fe899f62323b811045f4bafd544bdc305e199 100644
--- a/core/modules/image/lib/Drupal/image/ImageStyleListController.php
+++ b/core/modules/image/lib/Drupal/image/ImageStyleListController.php
@@ -54,7 +54,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
return new static(
$entity_type,
$entity_info,
- $container->get('plugin.manager.entity')->getStorageController($entity_type),
+ $container->get('entity.manager')->getStorageController($entity_type),
$container->get('module_handler'),
$container->get('url_generator'),
$container->get('string_translation')
diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
index 8a973d004699e423bb30faec70c1e13c03a84d0e..8b61f6316fe6616534eae81e92d891571b9f3b49 100644
--- a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
+++ b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
@@ -521,7 +521,7 @@ function testLinkSeparateFormatter() {
*/
protected function renderTestEntity($id, $view_mode = 'full', $reset = TRUE) {
if ($reset) {
- $this->container->get('plugin.manager.entity')->getStorageController('entity_test')->resetCache(array($id));
+ $this->container->get('entity.manager')->getStorageController('entity_test')->resetCache(array($id));
}
$entity = entity_load('entity_test', $id);
$display = entity_get_display($entity->entityType(), $entity->bundle(), $view_mode);
diff --git a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php b/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php
index e1087bbfce08eea54b2c15be37d67aa1e1704aa0..6beeedf97b010adfecea1d6e3224a27c62deb0f3 100644
--- a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php
+++ b/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php
@@ -52,8 +52,8 @@ public function __construct(MenuLinkStorageControllerInterface $menu_link_storag
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('menu_link'),
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')->getStorageController('menu_link'),
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php
index 9776fabeeab024e01bde002f6e8d6e692245db55..ce8b5d1ffa090ca728a7aeba1965701fa21dd2fa 100644
--- a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php
+++ b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php
@@ -49,7 +49,7 @@ public function __construct(EntityStorageControllerInterface $storage_controller
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('menu_link'),
+ $container->get('entity.manager')->getStorageController('menu_link'),
$container->get('database')
);
}
diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
index 83d609876bf0d29c1e0801632374161184433af7..582dddee825efdf79bfa384ec9b921773c7d8bde 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
@@ -59,7 +59,7 @@ public function __construct(QueryFactory $entity_query_factory, MenuLinkStorageC
public static function create(ContainerInterface $container) {
return new static(
$container->get('entity.query'),
- $container->get('plugin.manager.entity')->getStorageController('menu_link')
+ $container->get('entity.manager')->getStorageController('menu_link')
);
}
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
index e94a0a63b2cd1c988e078ea36f5556181dcbf584..8aea21df70158ec9a88f176493e5e69fde568c15 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
@@ -61,7 +61,7 @@ public function __construct(MenuLinkStorageControllerInterface $menu_link_storag
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('menu_link'),
+ $container->get('entity.manager')->getStorageController('menu_link'),
$container->get('path.alias_manager.cached'),
$container->get('url_generator')
);
diff --git a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php b/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php
index 48afe7b5beac65efddc4d62fe40c4b6ff6e21cd9..849dd1a1d3d1dad6ac516e5f189b903d7ec4abad 100644
--- a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php
+++ b/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php
@@ -60,7 +60,7 @@ public function __construct(TempStoreFactory $temp_store_factory, EntityManager
public static function create(ContainerInterface $container) {
return new static(
$container->get('user.tempstore'),
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php b/core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php
index bfd3a1b3318f0bba9de1a5990c30a7815cc73dad..299f780c1cd6a19d8cc13c0a2eadd4f665026e86 100644
--- a/core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php
+++ b/core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php
@@ -50,7 +50,7 @@ public function __construct(UrlGeneratorInterface $url_generator, EntityStorageC
public static function create(ContainerInterface $container) {
return new static(
$container->get('url_generator'),
- $container->get('plugin.manager.entity')->getStorageController('node_type')
+ $container->get('entity.manager')->getStorageController('node_type')
);
}
diff --git a/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php b/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php
index e0d7fae81e4e496af0c96a846f0a7245ebb35a95..ad0201ebd6baf83ef3634720d1816403e9232813 100644
--- a/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php
+++ b/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php
@@ -67,7 +67,7 @@ public function __construct(EntityStorageControllerInterface $node_storage, Enti
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
- $entity_manager = $container->get('plugin.manager.entity');
+ $entity_manager = $container->get('entity.manager');
return new static(
$entity_manager->getStorageController('node'),
$entity_manager->getStorageController('node_type'),
diff --git a/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php b/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php
index 79c19c5899df05c42442b48222fa01f9235ff8f9..765a1ebed104989f544036baeeac52e9d143d1d4 100644
--- a/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php
+++ b/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php
@@ -47,7 +47,7 @@ public function __construct(EntityStorageControllerInterface $node_storage) {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('node')
+ $container->get('entity.manager')->getStorageController('node')
);
}
diff --git a/core/modules/node/lib/Drupal/node/NodeTypeListController.php b/core/modules/node/lib/Drupal/node/NodeTypeListController.php
index 11e141414487cbef79470010ad985a86879c6cff..0cb406f8b574fb1bdbbcf6a5ec27f58ebc77531f 100644
--- a/core/modules/node/lib/Drupal/node/NodeTypeListController.php
+++ b/core/modules/node/lib/Drupal/node/NodeTypeListController.php
@@ -53,7 +53,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
return new static(
$entity_type,
$entity_info,
- $container->get('plugin.manager.entity')->getStorageController($entity_type),
+ $container->get('entity.manager')->getStorageController($entity_type),
$container->get('module_handler'),
$container->get('url_generator')
);
diff --git a/core/modules/node/lib/Drupal/node/Tests/SummaryLengthTest.php b/core/modules/node/lib/Drupal/node/Tests/SummaryLengthTest.php
index 2b0c493abcecd036faa4a4a62798604d61ed2741..c9d97c0e84a775c8d0254b9212c79327e28afd04 100644
--- a/core/modules/node/lib/Drupal/node/Tests/SummaryLengthTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/SummaryLengthTest.php
@@ -35,7 +35,7 @@ function testSummaryLength() {
$web_user = $this->drupalCreateUser(array('access content', 'administer content types'));
$this->loggedInUser = $web_user;
- $controller = $this->container->get('plugin.manager.entity')->getRenderController('node');
+ $controller = $this->container->get('entity.manager')->getRenderController('node');
// Render the node as a teaser.
$content = $controller->view($node, 'teaser');
$this->assertTrue(strlen($content['body'][0]['#markup']) < 600, 'Teaser is less than 600 characters long.');
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FrontpageTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/FrontpageTest.php
index f638dbea0e52b9c1fc5891fce0e5669abd767a5c..e94d17153506b8368f68a61bfeb1e0a92f1204d6 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/FrontpageTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/FrontpageTest.php
@@ -40,7 +40,7 @@ public static function getInfo() {
protected function setUp() {
parent::setUp();
- $this->nodeStorageController = $this->container->get('plugin.manager.entity')->getStorageController('node');
+ $this->nodeStorageController = $this->container->get('entity.manager')->getStorageController('node');
}
/**
diff --git a/core/modules/node/node.services.yml b/core/modules/node/node.services.yml
index ab496171b463978f1b403494967c29fa7c93f6c0..bf4c4eee81390a685e23a629b7dcc9e92637671c 100644
--- a/core/modules/node/node.services.yml
+++ b/core/modules/node/node.services.yml
@@ -4,6 +4,6 @@ services:
arguments: ['@database', '@module_handler']
access_check.node.revision:
class: Drupal\node\Access\NodeRevisionAccessCheck
- arguments: ['@plugin.manager.entity', '@database']
+ arguments: ['@entity.manager', '@database']
tags:
- { name: access_check }
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php b/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php
index b583649aa71da68b645493cd7e05eb910c1e8bb7..9bb2f99fe44367db34df80f6b1419624bb42df27 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php
@@ -45,7 +45,7 @@ public function __construct(EntityManager $entity_manager) {
*/
public static function create(ContainerInterface $container, $base_plugin_id) {
return new static(
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php
index ff2e9c4f9d09b881ed3057f490e3f8bf2380e0b1..a3b0f61025d7deb4a0f1e1d914abfd3402bcb535 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php
@@ -45,7 +45,7 @@ public function __construct(Connection $database, ShortcutSetStorageControllerIn
public static function create(ContainerInterface $container) {
return new static(
$container->get('database'),
- $container->get('plugin.manager.entity')->getStorageController('shortcut_set')
+ $container->get('entity.manager')->getStorageController('shortcut_set')
);
}
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index 0805bc1e93c2435a672bbe99004466efb91b39d6..91925e1988742de8b54b855c22a1950658e57ab7 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -1307,7 +1307,7 @@ public function configImporter() {
$config_comparer,
$this->container->get('event_dispatcher'),
$this->container->get('config.factory'),
- $this->container->get('plugin.manager.entity'),
+ $this->container->get('entity.manager'),
$this->container->get('lock')
);
}
diff --git a/core/modules/system/lib/Drupal/system/DateFormatListController.php b/core/modules/system/lib/Drupal/system/DateFormatListController.php
index 124da7830f0ef19f1060df0f5e01e50cb76bd219..d22642b8531bbc11a677a055ffa76fadbc22b389 100644
--- a/core/modules/system/lib/Drupal/system/DateFormatListController.php
+++ b/core/modules/system/lib/Drupal/system/DateFormatListController.php
@@ -54,7 +54,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
return new static(
$entity_type,
$entity_info,
- $container->get('plugin.manager.entity')->getStorageController($entity_type),
+ $container->get('entity.manager')->getStorageController($entity_type),
$container->get('module_handler'),
$container->get('date')
);
diff --git a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php b/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php
index 87a7516520f564b64ee0f26b615a1ca852358a3e..847aee7bf92f0552622a11f60403b80c082e9864 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php
@@ -47,7 +47,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
* {@inheritdoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
- return new static($configuration, $plugin_id, $plugin_definition, $container->get('plugin.manager.entity'));
+ return new static($configuration, $plugin_id, $plugin_definition, $container->get('entity.manager'));
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Action/ActionUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Action/ActionUnitTest.php
index 87e5113c6e47204b07c1d2bb092479b786d91c38..03cc551648d03512f4130038578e98cc4f10da6d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Action/ActionUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Action/ActionUnitTest.php
@@ -70,7 +70,7 @@ public function testOperations() {
// Create a new unsaved user.
$name = $this->randomName();
- $user_storage = $this->container->get('plugin.manager.entity')->getStorageController('user');
+ $user_storage = $this->container->get('entity.manager')->getStorageController('user');
$account = $user_storage->create(array('name' => $name, 'bundle' => 'user'));
$loaded_accounts = $user_storage->loadMultiple();
$this->assertEqual(count($loaded_accounts), 0);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
index 2bd36c26f0608fe4ebd8cc550b54376df75bf8f5..168f0593eac0f899c6d5701cb332ee49b5058bc5 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
@@ -41,7 +41,7 @@ function setUp() {
\Drupal::config('system.date')
->set('timezone.user.configurable', 1)
->save();
- $formats = $this->container->get('plugin.manager.entity')
+ $formats = $this->container->get('entity.manager')
->getStorageController('date_format')
->loadMultiple(array('long', 'medium', 'short'));
$formats['long']->setPattern('l, j. F Y - G:i')->save();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php b/core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php
index 453cfbd2f2d9725f1277df1599cc8d1185ce0f19..b38f955cca7a07591a37a63f3c22dd056f633229 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php
@@ -76,7 +76,7 @@ function testDateTimestampIntl() {
$this->assertTrue($intl_date->canUseIntl(), 'DateTimePlus object can use intl when provided with country and langcode settings.');
$this->assertFalse($php_date->canUseIntl(), 'DateTimePlus object will fallback to use PHP when not provided with country setting.');
- $default_formats = $this->container->get('plugin.manager.entity')
+ $default_formats = $this->container->get('entity.manager')
->getStorageController('date_format')
->loadMultiple();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityAccessTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityAccessTest.php
index f6a70566546f374717db00ae8f7fad062b0684d0..be02e7f8b9e101eda4403c28f7efbf5d9fcad6df 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityAccessTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityAccessTest.php
@@ -95,7 +95,7 @@ function testEntityAccessDefaultController() {
// Check that the default access controller is used for entities that don't
// have a specific access controller defined.
- $controller = $this->container->get('plugin.manager.entity')->getAccessController('entity_test_default_access');
+ $controller = $this->container->get('entity.manager')->getAccessController('entity_test_default_access');
$this->assertTrue($controller instanceof EntityAccessController, 'The default entity controller is used for the entity_test_default_access entity type.');
$entity = entity_create('entity_test_default_access', array());
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php
index d3334abb020b0df856d1f7c6eb15c803550440ca..31809090ee24752d72448a343266eba112a5f955 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php
@@ -97,7 +97,7 @@ protected function assertFormCRUD($entity_type) {
protected function loadEntityByName($entity_type, $name) {
// Always load the entity from the database to ensure that changes are
// correctly picked up.
- $this->container->get('plugin.manager.entity')->getStorageController($entity_type)->resetCache();
+ $this->container->get('entity.manager')->getStorageController($entity_type)->resetCache();
return current(entity_load_multiple_by_properties($entity_type, array('name' => $name)));
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityManagerTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityManagerTest.php
index 326bbdb64736518f6378616910cca6b1152cd55f..bb445a8c986de1fddee38a503f529d0e5d6125ec 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityManagerTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityManagerTest.php
@@ -27,7 +27,7 @@ public static function getInfo() {
*/
public function testMethods() {
// Tests the has controller method.
- $entity_manager = $this->container->get('plugin.manager.entity');
+ $entity_manager = $this->container->get('entity.manager');
$this->assertEqual(spl_object_hash($entity_manager), spl_object_hash($this->container->get('entity.manager')));
$this->assertFalse($entity_manager->hasController('non_existent', 'storage'), 'A non existent entity type has no controller.');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php
index b43159359e4ccdfff9ef13be80240c924b5e9dbc..934948499ba32371f52e0a0abf5cd736978c4711 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php
@@ -55,7 +55,7 @@ public static function getInfo() {
public function setUp() {
parent::setUp();
- $this->entityStorageController = $this->container->get('plugin.manager.entity')->getStorageController('entity_test');
+ $this->entityStorageController = $this->container->get('entity.manager')->getStorageController('entity_test');
$this->factory = $this->container->get('entity.query');
// Add some fieldapi fields to be used in the test.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
index 9644e725f1fff1b1c42d85e8bbb0449d259f5cb2..d3225b3d67dc83a8eeec747b7cbdd288cac54797 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
@@ -39,7 +39,7 @@ abstract class EntityUnitTestBase extends DrupalUnitTestBase {
public function setUp() {
parent::setUp();
- $this->entityManager = $this->container->get('plugin.manager.entity');
+ $this->entityManager = $this->container->get('entity.manager');
$this->state = $this->container->get('state');
$this->installSchema('user', 'users');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityViewControllerTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityViewControllerTest.php
index 502a20665f25879e50f6514774db0adfab8a1525..b60e0ea9e63995cd8bdc243381d6ff1d5f854e9a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityViewControllerTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityViewControllerTest.php
@@ -43,7 +43,7 @@ function setUp() {
for ($i = 0; $i < 2; $i++) {
$random_label = $this->randomName();
$data = array('bundle' => 'entity_test_render', 'name' => $random_label);
- $entity_test = $this->container->get('plugin.manager.entity')->getStorageController('entity_test_render')->create($data);
+ $entity_test = $this->container->get('entity.manager')->getStorageController('entity_test_render')->create($data);
$entity_test->save();
$this->entities[] = $entity_test;
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php
index 982a70dfd8a113cc973177d4c9b9e1a4cd91aea5..0bcec30dbc570c4b5eb07d374e766ed8b28a4206 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php
@@ -39,7 +39,7 @@ function setUp() {
* Validate the generation of a proper menu tree output.
*/
function testMenuTreeData() {
- $storage_controller = $this->container->get('plugin.manager.entity')->getStorageController('menu_link');
+ $storage_controller = $this->container->get('entity.manager')->getStorageController('menu_link');
// @todo Prettify this tree buildup code, it's very hard to read.
$this->tree_data = array(
'1'=> array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php
index a53b70f1717b019e0d1b9bd866460b0bdf65b357..4b22f939019ca02bcf73e9fd3a08063f1849496f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php
@@ -189,7 +189,7 @@ public function testFrontpageUpgrade() {
$this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
$this->assertTrue($this->container->get('module_handler')->moduleExists('views'), 'Views is enabled after the upgrade.');
- $view = $this->container->get('plugin.manager.entity')->getStorageController('view')->load('frontpage');
+ $view = $this->container->get('entity.manager')->getStorageController('view')->load('frontpage');
$this->assertTrue($view->status(), 'The frontpage view is enabled after the upgrade.');
}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php
index 032ee2151ab39309507854750abd4a3956ae39d2..f7a9ebb669b95a44b6800233f9d00e2f9180e517 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php
@@ -39,7 +39,7 @@ public function __construct(VocabularyStorageControllerInterface $storage_contro
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('taxonomy_vocabulary')
+ $container->get('entity.manager')->getStorageController('taxonomy_vocabulary')
);
}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
index b5e0b7701647ef80a6078bd40521918ef2d9ba38..413e2cc6ec31ec2dcef40eb02df1b91a0dc8a662 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
@@ -96,7 +96,7 @@ function testTaxonomyAdminChangingWeights() {
$this->drupalPost('admin/structure/taxonomy', $edit, t('Save'));
// Load the vocabularies from the database.
- $this->container->get('plugin.manager.entity')->getStorageController('taxonomy_vocabulary')->resetCache();
+ $this->container->get('entity.manager')->getStorageController('taxonomy_vocabulary')->resetCache();
$new_vocabularies = entity_load_multiple('taxonomy_vocabulary');
taxonomy_vocabulary_sort($new_vocabularies);
@@ -136,7 +136,7 @@ function testTaxonomyAdminDeletingVocabulary() {
$this->assertText(t('Created new vocabulary'), 'New vocabulary was created.');
// Check the created vocabulary.
- $this->container->get('plugin.manager.entity')->getStorageController('taxonomy_vocabulary')->resetCache();
+ $this->container->get('entity.manager')->getStorageController('taxonomy_vocabulary')->resetCache();
$vocabulary = entity_load('taxonomy_vocabulary', $vid);
$this->assertTrue($vocabulary, 'Vocabulary found.');
@@ -149,7 +149,7 @@ function testTaxonomyAdminDeletingVocabulary() {
// Confirm deletion.
$this->drupalPost(NULL, NULL, t('Delete'));
$this->assertRaw(t('Deleted vocabulary %name.', array('%name' => $vocabulary->name)), 'Vocabulary deleted.');
- $this->container->get('plugin.manager.entity')->getStorageController('taxonomy_vocabulary')->resetCache();
+ $this->container->get('entity.manager')->getStorageController('taxonomy_vocabulary')->resetCache();
$this->assertFalse(entity_load('taxonomy_vocabulary', $vid), 'Vocabulary not found.');
}
}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php
index 13d4762ed18cb230958404db5224e42e48dfe93e..fe2bce08d746aa64a31e7af0578d4a9278c5e197 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php
@@ -136,7 +136,7 @@ function testTaxonomyVocabularyLoadMultiple() {
$this->assertEqual(array_shift($vocabularies)->id(), $vocabulary1->id(), 'Vocabulary loaded successfully by ID.');
// Test loading vocabularies by their properties.
- $controller = $this->container->get('plugin.manager.entity')->getStorageController('taxonomy_vocabulary');
+ $controller = $this->container->get('entity.manager')->getStorageController('taxonomy_vocabulary');
// Fetch vocabulary 1 by name.
$vocabulary = current($controller->loadByProperties(array('name' => $vocabulary1->name)));
$this->assertEqual($vocabulary->id(), $vocabulary1->id(), 'Vocabulary loaded successfully by name.');
diff --git a/core/modules/taxonomy/taxonomy.services.yml b/core/modules/taxonomy/taxonomy.services.yml
index 265eb5d7a55a86507ab02462fce6e6f8cf0a68af..9a7b01258d55b9276d6595cb9eb14825a0481848 100644
--- a/core/modules/taxonomy/taxonomy.services.yml
+++ b/core/modules/taxonomy/taxonomy.services.yml
@@ -1,6 +1,6 @@
services:
access_check.taxonomy_term.create:
class: Drupal\taxonomy\Access\TaxonomyTermCreateAccess
- arguments: ['@plugin.manager.entity']
+ arguments: ['@entity.manager']
tags:
- { name: access_check }
diff --git a/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php b/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
index 54227910d336a40e839dced7bee91295d06a76fb..229615f423f5ec418d82d22845b21b12fcb35e52 100644
--- a/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
+++ b/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
@@ -256,7 +256,7 @@ function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
$this->assertText(t('entity_test @id has been updated.', array('@id' => $id)), 'Entity was updated');
// Display the entity.
- $this->container->get('plugin.manager.entity')->getStorageController('entity_test')->resetCache(array($id));
+ $this->container->get('entity.manager')->getStorageController('entity_test')->resetCache(array($id));
$entity = entity_load('entity_test', $id);
$display = entity_get_display($entity->entityType(), $entity->bundle(), 'full');
$entity->content = field_attach_view($entity, $display);
diff --git a/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php b/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php
index eaf2c3938ce23ead32b2921b993193325a82f7d6..f2a39409ed6df7e23414b5bac925e67248f43842 100644
--- a/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php
+++ b/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php
@@ -62,7 +62,7 @@ public static function create(ContainerInterface $container) {
return new static(
$container->get('config.factory'),
$container->get('flood'),
- $container->get('plugin.manager.entity')->getStorageController('user')
+ $container->get('entity.manager')->getStorageController('user')
);
}
diff --git a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
index 1b9bd17b05c0b31a999c1df9020667dbc845827b..299a9e63f8d5319bf907e50249865d59800ef6fd 100644
--- a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
+++ b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
@@ -51,7 +51,7 @@ public function __construct(UserStorageControllerInterface $user_storage_control
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('user'),
+ $container->get('entity.manager')->getStorageController('user'),
$container->get('language_manager')
);
}
diff --git a/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php b/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php
index c76e12029a7dc3a840123d44b372db4fc9402c36..abadd3088fa6cb9df36a0c390d3b836acbdc6d0f 100644
--- a/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php
+++ b/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php
@@ -52,7 +52,7 @@ public function __construct(ModuleHandlerInterface $module_handler, RoleStorageC
public static function create(ContainerInterface $container) {
return new static(
$container->get('module_handler'),
- $container->get('plugin.manager.entity')->getStorageController('user_role')
+ $container->get('entity.manager')->getStorageController('user_role')
);
}
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php
index df8f879e1a1d7eb68bb3baced8c73c0a3a671d28..5b047fb7470f91ef725e49e0c1284d573d44e9aa 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php
@@ -51,7 +51,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
* {@inheritdoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
- return parent::create($container, $configuration, $plugin_id, $plugin_definition, $container->get('plugin.manager.entity'));
+ return parent::create($container, $configuration, $plugin_id, $plugin_definition, $container->get('entity.manager'));
}
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
index d4f0c795bdc8bc1e0f7f3ad204209f35ec6cb57e..0688b5c84993fa80d0733a7234b4e99d11debe0c 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
@@ -63,7 +63,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
* {@inheritdoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
- return new static($configuration, $plugin_id, $plugin_definition, $container->get('module_handler'), $container->get('plugin.manager.entity'));
+ return new static($configuration, $plugin_id, $plugin_definition, $container->get('module_handler'), $container->get('entity.manager'));
}
/**
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php b/core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php
index 2c64d7a33cd823b5c60247a790957a99f1218f01..8532008ae6b98a10c543ad9efba25c3d5457282f 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php
@@ -41,7 +41,7 @@ public static function getInfo() {
* @see \Drupal\user\Entity\User::removeRole()
*/
public function testUserMethods() {
- $role_storage = $this->container->get('plugin.manager.entity')->getStorageController('user_role');
+ $role_storage = $this->container->get('entity.manager')->getStorageController('user_role');
$role_storage->create(array('id' => 'test_role_one'))->save();
$role_storage->create(array('id' => 'test_role_two'))->save();
$role_storage->create(array('id' => 'test_role_three'))->save();
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
index e2e97a1f1823284da203b3fdb0226f469321b132..40f8d6064768c933c6fd8416e9db0edf640e9853 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
@@ -47,7 +47,7 @@ function testUserPermissionChanges() {
$edit[$rid . '[administer nodes]'] = TRUE;
$this->drupalPost('admin/people/permissions', $edit, t('Save permissions'));
$this->assertText(t('The changes have been saved.'), 'Successful save message displayed.');
- $storage_controller = $this->container->get('plugin.manager.entity')->getStorageController('user_role');
+ $storage_controller = $this->container->get('entity.manager')->getStorageController('user_role');
$storage_controller->resetCache();
$this->assertTrue(user_access('administer nodes', $account), 'User now has "administer nodes" permission.');
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
index fe533054ef7a3145c3c3ca1b13d25abed5bc226b..0318e742c24d64a34690c6a04ecd00f40fc0a4a1 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
@@ -54,7 +54,7 @@ function testRegistrationWithEmailVerification() {
$edit['name'] = $name = $this->randomName();
$edit['mail'] = $mail = $edit['name'] . '@example.com';
$this->drupalPost('user/register', $edit, t('Create new account'));
- $this->container->get('plugin.manager.entity')->getStorageController('user')->resetCache();
+ $this->container->get('entity.manager')->getStorageController('user')->resetCache();
$accounts = entity_load_multiple_by_properties('user', array('name' => $name, 'mail' => $mail));
$new_user = reset($accounts);
$this->assertFalse($new_user->isActive(), 'New account is blocked until approved by an administrator.');
@@ -83,7 +83,7 @@ function testRegistrationWithoutEmailVerification() {
$edit['pass[pass1]'] = $new_pass = $this->randomName();
$edit['pass[pass2]'] = $new_pass;
$this->drupalPost('user/register', $edit, t('Create new account'));
- $this->container->get('plugin.manager.entity')->getStorageController('user')->resetCache();
+ $this->container->get('entity.manager')->getStorageController('user')->resetCache();
$accounts = entity_load_multiple_by_properties('user', array('name' => $name, 'mail' => $mail));
$new_user = reset($accounts);
$this->assertText(t('Registration successful. You are now logged in.'), 'Users are logged in after registering.');
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php b/core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php
index 9350338787ccfb0f24a6f3add410d3c19592ad10..02265f918ea5bfe4c6f99107c18f4e1a7309c01c 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php
@@ -51,7 +51,7 @@ protected function setUp() {
$this->installSchema('user', array('users', 'users_roles'));
$this->installSchema('system', 'sequences');
- $entity_manager = $this->container->get('plugin.manager.entity');
+ $entity_manager = $this->container->get('entity.manager');
$this->roleStorageController = $entity_manager->getStorageController('user_role');
$this->userStorageController = $entity_manager->getStorageController('user');
}
diff --git a/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php b/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php
index 71305a6bf6f7d03cfe818ece76c4069d53e79bb5..0c97bcdfd953c2838ea177cfe687b086bef813c1 100644
--- a/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php
+++ b/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php
@@ -86,7 +86,7 @@ public function testTitleQuery() {
// entity_get_info(), which in turn wraps \Drupal::entityManager(). Set
// the entity manager until this is fixed.
$container = new ContainerBuilder();
- $container->set('plugin.manager.entity', $entity_manager);
+ $container->set('entity.manager', $entity_manager);
\Drupal::setContainer($container);
$roles_rid_argument = new RolesRid(array(), 'users_roles_rid', array(), $entity_manager);
diff --git a/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php b/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php
index dc68e51d87317ab995472342276f9d76385e6d92..859c904e30d28734b190eeb14ed21861e4689a13 100644
--- a/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php
+++ b/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php
@@ -55,7 +55,7 @@ public function __construct(EntityStorageControllerInterface $storage_controller
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('view'),
+ $container->get('entity.manager')->getStorageController('view'),
$container->get('views.executable')
);
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php
index b90b3e67aa4abc28bd074cdf2d681cb2aa1fa882..10f5dd2dd1a23f508c4452900917341684587486 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php
@@ -72,7 +72,7 @@ public static function create(ContainerInterface $container, array $configuratio
return new static(
$configuration, $plugin_id, $plugin_definition,
$container->get('views.executable'),
- $container->get('plugin.manager.entity')->getStorageController('view')
+ $container->get('entity.manager')->getStorageController('view')
);
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php
index 5ac217992a576d01dea0a5d15fb1aa7d3bf9362c..1b7f194ae34cc4b60bb11ff3adbe7761c640feba 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php
@@ -45,7 +45,7 @@ class ViewsBlock implements ContainerDerivativeInterface {
public static function create(ContainerInterface $container, $base_plugin_id) {
return new static(
$base_plugin_id,
- $container->get('plugin.manager.entity')->getStorageController('view')
+ $container->get('entity.manager')->getStorageController('view')
);
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php
index f38cf357d3003cb75d4d9d10ef4c832ee110d4b9..252568d2074ed9a166141d77f4ea690948551a45 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php
@@ -71,7 +71,7 @@ public function __construct($base_plugin_id, EntityManager $entity_manager, View
public static function create(ContainerInterface $container, $base_plugin_id) {
return new static(
$base_plugin_id,
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('views.views_data')
);
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php
index a62d2869ae1d9e38ec95cb9e5fd140be49fb32fe..96bdd4c642a924a3dccb1b9c3cd533496a5756d3 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php
@@ -58,7 +58,7 @@ public function __construct($base_plugin_id, EntityStorageControllerInterface $v
public static function create(ContainerInterface $container, $base_plugin_id) {
return new static(
$base_plugin_id,
- $container->get('plugin.manager.entity')->getStorageController('view')
+ $container->get('entity.manager')->getStorageController('view')
);
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php
index c4d94cc4e52f4da2cff15da8f87c1d7b31d35ab5..2ef89a82a5a59cdf035bbd39c75462fb49566a34 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php
@@ -66,7 +66,7 @@ public static function create(ContainerInterface $container, array $configuratio
$plugin_id,
$plugin_definition,
$container->get('date'),
- $container->get('plugin.manager.entity')->getStorageController('date_format')
+ $container->get('entity.manager')->getStorageController('date_format')
);
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
index de98e5bdf06fd3419e11501bc68af659ff15ce73..b9b35abaaaddc6842d2d1f81e9aa18c257c52b2c 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
@@ -62,7 +62,7 @@ public static function create(ContainerInterface $container, array $configuratio
$configuration,
$plugin_id,
$plugin_definition,
- $container->get('plugin.manager.entity')
+ $container->get('entity.manager')
);
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
index 2c4eae2fc17d5c141b0a6a8a832804c87762dc9d..363bc0c08e3a15a87301702b53fe897c95eb0a61 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
@@ -86,7 +86,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
* {@inheritdoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
- return new static($configuration, $plugin_id, $plugin_definition, $container->get('plugin.manager.entity'));
+ return new static($configuration, $plugin_id, $plugin_definition, $container->get('entity.manager'));
}
/**
diff --git a/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php b/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php
index 741aaa3bfb6a2c737287b3dfdba5414951026f18..8da43f02095739860ec0434908843c44c1478b4c 100644
--- a/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php
+++ b/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php
@@ -51,7 +51,7 @@ public function __construct(EntityStorageControllerInterface $storage_controller
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity')->getStorageController('view'),
+ $container->get('entity.manager')->getStorageController('view'),
$container->get('views.executable')
);
}
diff --git a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
index 88d3880d8f679a173d5b0445da19663d198bfde2..82fa1ebdc8296261b80d07eb511c3ae1d687e383 100644
--- a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
@@ -114,7 +114,7 @@ protected function setUp() {
*/
public function testDefaultViews() {
// Get all default views.
- $controller = $this->container->get('plugin.manager.entity')->getStorageController('view');
+ $controller = $this->container->get('entity.manager')->getStorageController('view');
$views = $controller->loadMultiple();
foreach ($views as $name => $view_storage) {
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php
index b2669a17fd5dbf3e0ce16cba7d41ad67c676f46c..af0050ee974a24e52ebebf74a139831a2a18ae3a 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php
@@ -50,7 +50,7 @@ protected function setUp() {
*/
public function testEntityAreaData() {
$data = $this->container->get('views.views_data')->get('views');
- $entity_info = $this->container->get('plugin.manager.entity')->getDefinitions();
+ $entity_info = $this->container->get('entity.manager')->getDefinitions();
$expected_entities = array_filter($entity_info, function($info) {
return !empty($info['controllers']['render']);
@@ -82,7 +82,7 @@ public function testEntityArea() {
for ($i = 0; $i < 2; $i++) {
$random_label = $this->randomName();
$data = array('bundle' => 'entity_test_render', 'name' => $random_label);
- $entity_test = $this->container->get('plugin.manager.entity')->getStorageController('entity_test_render')->create($data);
+ $entity_test = $this->container->get('entity.manager')->getStorageController('entity_test_render')->create($data);
$entity_test->save();
$entities[] = $entity_test;
}
diff --git a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
index bc38e499a8e2379d5e3ab0139ffd0190396306f7..05f57e6eeacd0f9efa8f8e83b670531ac7c84a33 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
@@ -150,7 +150,7 @@ public function customErrorHandler($error_level, $message, $filename, $line, $co
*/
public function testLoadFunctions() {
$this->enableModules(array('node'));
- $controller = $this->container->get('plugin.manager.entity')->getStorageController('view');
+ $controller = $this->container->get('entity.manager')->getStorageController('view');
// Test views_view_is_enabled/disabled.
$archive = $controller->load('archive');
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php
index 120040f2ca8d6929897d3989d8e2635f9397d97b..42cb67a648cc2a620be80c72fed785afdcf3c6d8 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php
@@ -92,7 +92,7 @@ public function testFeedOutput() {
$result = $this->xpath('//title');
$this->assertEqual($result[0], $site_name, 'The site title is used for the feed title.');
- $view = $this->container->get('plugin.manager.entity')->getStorageController('view')->load('test_feed_display');
+ $view = $this->container->get('entity.manager')->getStorageController('view')->load('test_feed_display');
$display = &$view->getDisplay('feed_1');
$display['display_options']['sitename_title'] = 0;
$view->save();
diff --git a/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php b/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php
index 8d38134e8187c94d3bc273cada41015ca98bc1e2..edb6737a4cc5bb9800a182bb1f87ac9a83b14ad3 100644
--- a/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php
@@ -49,7 +49,7 @@ protected function setUp() {
$this->installSchema('entity_test', array('entity_test'));
- $this->storageController = $this->container->get('plugin.manager.entity')->getStorageController('entity_test');
+ $this->storageController = $this->container->get('entity.manager')->getStorageController('entity_test');
}
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php
index 72da113f0f1b163d424bca18aec5d28867de5d0d..892b2bea7d80f487f64c117e9cbee47cb1a366a5 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php
@@ -57,7 +57,7 @@ protected function setUp() {
$this->installSchema('system', 'menu_router');
- $this->pageController = new ViewPageController($this->container->get('plugin.manager.entity')->getStorageController('view'), new ViewExecutableFactory());
+ $this->pageController = new ViewPageController($this->container->get('entity.manager')->getStorageController('view'), new ViewExecutableFactory());
}
/**
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
index 7c065f41367f67ef871cd9d3b817c0e94c734796..4df0def8b7430c41bce5a7c99258cdd30c4e73f1 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
@@ -73,7 +73,7 @@ public static function getInfo() {
function testConfigurationEntityCRUD() {
// Get the configuration entity information and controller.
$this->info = entity_get_info('view');
- $this->controller = $this->container->get('plugin.manager.entity')->getStorageController('view');
+ $this->controller = $this->container->get('entity.manager')->getStorageController('view');
// Confirm that an info array has been returned.
$this->assertTrue(!empty($this->info) && is_array($this->info), 'The View info array is loaded.');
diff --git a/core/modules/views/lib/Drupal/views/Views.php b/core/modules/views/lib/Drupal/views/Views.php
index fb75a6ad3eaf324b03a6d5b6e22e13e4aa68beea..12b76a19066e486c52f900254a01b5aeca2286ef 100644
--- a/core/modules/views/lib/Drupal/views/Views.php
+++ b/core/modules/views/lib/Drupal/views/Views.php
@@ -83,7 +83,7 @@ public static function handlerManager($type) {
* A view executable instance, from the loaded entity.
*/
public static function getView($id) {
- $view = \Drupal::service('plugin.manager.entity')->getStorageController('view')->load($id);
+ $view = \Drupal::service('entity.manager')->getStorageController('view')->load($id);
if ($view) {
return static::executableFactory()->get($view);
}
diff --git a/core/modules/views/tests/Drupal/views/Tests/ViewsTest.php b/core/modules/views/tests/Drupal/views/Tests/ViewsTest.php
index dfe4e55e6a965c7c03315a2b4c0b39254b7c4add..39407ec01ff54b9023fe236ea89579aafb07b58e 100644
--- a/core/modules/views/tests/Drupal/views/Tests/ViewsTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/ViewsTest.php
@@ -49,7 +49,7 @@ protected function setUp() {
->method('getStorageController')
->with('view')
->will($this->returnValue($view_storage_controller));
- $container->set('plugin.manager.entity', $entity_manager);
+ $container->set('entity.manager', $entity_manager);
\Drupal::setContainer($container);
}
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
index 20d8e87c91145e4187abd6ecaf1a623b6c120f07..5995f652b07ee07b7cb497f97d5b4ae0badd97d8 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
@@ -78,7 +78,7 @@ public function __construct(EntityManager $entity_manager, ViewsData $views_data
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('views.views_data'),
$container->get('url_generator'),
$container->get('link_generator')
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php
index a5b38d22e84b73189329d88ebb53a0f8f067c827..767332500cf68f2d3fa755f20b71b07beb27e5e1 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php
@@ -49,7 +49,7 @@ public function __construct(EntityManager $entity_manager, TempStoreFactory $tem
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('plugin.manager.entity'),
+ $container->get('entity.manager'),
$container->get('user.tempstore')
);
}
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php
index 40d80d4541ffb98aa1a804227b13dcc074d8a8cd..14d14b0e4f3f7da2ca5a148a8c279b8c0a7041a0 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php
@@ -52,7 +52,7 @@ function testGroupBySave() {
$this->drupalPost(NULL, array(), t('Save'));
- $view = $this->container->get('plugin.manager.entity')->getStorageController('view')->load('test_views_groupby_save');
+ $view = $this->container->get('entity.manager')->getStorageController('view')->load('test_views_groupby_save');
$display = $view->getDisplay('default');
$this->assertTrue($display['display_options']['group_by'], 'The groupby setting was saved on the view.');
$this->assertEqual($display['display_options']['fields']['id']['group_type'], 'count', 'Count groupby_type was saved on the view.');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
index f33125771185f9a854fe7f6fab493363294f67bd..79b02bf3a4c3c01d7d9e1a061f7fb50e8600d666 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
@@ -108,7 +108,7 @@ public function testUICRUD() {
// Save the view and have a look whether the handler was added as expected.
$this->drupalPost(NULL, array(), t('Save'));
- $view = $this->container->get('plugin.manager.entity')->getStorageController('view')->load('test_view_empty');
+ $view = $this->container->get('entity.manager')->getStorageController('view')->load('test_view_empty');
$display = $view->getDisplay('default');
$this->assertTrue(isset($display['display_options'][$type_info['plural']][$id]), 'Ensure the field was added to the view itself.');
@@ -117,7 +117,7 @@ public function testUICRUD() {
$this->assertNoLinkByHref($edit_handler_url, 0, 'The handler edit link does not appears in the UI after removing.');
$this->drupalPost(NULL, array(), t('Save'));
- $view = $this->container->get('plugin.manager.entity')->getStorageController('view')->load('test_view_empty');
+ $view = $this->container->get('entity.manager')->getStorageController('view')->load('test_view_empty');
$display = $view->getDisplay('default');
$this->assertFalse(isset($display['display_options'][$type_info['plural']][$id]), 'Ensure the field was removed from the view itself.');
}
@@ -138,7 +138,7 @@ public function testUICRUD() {
$this->drupalPost(NULL, array(), t('Apply'));
$this->drupalPost(NULL, array(), t('Save'));
- $view = $this->container->get('plugin.manager.entity')->getStorageController('view')->load('test_view_empty');
+ $view = $this->container->get('entity.manager')->getStorageController('view')->load('test_view_empty');
$display = $view->getDisplay('default');
$this->assertTrue(isset($display['display_options'][$type_info['plural']][$id]), 'Ensure the field was added to the view itself.');
}
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php
index 09f24b2360b50c071d02df629ba477eb892ec717..33ac4de06a5a60b7c0b5147d97c06edd881520e8 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php
@@ -34,7 +34,7 @@ class ViewListController extends ConfigEntityListController implements EntityCon
public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
return new static(
$entity_type,
- $container->get('plugin.manager.entity')->getStorageController($entity_type),
+ $container->get('entity.manager')->getStorageController($entity_type),
$entity_info,
$container->get('plugin.manager.views.display'),
$container->get('module_handler')
diff --git a/core/modules/views_ui/views_ui.services.yml b/core/modules/views_ui/views_ui.services.yml
index 3120b87b6d4b9f65815bd94df4e73c34d0882476..e75c7af4acd2018242da6cc71220d1fcdf78e598 100644
--- a/core/modules/views_ui/views_ui.services.yml
+++ b/core/modules/views_ui/views_ui.services.yml
@@ -1,6 +1,6 @@
services:
paramconverter.views_ui:
class: Drupal\views_ui\ParamConverter\ViewUIConverter
- arguments: ['@plugin.manager.entity', '@user.tempstore']
+ arguments: ['@entity.manager', '@user.tempstore']
tags:
- { name: paramconverter, priority: 10 }
diff --git a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
index 10d644ad52708aa174bfba75708a6f75576a19c3..e1966bfd86787fc25741d2cfc592869776dd4a38 100644
--- a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
+++ b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
@@ -113,7 +113,7 @@ protected function setUp() {
->with($this->equalTo('user_role'))
->will($this->returnValue($role_storage));
$container = new ContainerBuilder();
- $container->set('plugin.manager.entity', $entity_manager);
+ $container->set('entity.manager', $entity_manager);
\Drupal::setContainer($container);
$this->users['user_one'] = $this->createUserSession(array('role_one'));