Merge branch 'AC-3525' of github.com:magento-cia/magento2ce into cia-2.4.6-bugfixes-07132022

Author: admanesachin

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

@@ -4,17 +4,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Cms\Controller\Noroute;
 
+use Magento\Framework\Controller\Result\ForwardFactory;
+
 /**
  * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var \Magento\Framework\Controller\Result\ForwardFactory
+     * @var ForwardFactory
      */
-    protected $resultForwardFactory;
+    protected ForwardFactory $resultForwardFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
@@ -48,6 +52,7 @@ public function execute()
         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 \Magento\Framework\Controller\Result\Forward $resultForward */

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

@@ -29,17 +29,17 @@ class IndexTest extends TestCase
     /**
      * @var Index
      */
-    protected $_controller;
+    protected Index $_controller;
 
     /**
      * @var MockObject
      */
-    protected $_cmsHelperMock;
+    protected MockObject $_cmsHelperMock;
 
     /**
      * @var MockObject
      */
-    protected $_requestMock;
+    protected MockObject $_requestMock;
 
     /**
      * @var ForwardFactory|MockObject
@@ -119,10 +119,14 @@ public function testExecuteResultPage(): void
             ->method('setStatusHeader')
             ->with(404, '1.1', 'Not Found')
             ->willReturn($this->resultPageMock);
+
         $this->resultPageMock
             ->method('setHeader')
-            ->with('Status', '404 File not found')
-            ->willReturn($this->resultPageMock);
+            ->withConsecutive(
+                ['Status', '404 File not found'],
+                ['Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0']
+            )->willReturn($this->resultPageMock);
+
         $this->_cmsHelperMock->expects(
             $this->once()
         )->method(