From 3073c281f08d8ae15657319ceb54025d88cd4612 Mon Sep 17 00:00:00 2001 From: M Parker Date: Fri, 16 Feb 2018 10:27:35 -0500 Subject: [PATCH] 2856225-10 --- auto_entitylabel.services.yml | 8 ++++---- src/AutoEntityLabelPermissionController.php | 8 ++++---- src/Controller/AutoEntityLabelController.php | 4 ++-- src/Form/AutoEntityLabelForm.php | 8 ++++---- src/Plugin/Derivative/AutoEntityLabelConfigTask.php | 8 ++++---- src/Routing/RouteEnhancer.php | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/auto_entitylabel.services.yml b/auto_entitylabel.services.yml index 93f0e6e..6b42003 100644 --- a/auto_entitylabel.services.yml +++ b/auto_entitylabel.services.yml @@ -1,17 +1,17 @@ services: auto_entitylabel.route_subscriber: class: Drupal\auto_entitylabel\Routing\RouteSubscriber - arguments: ['@entity.manager'] + arguments: ['@entity_type.manager'] tags: - { name: event_subscriber } auto_entitylabel.route_enhancer: class: Drupal\auto_entitylabel\Routing\RouteEnhancer - arguments: ['@entity.manager'] + arguments: ['@entity_type.manager'] tags: - { name: route_enhancer } auto_entitylabel.manager: class: Drupal\auto_entitylabel\AutoEntityLabelManager - arguments: ['@entity.manager', '@config.factory', '@entity_type.manager', '@token'] + arguments: ['@entity_type.manager', '@config.factory', '@entity_type.manager', '@token'] auto_entitylabel.entity_decorator: class: Drupal\auto_entitylabel\EntityDecorator - arguments: ['@config.factory', '@entity_type.manager', '@token'] + arguments: ['@entity_type.manager', '@entity_type.manager', '@token'] diff --git a/src/AutoEntityLabelPermissionController.php b/src/AutoEntityLabelPermissionController.php index a84dc9c..c7523de 100644 --- a/src/AutoEntityLabelPermissionController.php +++ b/src/AutoEntityLabelPermissionController.php @@ -19,7 +19,7 @@ class AutoEntityLabelPermissionController implements ContainerInjectionInterface * * @var \Drupal\Core\Entity\EntityTypeManagerInterface */ - protected $entityManager; + protected $entityTypeManager; /** * Constructs a new AutoEntityLabelPermissionController instance. @@ -28,14 +28,14 @@ class AutoEntityLabelPermissionController implements ContainerInjectionInterface * The entity manager. */ public function __construct(EntityTypeManagerInterface $entity_manager) { - $this->entityManager = $entity_manager; + $this->entityTypeManager = $entity_manager; } /** * {@inheritdoc} */ public static function create(ContainerInterface $container) { - return new static($container->get('entity.manager')); + return new static($container->get('entity_type.manager')); } /** @@ -47,7 +47,7 @@ class AutoEntityLabelPermissionController implements ContainerInjectionInterface public function autoEntityLabelPermissions() { $permissions = []; - foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) { + foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) { // Create a permission for each entity type to manage the entity // labels. if ($entity_type->hasLinkTemplate('auto-label') && $entity_type->hasKey('label')) { diff --git a/src/Controller/AutoEntityLabelController.php b/src/Controller/AutoEntityLabelController.php index 195a5ad..4516990 100644 --- a/src/Controller/AutoEntityLabelController.php +++ b/src/Controller/AutoEntityLabelController.php @@ -33,8 +33,8 @@ class AutoEntityLabelController extends ControllerBase { * {@inheritdoc} */ public static function create(ContainerInterface $container) { - $entity_manager = $container->get('entity.manager'); - return new static($entity_manager->getStorage('node_type')); + $entityTypeManager = $container->get('entity_type.manager'); + return new static($entityTypeManager->getStorage('node_type')); } /** diff --git a/src/Form/AutoEntityLabelForm.php b/src/Form/AutoEntityLabelForm.php index 62e285e..5ef2ec1 100644 --- a/src/Form/AutoEntityLabelForm.php +++ b/src/Form/AutoEntityLabelForm.php @@ -38,7 +38,7 @@ class AutoEntityLabelForm extends ConfigFormBase { */ protected $configFactory; - protected $entityManager; + protected $entityTypeManager; // @codingStandardsIgnoreLine protected $route_match; @@ -94,7 +94,7 @@ class AutoEntityLabelForm extends ConfigFormBase { */ public function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_manager, RouteMatchInterface $route_match, ModuleHandlerInterface $moduleHandler, AccountInterface $user) { parent::__construct($config_factory); - $this->entityManager = $entity_manager; + $this->entityTypeManager = $entity_manager; $this->route_match = $route_match; $route_options = $this->route_match->getRouteObject()->getOptions(); $array_keys = array_keys($route_options['parameters']); @@ -135,7 +135,7 @@ class AutoEntityLabelForm extends ConfigFormBase { public static function create(ContainerInterface $container) { return new static ( $container->get('config.factory'), - $container->get('entity.manager'), + $container->get('entity_type.manager'), $container->get('current_route_match'), $container->get('module_handler'), $container->get('current_user') @@ -257,7 +257,7 @@ class AutoEntityLabelForm extends ConfigFormBase { } /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */ - $storage = $this->entityManager->getStorage($this->entityType); + $storage = $this->entityTypeManager->getStorage($this->entityType); /** @var \Drupal\Core\Config\Entity\ConfigEntityType $entity_type */ $entity_type = $storage->getEntityType(); $prefix = $entity_type->getConfigPrefix(); diff --git a/src/Plugin/Derivative/AutoEntityLabelConfigTask.php b/src/Plugin/Derivative/AutoEntityLabelConfigTask.php index 2238e9d..147d209 100644 --- a/src/Plugin/Derivative/AutoEntityLabelConfigTask.php +++ b/src/Plugin/Derivative/AutoEntityLabelConfigTask.php @@ -17,7 +17,7 @@ class AutoEntityLabelConfigTask extends DeriverBase implements ContainerDeriverI * * @var \Drupal\Core\Entity\EntityTypeManagerInterface */ - protected $entityManager; + protected $entityTypeManager; /** * Creates an FieldUiLocalTask object. @@ -26,7 +26,7 @@ class AutoEntityLabelConfigTask extends DeriverBase implements ContainerDeriverI * The entity manager. */ public function __construct(EntityTypeManagerInterface $entity_manager) { - $this->entityManager = $entity_manager; + $this->entityTypeManager = $entity_manager; } /** @@ -34,7 +34,7 @@ class AutoEntityLabelConfigTask extends DeriverBase implements ContainerDeriverI */ public static function create(ContainerInterface $container, $base_plugin_id) { return new static( - $container->get('entity.manager') + $container->get('entity_type.manager') ); } @@ -44,7 +44,7 @@ class AutoEntityLabelConfigTask extends DeriverBase implements ContainerDeriverI public function getDerivativeDefinitions($base_plugin_definition) { $this->derivatives = []; - foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) { + foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) { // Special handling of Taxonomy. See https://www.drupal.org/node/2822546 if ($entity_type_id == "taxonomy_vocabulary") { $base_route = "entity.{$entity_type_id}.overview_form"; diff --git a/src/Routing/RouteEnhancer.php b/src/Routing/RouteEnhancer.php index 977af0b..c4b2237 100644 --- a/src/Routing/RouteEnhancer.php +++ b/src/Routing/RouteEnhancer.php @@ -20,7 +20,7 @@ class RouteEnhancer implements RouteEnhancerInterface { * * @var \Drupal\Core\Entity\EntityTypeManagerInterface */ - protected $entityManager; + protected $entityTypeManager; /** * Constructs a RouteEnhancer object. @@ -29,14 +29,14 @@ class RouteEnhancer implements RouteEnhancerInterface { * The entity manager. */ public function __construct(EntityTypeManagerInterface $entity_manager) { - $this->entityManager = $entity_manager; + $this->entityTypeManager = $entity_manager; } /** * {@inheritdoc} */ public function enhance(array $defaults, Request $request) { - if (($bundle = $this->entityManager->getDefinition($defaults['entity_type_id'])->getBundleEntityType()) && isset($defaults[$bundle])) { + if (($bundle = $this->entityTypeManager->getDefinition($defaults['entity_type_id'])->getBundleEntityType()) && isset($defaults[$bundle])) { // Auto Entity Label forms only need the actual name of the bundle they're // dealing with, not an upcasted entity object, so provide a simple way // for them to get it. -- 2.16.1