MC-34254: If disable module PageBuilder then in the product page, page white

Author: viktorpetryk

lib/internal/Magento/Framework/View/Page/Builder.php

@@ -50,8 +50,8 @@ public function __construct(
         parent::__construct($layout, $request, $eventManager);
         $this->pageConfig = $pageConfig;
         $this->pageLayoutReader = $pageLayoutReader;
-        $this->pageConfig->setBuilder($this);
         $this->pageLayoutBuilder = $pageLayoutBuilder ?? ObjectManager::getInstance()->get(BuilderInterface::class);
+        $this->pageConfig->setBuilder($this);
     }
 
     /**

lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php

@@ -8,9 +8,11 @@
 namespace Magento\Framework\View\Test\Unit\Page;
 
 use Magento\Framework\View\Layout\Reader\Context;
+use Magento\Framework\View\Model\PageLayout\Config\BuilderInterface;
 use Magento\Framework\View\Page\Builder;
 use Magento\Framework\View\Page\Config;
 use Magento\Framework\View\Page\Layout\Reader;
+use Magento\Framework\View\PageLayout\Config as PageLayoutConfig;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
@@ -22,7 +24,7 @@ class BuilderTest extends \Magento\Framework\View\Test\Unit\Layout\BuilderTest
 
     /**
      * @param array $arguments
-     * @return \Magento\Framework\View\Page\Builder
+     * @return \Magento\Framework\View\Layout\Builder
      */
     protected function getBuilder($arguments)
     {
@@ -39,6 +41,15 @@ protected function getBuilder($arguments)
 
         $arguments['pageLayoutReader'] = $this->createMock(Reader::class);
         $arguments['pageLayoutReader']->expects($this->once())->method('read')->with($readerContext, 'test_layout');
+        $pageLayoutConfig = $this->createMock(PageLayoutConfig::class);
+        $arguments['pageLayoutBuilder'] = $this->getMockForAbstractClass(BuilderInterface::class);
+        $arguments['pageLayoutBuilder']->expects($this->once())
+            ->method('getPageLayoutsConfig')
+            ->willReturn($pageLayoutConfig);
+        $pageLayoutConfig->expects($this->once())
+            ->method('hasPageLayout')
+            ->with('test_layout')
+            ->willReturn(true);
 
         return parent::getBuilder($arguments);
     }