Pull merge.

[yaffs-website] / web / core / lib / Drupal / Core / Entity / EntityManager.php

diff --git a/web/core/lib/Drupal/Core/Entity/EntityManager.php b/web/core/lib/Drupal/Core/Entity/EntityManager.php
index 6f2ce7672ebed9183db9b3fc1921f1dd1ccc9602..bc03175ab5d04022213a66b0e78f9cf1ac82c2aa 100644 (file)
--- a/web/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -303,7 +303,7 @@ class EntityManager implements EntityManagerInterface, ContainerAwareInterface {
    * {@inheritdoc}
    *
    * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
-   *   Use \Drupal\Core\Entity\EntityTypeBundleManagerInterface::clearCachedBundles()
+   *   Use \Drupal\Core\Entity\EntityTypeBundleInfoInterface::clearCachedBundles()
    *   instead.
    *
    * @see https://www.drupal.org/node/2549139
@@ -316,20 +316,20 @@ class EntityManager implements EntityManagerInterface, ContainerAwareInterface {
    * {@inheritdoc}
    *
    * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
-   *   Use \Drupal\Core\Entity\EntityTypeBundleManagerInterface::getBundleInfo()
+   *   Use \Drupal\Core\Entity\EntityTypeBundleInfoInterface::getBundleInfo()
    *   instead.
    *
    * @see https://www.drupal.org/node/2549139
    */
-  public function getBundleInfo($entity_type) {
-    return $this->container->get('entity_type.bundle.info')->getBundleInfo($entity_type);
+  public function getBundleInfo($entity_type_id) {
+    return $this->container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id);
   }
 
   /**
    * {@inheritdoc}
    *
    * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
-   *   Use \Drupal\Core\Entity\EntityTypeBundleManagerInterface::getAllBundleInfo()
+   *   Use \Drupal\Core\Entity\EntityTypeBundleInfoInterface::getAllBundleInfo()
    *   instead.
    *
    * @see https://www.drupal.org/node/2549139