AC-3525: Customer Product Review fix

 * Fix product review

Author: pawan-adobe-security

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

@@ -8,29 +8,23 @@
 
 namespace Magento\Cms\Controller\Noroute;
 
-use Magento\Cms\Helper\Page;
-use Magento\Framework\App\Action\Context;
-use Magento\Framework\Controller\Result\ForwardFactory;
-use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\Controller\Result\Forward;
-
 /**
  * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var ForwardFactory
+     * @var \Magento\Framework\Controller\Result\ForwardFactory
      */
-    protected ForwardFactory $resultForwardFactory;
+    protected \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory;
 
     /**
-     * @param Context $context
-     * @param ForwardFactory $resultForwardFactory
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      */
     public function __construct(
-        Context $context,
-        ForwardFactory $resultForwardFactory
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
     ) {
         $this->resultForwardFactory = $resultForwardFactory;
         parent::__construct($context);
@@ -39,27 +33,27 @@ public function __construct(
     /**
      * Render CMS 404 Not found page
      *
-     * @return ResultInterface|Forward
+     * @return \Magento\Framework\Controller\ResultInterface
      */
-    public function execute(): ResultInterface|Forward
+    public function execute()
     {
         $pageId = $this->_objectManager->get(
             \Magento\Framework\App\Config\ScopeConfigInterface::class,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->getValue(
-            Page::XML_PATH_NO_ROUTE_PAGE,
+            \Magento\Cms\Helper\Page::XML_PATH_NO_ROUTE_PAGE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
-        /** @var Page $pageHelper */
-        $pageHelper = $this->_objectManager->get(Page::class);
+        /** @var \Magento\Cms\Helper\Page $pageHelper */
+        $pageHelper = $this->_objectManager->get(\Magento\Cms\Helper\Page::class);
         $resultPage = $pageHelper->prepareResultPage($this, $pageId);
         if ($resultPage) {
             $resultPage->setStatusHeader(404, '1.1', 'Not Found');
             $resultPage->setHeader('Status', '404 File not found');
             $resultPage->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0', true);
             return $resultPage;
         } else {
-            /** @var Forward $resultForward */
+            /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
             $resultForward = $this->resultForwardFactory->create();
             $resultForward->setController('index');
             $resultForward->forward('defaultNoRoute');