Skip to content

Commit b91e690

Browse files
AC-3525: Customer Product Review fix
* Fix product review
1 parent 28c1f28 commit b91e690

File tree

1 file changed

+21
-12
lines changed
  • app/code/Magento/Cms/Controller/Noroute

1 file changed

+21
-12
lines changed

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

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,33 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
declare(strict_types=1);
8+
79
namespace Magento\Cms\Controller\Noroute;
810

11+
use Magento\Cms\Helper\Page;
12+
use Magento\Framework\App\Action\Context;
13+
use Magento\Framework\Controller\Result\ForwardFactory;
14+
use Magento\Framework\Controller\ResultInterface;
15+
use Magento\Framework\Controller\Result\Forward;
16+
917
/**
1018
* @SuppressWarnings(PHPMD.AllPurposeAction)
1119
*/
1220
class Index extends \Magento\Framework\App\Action\Action
1321
{
1422
/**
15-
* @var \Magento\Framework\Controller\Result\ForwardFactory
23+
* @var ForwardFactory
1624
*/
17-
protected $resultForwardFactory;
25+
protected ForwardFactory $resultForwardFactory;
1826

1927
/**
20-
* @param \Magento\Framework\App\Action\Context $context
21-
* @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
28+
* @param Context $context
29+
* @param ForwardFactory $resultForwardFactory
2230
*/
2331
public function __construct(
24-
\Magento\Framework\App\Action\Context $context,
25-
\Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
32+
Context $context,
33+
ForwardFactory $resultForwardFactory
2634
) {
2735
$this->resultForwardFactory = $resultForwardFactory;
2836
parent::__construct($context);
@@ -31,26 +39,27 @@ public function __construct(
3139
/**
3240
* Render CMS 404 Not found page
3341
*
34-
* @return \Magento\Framework\Controller\ResultInterface
42+
* @return ResultInterface|Forward
3543
*/
36-
public function execute()
44+
public function execute(): ResultInterface|Forward
3745
{
3846
$pageId = $this->_objectManager->get(
3947
\Magento\Framework\App\Config\ScopeConfigInterface::class,
4048
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
4149
)->getValue(
42-
\Magento\Cms\Helper\Page::XML_PATH_NO_ROUTE_PAGE,
50+
Page::XML_PATH_NO_ROUTE_PAGE,
4351
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
4452
);
45-
/** @var \Magento\Cms\Helper\Page $pageHelper */
46-
$pageHelper = $this->_objectManager->get(\Magento\Cms\Helper\Page::class);
53+
/** @var Page $pageHelper */
54+
$pageHelper = $this->_objectManager->get(Page::class);
4755
$resultPage = $pageHelper->prepareResultPage($this, $pageId);
4856
if ($resultPage) {
4957
$resultPage->setStatusHeader(404, '1.1', 'Not Found');
5058
$resultPage->setHeader('Status', '404 File not found');
59+
$resultPage->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0', true);
5160
return $resultPage;
5261
} else {
53-
/** @var \Magento\Framework\Controller\Result\Forward $resultForward */
62+
/** @var Forward $resultForward */
5463
$resultForward = $this->resultForwardFactory->create();
5564
$resultForward->setController('index');
5665
$resultForward->forward('defaultNoRoute');

0 commit comments

Comments
 (0)