diff core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1

--- a/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php	Thu Feb 28 13:11:55 2019 +0000
+++ b/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php	Thu May 09 15:34:47 2019 +0100
@@ -3,8 +3,9 @@
 namespace Drupal\content_translation\Access;
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
@@ -16,13 +17,19 @@
  * Access check for entity translation CRUD operation.
  */
 class ContentTranslationManageAccessCheck implements AccessInterface {
+  use DeprecatedServicePropertyTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $deprecatedProperties = ['entityManager' => 'entity.manager'];
 
   /**
    * The entity type manager.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
 
   /**
    * The language manager.
@@ -34,13 +41,13 @@
   /**
    * Constructs a ContentTranslationManageAccessCheck object.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
    */
-  public function __construct(EntityManagerInterface $manager, LanguageManagerInterface $language_manager) {
-    $this->entityManager = $manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, LanguageManagerInterface $language_manager) {
+    $this->entityTypeManager = $entity_type_manager;
     $this->languageManager = $language_manager;
   }
 
@@ -71,7 +78,7 @@
     if ($entity = $route_match->getParameter($entity_type_id)) {
       $operation = $route->getRequirement('_access_content_translation_manage');
       $language = $this->languageManager->getLanguage($language) ?: $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT);
-      $entity_type = $this->entityManager->getDefinition($entity_type_id);
+      $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
 
       if (in_array($operation, ['update', 'delete'])) {
         // Translation operations cannot be performed on the default
@@ -94,7 +101,7 @@
       switch ($operation) {
         case 'create':
           /* @var \Drupal\content_translation\ContentTranslationHandlerInterface $handler */
-          $handler = $this->entityManager->getHandler($entity->getEntityTypeId(), 'translation');
+          $handler = $this->entityTypeManager->getHandler($entity->getEntityTypeId(), 'translation');
           $translations = $entity->getTranslationLanguages();
           $languages = $this->languageManager->getLanguages();
           $source_language = $this->languageManager->getLanguage($source) ?: $entity->language();
@@ -138,7 +145,7 @@
    */
   protected function checkAccess(ContentEntityInterface $entity, LanguageInterface $language, $operation) {
     /* @var \Drupal\content_translation\ContentTranslationHandlerInterface $handler */
-    $handler = $this->entityManager->getHandler($entity->getEntityTypeId(), 'translation');
+    $handler = $this->entityTypeManager->getHandler($entity->getEntityTypeId(), 'translation');
     $translations = $entity->getTranslationLanguages();
     $languages = $this->languageManager->getLanguages();
     $has_translation = isset($languages[$language->getId()])