diff -u b/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php --- b/core/lib/Drupal/Core/Entity/Entity.php +++ b/core/lib/Drupal/Core/Entity/Entity.php @@ -70,21 +70,27 @@ } /** - * {@inheritdoc} + * Gets the entity manager. + * + * @return \Drupal\Core\Entity\EntityManagerInterface */ protected function entityManager() { return \Drupal::entityManager(); } /** - * {@inheritdoc} + * Gets the language manager. + * + * @return \Drupal\Core\Language\LanguageManagerInterface */ protected function languageManager() { return \Drupal::languageManager(); } /** - * {@inheritdoc} + * Gets the UUID generator. + * + * @return \Drupal\Component\Uuid\UuidInterface */ protected function uuidGenerator() { return \Drupal::service('uuid'); @@ -286,11 +292,6 @@ /** * {@inheritdoc} - * - * Returns a list of URI relationships supported by this entity. - * - * @return array - * An array of link relationships supported by this entity. */ public function uriRelationships() { return array_keys($this->linkTemplates()); @@ -471,10 +472,6 @@ /** * {@inheritdoc} - * - * @return static[] - * An array of entity objects indexed by their IDs. Returns an empty array - * if no matching entities are found. */ public static function loadMultiple(array $ids = NULL) { $entity_manager = \Drupal::entityManager(); @@ -483,9 +480,6 @@ /** * {@inheritdoc} - * - * @return static - * The entity object. */ public static function create(array $values = array()) { $entity_manager = \Drupal::entityManager(); only in patch2: unchanged: --- a/core/lib/Drupal/Core/Entity/EntityInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityInterface.php @@ -187,7 +187,7 @@ public function uriRelationships(); * @param mixed $id * The id of the entity to load. * - * @return static + * @return static|null * The entity object or NULL if there is no entity with the given ID. */ public static function load($id);