MC-41018: Minor changes in CMS page validation

Author: OlgaVasyltsun

app/code/Magento/Cms/Model/Page/CustomLayout/CustomLayoutValidator.php

@@ -9,8 +9,11 @@
 
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Message\ManagerInterface;
-use Magento\Cms\Model\PageFactory;
+use Magento\Cms\Model\PageRepository;
 
+/**
+ * Class for layout update validation
+ */
 class CustomLayoutValidator
 {
     /**
@@ -25,11 +28,11 @@ class CustomLayoutValidator
 
     /**
      * CustomLayoutValidator constructor.
-     * @param PageFactory $pageFactory
+     * @param PageRepository $pageFactory
      * @param ManagerInterface $messageManager
      */
     public function __construct(
-        PageFactory $pageFactory,
+        PageRepository $pageFactory,
         ManagerInterface $messageManager
     ) {
         $this->pageFactory = $pageFactory;
@@ -43,18 +46,23 @@ public function __construct(
      * @return bool
      * @throws LocalizedException
      */
-    public function validate(array $data)
+    public function validate(array $data) : bool
     {
         $layoutUpdate = isset($data['layout_update_xml']) ? $data['layout_update_xml'] : null;
         $customLayoutUpdate = isset($data['custom_layout_update_xml']) ? $data['custom_layout_update_xml'] : null;
-        $page = $this->pageFactory->create();
-        $page->load($data['page_id']);
-        $oldLayoutUpdate = $page->getId() ? $page->getLayoutUpdateXml() : null;
-        $olCustomLayoutUpdate = $page->getId() ? $page->getCustomLayoutUpdateXml() : null;
-        if ($layoutUpdate && $oldLayoutUpdate !== $layoutUpdate
-            || $customLayoutUpdate && $olCustomLayoutUpdate !== $customLayoutUpdate
-        ) {
-            throw new LocalizedException(__('Custom layout update text cannot be changed, only removed'));
+        if (isset($data['page_id'])) {
+            $page = $this->pageFactory->getById($data['page_id']);
+            $oldLayoutUpdate = $page->getId() ? $page->getLayoutUpdateXml() : null;
+            $oldCustomLayoutUpdate = $page->getId() ? $page->getCustomLayoutUpdateXml() : null;
+            if ($layoutUpdate && $oldLayoutUpdate !== $layoutUpdate
+                || $customLayoutUpdate && $oldCustomLayoutUpdate !== $customLayoutUpdate
+            ) {
+                throw new LocalizedException(__('Custom layout update text cannot be changed, only removed'));
+            }
+        } else {
+            if ($layoutUpdate || $customLayoutUpdate) {
+                throw new LocalizedException(__('Custom layout update text cannot be changed, only removed'));
+            }
         }
         return true;
     }

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php

@@ -65,7 +65,10 @@ class PageDesignTest extends AbstractBackendController
      */
     private $pagesToDelete = [];
 
-    private $postDaraProcessor;
+    /**
+     * @var PostDataProcessor
+     */
+    private $postDataProcessor;
 
     /**
      * @inheritDoc
@@ -84,7 +87,7 @@ protected function setUp(): void
         $this->pageRetriever = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
         $this->scopeConfig = Bootstrap::getObjectManager()->get(ScopeConfigInterface::class);
         $this->pagesToDelete = [];
-        $this->postDaraProcessor = Bootstrap::getObjectManager()->get(PostDataProcessor::class);
+        $this->postDataProcessor = Bootstrap::getObjectManager()->get(PostDataProcessor::class);
     }
 
     /**
@@ -315,6 +318,6 @@ public function testSaveWithCustomLayoutUpdate(): void
             PageInterface::CUSTOM_LAYOUT_UPDATE_XML => '<container />',
             PageInterface::LAYOUT_UPDATE_XML => '<container />',
         ];
-        $this->assertFalse($this->postDaraProcessor->validate($requestData));
+        $this->assertFalse($this->postDataProcessor->validate($requestData));
     }
 }