MAGETWO-52215: Cms pages isn't synchronized with core_config_data

Author: shiftedreality

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

@@ -11,6 +11,7 @@
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Cms\Helper\Page as PageHelper;
 
 /**
  * Cms Page Model
@@ -520,16 +521,16 @@ public function beforeSave()
     {
         $originalIdentifier = $this->getOrigData('identifier');
         $currentIdentifier = $this->getIdentifier();
-        $scopeConfigIdentifier = $this->getScopeConfig()->getValue(
-            \Magento\Cms\Helper\Page::XML_PATH_NO_ROUTE_PAGE
-        );
-
-        if (
-            $this->getId()
-            && $originalIdentifier !== $currentIdentifier
-            && $originalIdentifier === $scopeConfigIdentifier
-        ) {
-            throw new LocalizedException(__('This identifier is reserved for 404 error page in configuration.'));
+
+        if (!$this->getId() || $originalIdentifier === $currentIdentifier) {
+            return parent::beforeSave();
+        }
+
+        switch ($originalIdentifier) {
+            case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_NO_ROUTE_PAGE):
+                throw new LocalizedException(__('This identifier is reserved for 404 error page in configuration.'));
+            case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_HOME_PAGE):
+                throw new LocalizedException(__('This identifier is reserved for home page in configuration.'));
         }
 
         return parent::beforeSave();

app/code/Magento/Cms/Test/Unit/Model/PageTest.php

@@ -129,11 +129,42 @@ public function testBeforeSave404Identifier()
 
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
-            ->with(
-                \Magento\Cms\Helper\Page::XML_PATH_NO_ROUTE_PAGE,
-                ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-                null
-            )->willReturn('no-route');
+            ->willReturnMap(
+                [
+                    [
+                        \Magento\Cms\Helper\Page::XML_PATH_NO_ROUTE_PAGE,
+                        ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                        null,
+                        'no-route'
+                    ]
+                ]
+            );
+
+        $this->model->beforeSave();
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage This identifier is reserved for home page in configuration.
+     */
+    public function testBeforeSaveHomeIdentifier()
+    {
+        $this->model->setId(1);
+        $this->model->setOrigData('identifier', 'home');
+        $this->model->setIdentifier('home2');
+
+        $this->scopeConfigMock->expects($this->atLeastOnce())
+            ->method('getValue')
+            ->willReturnMap(
+                [
+                    [
+                        \Magento\Cms\Helper\Page::XML_PATH_HOME_PAGE,
+                        ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                        null,
+                        'home'
+                    ]
+                ]
+            );
 
         $this->model->beforeSave();
     }