Merge ENGCOM-7479 into 2.4-develop-prs

Author: slavvka

app/code/Magento/Captcha/Controller/Refresh/Index.php

@@ -8,6 +8,8 @@
 namespace Magento\Captcha\Controller\Refresh;
 
 use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\JsonFactory as JsonResultFactory;
@@ -18,7 +20,7 @@
  * Refreshes captcha and returns JSON encoded URL to image (AJAX action)
  * Example: {'imgSrc': 'http://example.com/media/captcha/67842gh187612ngf8s.png'}
  */
-class Index implements HttpPostActionInterface
+class Index extends Action implements HttpPostActionInterface
 {
     /**
      * @var CaptchaHelper
@@ -46,19 +48,22 @@ class Index implements HttpPostActionInterface
     private $jsonResultFactory;
 
     /**
+     * @param Context $context
      * @param RequestInterface $request
      * @param JsonResultFactory $jsonFactory
      * @param CaptchaHelper $captchaHelper
      * @param LayoutInterface $layout
      * @param JsonSerializer $serializer
      */
     public function __construct(
+        Context $context,
         RequestInterface $request,
         JsonResultFactory $jsonFactory,
         CaptchaHelper $captchaHelper,
         LayoutInterface $layout,
         JsonSerializer $serializer
     ) {
+        parent::__construct($context);
         $this->request = $request;
         $this->jsonResultFactory = $jsonFactory;
         $this->captchaHelper = $captchaHelper;

app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php

@@ -10,6 +10,7 @@
 use Magento\Captcha\Controller\Refresh\Index;
 use Magento\Captcha\Helper\Data as CaptchaHelper;
 use Magento\Captcha\Model\CaptchaInterface;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Json as ResultJson;
 use Magento\Framework\Controller\Result\JsonFactory as ResultJsonFactory;
@@ -45,6 +46,9 @@ class IndexTest extends TestCase
     /** @var MockObject|JsonSerializer */
     private $jsonSerializerMock;
 
+    /** @var MockObject|Context */
+    private $contextMock;
+
     /** @var Index */
     private $refreshAction;
 
@@ -66,13 +70,16 @@ protected function setUp(): void
         $this->jsonSerializerMock = $this->createMock(JsonSerializer::class);
         $this->captchaHelperMock = $this->createMock(CaptchaHelper::class);
 
+        $this->contextMock = $this->createMock(Context::class);
+
         $this->blockMock->method('setIsAjax')
             ->willReturnSelf();
 
         $this->layoutMock->method('createBlock')
             ->willReturn($this->blockMock);
 
         $this->refreshAction = new Index(
+            $this->contextMock,
             $this->requestMock,
             $this->jsonResultFactoryMock,
             $this->captchaHelperMock,

app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php

@@ -9,6 +9,8 @@
 
 use Exception;
 use Magento\Checkout\Model\Sidebar;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\JsonFactory as ResultJsonFactory;
@@ -17,7 +19,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
 
-class RemoveItem implements HttpPostActionInterface
+class RemoveItem extends Action implements HttpPostActionInterface
 {
     /**
      * @var RequestInterface
@@ -32,7 +34,7 @@ class RemoveItem implements HttpPostActionInterface
     /**
      * @var ResultRedirectFactory
      */
-    private $resultRedirectFactory;
+    protected $resultRedirectFactory;
 
     /**
      * @var Sidebar
@@ -50,6 +52,7 @@ class RemoveItem implements HttpPostActionInterface
     protected $logger;
 
     /**
+     * @param Context $context
      * @param RequestInterface $request
      * @param ResultJsonFactory $resultJsonFactory
      * @param ResultRedirectFactory $resultRedirectFactory
@@ -58,13 +61,15 @@ class RemoveItem implements HttpPostActionInterface
      * @param LoggerInterface $logger
      */
     public function __construct(
+        Context $context,
         RequestInterface $request,
         ResultJsonFactory $resultJsonFactory,
         ResultRedirectFactory $resultRedirectFactory,
         Sidebar $sidebar,
         Validator $formKeyValidator,
         LoggerInterface $logger
     ) {
+        parent::__construct($context);
         $this->request = $request;
         $this->resultJsonFactory = $resultJsonFactory;
         $this->resultRedirectFactory = $resultRedirectFactory;

app/code/Magento/Cms/Controller/Page/View.php

@@ -8,6 +8,8 @@
 namespace Magento\Cms\Controller\Page;
 
 use Magento\Cms\Helper\Page as PageHelper;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\RequestInterface;
@@ -17,7 +19,7 @@
 /**
  * Custom page for storefront. Needs to be accessible by POST because of the store switching.
  */
-class View implements HttpGetActionInterface, HttpPostActionInterface
+class View extends Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var ForwardFactory
@@ -35,15 +37,18 @@ class View implements HttpGetActionInterface, HttpPostActionInterface
     private $pageHelper;
 
     /**
+     * @param Context $context
      * @param RequestInterface $request
      * @param PageHelper $pageHelper
      * @param ForwardFactory $resultForwardFactory
      */
     public function __construct(
+        Context $context,
         RequestInterface $request,
         PageHelper $pageHelper,
         ForwardFactory $resultForwardFactory
     ) {
+        parent::__construct($context);
         $this->request = $request;
         $this->pageHelper = $pageHelper;
         $this->resultForwardFactory = $resultForwardFactory;

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

@@ -7,26 +7,31 @@
 
 namespace Magento\Robots\Controller\Index;
 
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\View\Result\Page;
 use Magento\Framework\View\Result\PageFactory;
 
 /**
  * Processes request to robots.txt file and returns robots.txt content as result
  */
-class Index implements HttpGetActionInterface
+class Index extends Action implements HttpGetActionInterface
 {
     /**
      * @var PageFactory
      */
     private $resultPageFactory;
 
     /**
+     * @param Context $context
      * @param PageFactory $resultPageFactory
      */
     public function __construct(
+        Context $context,
         PageFactory $resultPageFactory
     ) {
+        parent::__construct($context);
         $this->resultPageFactory = $resultPageFactory;
     }
 

app/code/Magento/Search/Controller/Term/Popular.php

@@ -7,6 +7,8 @@
 
 namespace Magento\Search\Controller\Term;
 
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Controller\Result\ForwardFactory as ResultForwardFactory;
@@ -16,7 +18,7 @@
 /**
  * Popular search terms page
  */
-class Popular implements HttpGetActionInterface
+class Popular extends Action implements HttpGetActionInterface
 {
     private const XML_PATH_SEO_SEARCH_TERMS = 'catalog/seo/search_terms';
 
@@ -36,15 +38,18 @@ class Popular implements HttpGetActionInterface
     private $scopeConfig;
 
     /**
+     * @param Context $context
      * @param ResultForwardFactory $resultForwardFactory
      * @param ResultPageFactory $resultPageFactory
      * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
+        Context $context,
         ResultForwardFactory $resultForwardFactory,
         ResultPageFactory $resultPageFactory,
         ScopeConfigInterface $scopeConfig
     ) {
+        parent::__construct($context);
         $this->resultForwardFactory = $resultForwardFactory;
         $this->resultPageFactory = $resultPageFactory;
         $this->scopeConfig = $scopeConfig;

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

@@ -7,11 +7,13 @@
 
 namespace Magento\Swagger\Controller\Index;
 
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\View\Page\Config as PageConfig;
 use Magento\Framework\View\Result\PageFactory as PageFactory;
 
-class Index implements HttpGetActionInterface
+class Index extends Action implements HttpGetActionInterface
 {
     /**
      * @var PageConfig
@@ -24,11 +26,13 @@ class Index implements HttpGetActionInterface
     private $pageFactory;
 
     /**
+     * @param Context $context
      * @param PageConfig $pageConfig
      * @param PageFactory $pageFactory
      */
-    public function __construct(PageConfig $pageConfig, PageFactory $pageFactory)
+    public function __construct(Context $context, PageConfig $pageConfig, PageFactory $pageFactory)
     {
+        parent::__construct($context);
         $this->pageConfig = $pageConfig;
         $this->pageFactory = $pageFactory;
     }

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

@@ -8,6 +8,7 @@
 
 namespace Magento\Swagger\Test\Unit\Controller\Index;
 
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Page\Config as PageConfig;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Swagger\Controller\Index\Index;
@@ -18,6 +19,9 @@ class IndexTest extends TestCase
 {
     public function testExecute()
     {
+        /** @var MockObject|Context $pageConfigMock */
+        $contextMock = $this->createMock(Context::class);
+
         /** @var MockObject|PageConfig $pageConfigMock */
         $pageConfigMock = $this->getMockBuilder(PageConfig::class)
             ->disableOriginalConstructor()
@@ -30,7 +34,7 @@ public function testExecute()
         $pageConfigMock->expects($this->once())->method('addBodyClass')->with('swagger-section');
         $resultPageFactory->expects($this->once())->method('create');
 
-        $indexAction = new Index($pageConfigMock, $resultPageFactory);
+        $indexAction = new Index($contextMock, $pageConfigMock, $resultPageFactory);
         $indexAction->execute();
     }
 }

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

@@ -7,14 +7,16 @@
 
 namespace Magento\Version\Controller\Index;
 
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Controller\Result\RawFactory as RawResponseFactory;
 
 /**
  * Magento Version controller: Sets the response body to ProductName/Major.MinorVersion (Edition).
  */
-class Index implements HttpGetActionInterface
+class Index extends Action implements HttpGetActionInterface
 {
     const DEV_PREFIX = 'dev-';
 
@@ -29,11 +31,16 @@ class Index implements HttpGetActionInterface
     private $rawFactory;
 
     /**
+     * @param Context $context
      * @param RawResponseFactory $rawFactory
      * @param ProductMetadataInterface $productMetadata
      */
-    public function __construct(RawResponseFactory $rawFactory, ProductMetadataInterface $productMetadata)
-    {
+    public function __construct(
+        Context $context,
+        RawResponseFactory $rawFactory,
+        ProductMetadataInterface $productMetadata
+    ) {
+        parent::__construct($context);
         $this->rawFactory = $rawFactory;
         $this->productMetadata = $productMetadata;
     }

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

@@ -7,6 +7,7 @@
 
 namespace Magento\Version\Test\Unit\Controller\Index;
 
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Controller\Result\Raw;
 use Magento\Framework\Controller\Result\RawFactory;
@@ -28,11 +29,16 @@ class IndexTest extends TestCase
     /** @var MockObject|Raw */
     private $rawResponseMock;
 
+    /** @var MockObject|Context */
+    private $contextMock;
+
     /**
      * Prepare test preconditions
      */
     protected function setUp(): void
     {
+        $this->contextMock = $this->createMock(Context::class);
+
         $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getName', 'getEdition', 'getVersion'])
@@ -42,7 +48,11 @@ protected function setUp(): void
         $this->rawResponseMock = $this->createPartialMock(Raw::class, ['setContents']);
         $this->rawResponseFactoryMock->method('create')->willReturn($this->rawResponseMock);
 
-        $this->versionController = new VersionIndex($this->rawResponseFactoryMock, $this->productMetadataMock);
+        $this->versionController = new VersionIndex(
+            $this->contextMock,
+            $this->rawResponseFactoryMock,
+            $this->productMetadataMock
+        );
     }
 
     /**