From 3041fc6e29936050d07c487d9134246de78b8c99 Mon Sep 17 00:00:00 2001
From: larsroettig <l.roettig@techdivision.com>
Date: Thu, 3 Dec 2020 18:19:10 +0100
Subject: [PATCH] #30936: Code Review Fixes

---
 .../Magento/Cms/Model/Page/DataProvider.php   | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Cms/Model/Page/DataProvider.php b/app/code/Magento/Cms/Model/Page/DataProvider.php
index 24b24099d0e7a..ea46f8d14d1ac 100644
--- a/app/code/Magento/Cms/Model/Page/DataProvider.php
+++ b/app/code/Magento/Cms/Model/Page/DataProvider.php
@@ -28,8 +28,12 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
      * @var array
      */
     protected $loadedData;
-    /** @var PageRepositoryInterface */
+
+    /**
+     * @var PageRepositoryInterface
+     */
     private $pageRepository;
+
     /**
      * @var AuthorizationInterface
      */
@@ -44,6 +48,7 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
      * @var CustomLayoutManagerInterface
      */
     private $customLayoutManager;
+
     /**
      * @var null|array
      */
@@ -111,8 +116,9 @@ public function getData(): array
             return $this->loadedData;
         }
 
-        $page = $this->getCurrentPage();
-        if ($page === null) {
+        try {
+            $page = $this->getCurrentPage();
+        } catch (LocalizedException $exception) {
             return [];
         }
 
@@ -141,29 +147,26 @@ public function getData(): array
 
     /**
      * Loads the current page by current request params.
-     * @return Page|null
+     * @return Page
+     * @throws LocalizedException
      */
-    private function getCurrentPage(): ?Page
+    private function getCurrentPage(): Page
     {
         if (!$this->getRequestFieldName()) {
-            return null;
+            throw new LocalizedException(__('RequestFieldName is not spefied'));
         }
 
         $pageId = (int)$this->request->getParam($this->getRequestFieldName());
         if ($pageId === 0) {
-            return null;
+            throw new LocalizedException(__('Page size must be given'));
         }
 
         if (isset($this->loadedPages[$pageId])) {
             return $this->loadedPages[$pageId];
         }
 
-        try {
-            $this->loadedPages[$pageId] = $this->pageRepository->getById($pageId);
-            return $this->loadedPages[$pageId];
-        } catch (LocalizedException $exception) {
-            return null;
-        }
+        $this->loadedPages[$pageId] = $this->pageRepository->getById($pageId);
+        return $this->loadedPages[$pageId];
     }
 
     /**
@@ -199,16 +202,19 @@ public function getMeta(): array
 
         //List of custom layout files available for current page.
         $options = [['label' => 'No update', 'value' => '_no_update_']];
-        if ($page = $this->getCurrentPage()) {
-            //We must have a specific page selected.
-            //If custom layout XML is set then displaying this special option.
+
+        try {
+            $page = $this->getCurrentPage();
             if ($page->getCustomLayoutUpdateXml() || $page->getLayoutUpdateXml()) {
                 $options[] = ['label' => 'Use existing layout update XML', 'value' => '_existing_'];
             }
             foreach ($this->customLayoutManager->fetchAvailableFiles($page) as $layoutFile) {
                 $options[] = ['label' => $layoutFile, 'value' => $layoutFile];
             }
+        } catch (LocalizedException $exception) {
+
         }
+
         $customLayoutMeta = [
             'design' => [
                 'children' => [