diff core/modules/field_ui/src/Routing/FieldUiRouteEnhancer.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1

--- a/core/modules/field_ui/src/Routing/FieldUiRouteEnhancer.php	Thu Feb 28 13:11:55 2019 +0000
+++ b/core/modules/field_ui/src/Routing/FieldUiRouteEnhancer.php	Thu May 09 15:34:47 2019 +0100
@@ -2,9 +2,10 @@
 
 namespace Drupal\field_ui\Routing;
 
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Routing\EnhancerInterface;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
@@ -12,22 +13,28 @@
  * Enhances Field UI routes by adding proper information about the bundle name.
  */
 class FieldUiRouteEnhancer implements EnhancerInterface {
+  use DeprecatedServicePropertyTrait;
 
   /**
-   * The entity manager.
+   * {@inheritdoc}
+   */
+  protected $deprecatedProperties = ['entityManager' => 'entity.manager'];
+
+  /**
+   * The entity type manager service.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
 
   /**
    * Constructs a FieldUiRouteEnhancer object.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager service.
    */
-  public function __construct(EntityManagerInterface $entity_manager) {
-    $this->entityManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
@@ -37,8 +44,7 @@
     if (!$this->applies($defaults[RouteObjectInterface::ROUTE_OBJECT])) {
       return $defaults;
     }
-
-    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])) {
       // Field UI 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.