diff core/modules/node/src/Access/NodeAddAccessCheck.php @ 18:af1871eacc83

Update to Drupal core 8.7.1

--- a/core/modules/node/src/Access/NodeAddAccessCheck.php	Thu Feb 28 13:21:36 2019 +0000
+++ b/core/modules/node/src/Access/NodeAddAccessCheck.php	Thu May 09 15:33:08 2019 +0100
@@ -3,7 +3,8 @@
 namespace Drupal\node\Access;
 
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\node\NodeTypeInterface;
@@ -14,22 +15,28 @@
  * @ingroup node_access
  */
 class NodeAddAccessCheck implements AccessInterface {
+  use DeprecatedServicePropertyTrait;
 
   /**
-   * The entity manager.
+   * {@inheritdoc}
+   */
+  protected $deprecatedProperties = ['entityManager' => 'entity.manager'];
+
+  /**
+   * The entity type manager.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
 
   /**
    * Constructs a EntityCreateAccessCheck object.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
    */
-  public function __construct(EntityManagerInterface $entity_manager) {
-    $this->entityManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
@@ -45,7 +52,7 @@
    *   A \Drupal\Core\Access\AccessInterface constant value.
    */
   public function access(AccountInterface $account, NodeTypeInterface $node_type = NULL) {
-    $access_control_handler = $this->entityManager->getAccessControlHandler('node');
+    $access_control_handler = $this->entityTypeManager->getAccessControlHandler('node');
     // If checking whether a node of a particular type may be created.
     if ($account->hasPermission('administer content types')) {
       return AccessResult::allowed()->cachePerPermissions();
@@ -54,7 +61,7 @@
       return $access_control_handler->createAccess($node_type->id(), $account, [], TRUE);
     }
     // If checking whether a node of any type may be created.
-    foreach ($this->entityManager->getStorage('node_type')->loadMultiple() as $node_type) {
+    foreach ($this->entityTypeManager->getStorage('node_type')->loadMultiple() as $node_type) {
       if (($access = $access_control_handler->createAccess($node_type->id(), $account, [], TRUE)) && $access->isAllowed()) {
         return $access;
       }