MC-35478: Bug with Company Structure Page

Author: yelahin-serhiy

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

@@ -11,7 +11,6 @@
 use Magento\Cms\Api\Data\PageInterfaceFactory;
 use Magento\Cms\Api\Data\PageSearchResultsInterface;
 use Magento\Cms\Api\PageRepositoryInterface;
-use Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor;
 use Magento\Cms\Model\Page\IdentityMap;
 use Magento\Cms\Model\ResourceModel\Page as ResourcePage;
 use Magento\Cms\Model\ResourceModel\Page\CollectionFactory as PageCollectionFactory;
@@ -123,8 +122,10 @@ public function __construct(
         $this->dataObjectProcessor = $dataObjectProcessor;
         $this->storeManager = $storeManager;
         $this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
-        $this->identityMap = $identityMap ?? ObjectManager::getInstance()->get(IdentityMap::class);
-        $this->routeConfig = $routeConfig ?? ObjectManager::getInstance()->get(Config::class);
+        $this->identityMap = $identityMap ?? ObjectManager::getInstance()
+                ->get(IdentityMap::class);
+        $this->routeConfig = $routeConfig ?? ObjectManager::getInstance()
+                ->get(Config::class);
     }
 
     /**
@@ -260,9 +261,9 @@ public function deleteById($pageId)
     private function getCollectionProcessor()
     {
         if (!$this->collectionProcessor) {
-            $this->collectionProcessor = ObjectManager::getInstance()->get(
-                PageCollectionProcessor::class
-            );
+            // phpstan:ignore "Class Magento\Cms\Model\PageCollectionProcessor not found."
+            $this->collectionProcessor = ObjectManager::getInstance()
+                ->get(PageCollectionProcessor::class);
         }
         return $this->collectionProcessor;
     }

dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php

@@ -32,10 +32,11 @@ class PageRepositoryTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->repo = Bootstrap::getObjectManager()->get(PageRepositoryInterface::class);
-        $this->retriever = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->repo = $objectManager->get(PageRepositoryInterface::class);
+        $this->retriever = $objectManager->get(GetPageByIdentifierInterface::class);
     }
 
     /**
@@ -48,7 +49,7 @@ protected function setUp()
     public function testSaveUpdateXml(): void
     {
         $page = $this->retriever->execute('test_custom_layout_page_1', 0);
-        $page->setTitle($page->getTitle() .'TEST');
+        $page->setTitle($page->getTitle() . 'TEST');
 
         //Is successfully saved without changes to the custom layout xml.
         $page = $this->repo->save($page);
@@ -80,4 +81,19 @@ public function testSaveUpdateXml(): void
         $this->assertEmpty($page->getCustomLayoutUpdateXml());
         $this->assertEmpty($page->getLayoutUpdateXml());
     }
+
+    /**
+     * Verifies that cms page with identifier which duplicates existed route shouldn't be saved
+     *
+     * @return void
+     * @throws \Throwable
+     * @magentoDataFixture Magento/Cms/_files/pages.php
+     */
+    public function testSaveWithRouteDuplicate(): void
+    {
+        $page = $this->retriever->execute('page100', 0);
+        $page->setIdentifier('customer');
+        $this->expectException(CouldNotSaveException::class);
+        $this->repo->save($page);
+    }
 }