From 6de23686f13d7a3e3a3af8ed3c9184938df9320e Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Mon, 21 Mar 2016 10:16:05 +0900
Subject: [PATCH] Issue #2625138 by almaudoh, Oleksiy:
 EntityRepository::loadEntityByUuid() implementation does not match
 EntityRepositoryInterface::loadEntityByUuid() @return documentation

---
 core/lib/Drupal/Core/Entity/EntityRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/Drupal/Core/Entity/EntityRepository.php b/core/lib/Drupal/Core/Entity/EntityRepository.php
index 58381d1a2691..2d83a98a250e 100644
--- a/core/lib/Drupal/Core/Entity/EntityRepository.php
+++ b/core/lib/Drupal/Core/Entity/EntityRepository.php
@@ -56,7 +56,7 @@ public function loadEntityByUuid($entity_type_id, $uuid) {
 
     $entities = $this->entityTypeManager->getStorage($entity_type_id)->loadByProperties([$uuid_key => $uuid]);
 
-    return reset($entities);
+    return ($entities) ? reset($entities) : NULL;
   }
 
   /**
-- 
GitLab