diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php index de931a5..416d802 100644 --- a/core/lib/Drupal.php +++ b/core/lib/Drupal.php @@ -253,9 +253,11 @@ public static function currentUser() { * @return \Drupal\Core\Entity\EntityManagerInterface * The entity manager service. * - * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0. - * Most of the time \Drupal::entityTypeManager() is supposed to be used - * instead. + * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. + * Use \Drupal::entityTypeManager() instead in most cases. If the needed + * method is not on \Drupal\Core\Entity\EntityTypeManagerInterface, see the + * deprecated \Drupal\Core\Entity\EntityManager to find the + * correct interface or service. */ public static function entityManager() { return static::getContainer()->get('entity.manager'); diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php index 0798823..3ea549d 100644 --- a/core/lib/Drupal/Core/Entity/Entity.php +++ b/core/lib/Drupal/Core/Entity/Entity.php @@ -73,9 +73,11 @@ public function __construct(array $values, $entity_type) { * * @return \Drupal\Core\Entity\EntityManagerInterface * - * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0. - * Most of the time static::entityTypeManager() is supposed to be used - * instead. + * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. + * Use \Drupal::entityTypeManager() instead in most cases. If the needed + * method is not on \Drupal\Core\Entity\EntityTypeManagerInterface, see the + * deprecated \Drupal\Core\Entity\EntityManager to find the + * correct interface or service. */ protected function entityManager() { return \Drupal::entityManager();