Merge remote-tracking branch 'origin/2.4.8-beta1-develop' into Sync-Minor-2.4.8-Beta1_v1

Author: glo71317

app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php

@@ -3,33 +3,38 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 /**
  *
  * Customer reports admin controller
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Reports\Controller\Adminhtml\Report;
 
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Response\Http\FileFactory;
+
 /**
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */
-abstract class Customer extends \Magento\Backend\App\Action
+abstract class Customer extends Action
 {
     /**
-     * @var \Magento\Framework\App\Response\Http\FileFactory
+     * @var FileFactory
      */
     protected $_fileFactory;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param Context $context
+     * @param FileFactory $fileFactory
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+        Context $context,
+        FileFactory $fileFactory
     ) {
         $this->_fileFactory = $fileFactory;
         parent::__construct($context);
@@ -60,19 +65,15 @@ public function _initAction()
      */
     protected function _isAllowed()
     {
-        switch ($this->getRequest()->getActionName()) {
-            case 'accounts':
-                return $this->_authorization->isAllowed('Magento_Reports::accounts');
-                break;
-            case 'orders':
-                return $this->_authorization->isAllowed('Magento_Reports::customers_orders');
-                break;
-            case 'totals':
-                return $this->_authorization->isAllowed('Magento_Reports::totals');
-                break;
-            default:
-                return $this->_authorization->isAllowed('Magento_Reports::customers');
-                break;
-        }
+        return match ($this->getRequest()->getActionName()) {
+            'exportAccountsCsv', 'exportAccountsExcel', 'accounts' =>
+                $this->_authorization->isAllowed('Magento_Reports::accounts'),
+            'exportOrdersCsv', 'exportOrdersExcel','orders' =>
+                $this->_authorization->isAllowed('Magento_Reports::customers_orders'),
+            'exportTotalsCsv', 'exportTotalsExcel', 'totals' =>
+                $this->_authorization->isAllowed('Magento_Reports::totals'),
+            default =>
+                $this->_authorization->isAllowed('Magento_Reports::customers'),
+        };
     }
 }

app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php

@@ -4,20 +4,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
 use Magento\Backend\Block\Widget\Grid\ExportInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Reports\Controller\Adminhtml\Report\Product;
 
-class ExportSoldCsv extends \Magento\Reports\Controller\Adminhtml\Report\Product
+class ExportSoldCsv extends Product implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Reports::report_products';
+    public const ADMIN_RESOURCE = 'Magento_Reports::sold';
 
     /**
      * Export Sold Products report to CSV format action

app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php

@@ -4,20 +4,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
 use Magento\Backend\Block\Widget\Grid\ExportInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Reports\Controller\Adminhtml\Report\Product;
 
-class ExportSoldExcel extends \Magento\Reports\Controller\Adminhtml\Report\Product
+class ExportSoldExcel extends Product implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Reports::report_products';
+    public const ADMIN_RESOURCE = 'Magento_Reports::sold';
 
     /**
      * Export Sold Products report to XML format action

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

@@ -3,29 +3,42 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Search\Controller\Adminhtml;
 
 use Magento\Backend\App\Action;
+use Magento\Backend\Model\View\Result\Page;
 use Magento\Framework\Controller\ResultFactory;
 
 abstract class Term extends Action
 {
     /**
-     * Authorization level of a basic admin session
+     * Add search term breadcrumbs
      *
-     * @see _isAllowed()
-     */
-    const ADMIN_RESOURCE = 'Magento_Search::search';
-
-    /**
-     * @return \Magento\Backend\Model\View\Result\Page
+     * @return Page
      */
     protected function createPage()
     {
-        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        /** @var Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $resultPage->setActiveMenu('Magento_Search::search_terms')
             ->addBreadcrumb(__('Search'), __('Search'));
         return $resultPage;
     }
+
+    /**
+     * Determine if action is allowed for reports
+     *
+     * @return bool
+     */
+    protected function _isAllowed(): bool
+    {
+        return match ($this->getRequest()->getActionName()) {
+            'exportSearchCsv', 'exportSearchExcel' =>
+                $this->_authorization->isAllowed('Magento_Reports::report_search'),
+            default =>
+                $this->_authorization->isAllowed('Magento_Search::search'),
+        };
+    }
 }