ENGCOM-2694: [Forwardport] Update CMS Page Index #17420

Author: Stanislav Idolov

app/code/Magento/Cms/Controller/Index/Index.php

@@ -1,48 +1,73 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Index;
 
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Controller\Result\Forward;
+use Magento\Framework\Controller\Result\ForwardFactory;
+use Magento\Framework\View\Result\Page as ResultPage;
+use Magento\Cms\Helper\Page;
+use Magento\Store\Model\ScopeInterface;
+
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var \Magento\Framework\Controller\Result\ForwardFactory
+     * @var ForwardFactory
      */
     protected $resultForwardFactory;
 
     /**
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var Page
+     */
+    private $page;
+
+    /**
+     * Index constructor.
+     *
+     * @param Context $context
+     * @param ForwardFactory $resultForwardFactory
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @param Page|null $page
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+        Context $context,
+        ForwardFactory $resultForwardFactory,
+        ScopeConfigInterface $scopeConfig = null,
+        Page $page = null
     ) {
         $this->resultForwardFactory = $resultForwardFactory;
+        $this->scopeConfig = $scopeConfig ? : ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->page = $page ? : ObjectManager::getInstance()->get(Page::class);
         parent::__construct($context);
     }
 
     /**
      * Renders CMS Home page
      *
      * @param string|null $coreRoute
-     * @return \Magento\Framework\Controller\Result\Forward
+     *
+     * @return bool|ResponseInterface|Forward|ResultInterface|ResultPage
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($coreRoute = null)
     {
-        $pageId = $this->_objectManager->get(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class
-        )->getValue(
-            \Magento\Cms\Helper\Page::XML_PATH_HOME_PAGE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-        $resultPage = $this->_objectManager->get(\Magento\Cms\Helper\Page::class)->prepareResultPage($this, $pageId);
+        $pageId = $this->scopeConfig->getValue(Page::XML_PATH_HOME_PAGE, ScopeInterface::SCOPE_STORE);
+        $resultPage = $this->page->prepareResultPage($this, $pageId);
         if (!$resultPage) {
-            /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+            /** @var Forward $resultForward */
             $resultForward = $this->resultForwardFactory->create();
             $resultForward->forward('defaultIndex');
             return $resultForward;

app/code/Magento/Cms/Test/Unit/Controller/Index/IndexTest.php

@@ -84,7 +84,9 @@ protected function setUp()
                 'response' => $responseMock,
                 'objectManager' => $objectManagerMock,
                 'request' => $this->requestMock,
-                'resultForwardFactory' => $this->forwardFactoryMock
+                'resultForwardFactory' => $this->forwardFactoryMock,
+                'scopeConfig' => $scopeConfigMock,
+                'page' => $this->cmsHelperMock
             ]
         );
     }