Merge branch 'ACP2E-1482' of https://github.com/magento-l3/magento2ce into PR-02142023

Author: chittima

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

@@ -1,21 +1,29 @@
 <?php
 /**
- *
  * 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\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ResponseInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Product;
 
-class ExportDownloadsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Product
+/**
+ * Exporting list of product in CVS format.
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
+class ExportDownloadsCsv extends Product
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Reports::report_products';
+    public const ADMIN_RESOURCE = 'Magento_Reports::report_products';
 
     /**
      * Export products downloads report to CSV format
@@ -31,6 +39,6 @@ public function execute()
             true
         )->getCsv();
 
-        return $this->_fileFactory->create($fileName, $content);
+        return $this->_fileFactory->create($fileName, $content, DirectoryList::VAR_DIR);
     }
 }

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

@@ -1,21 +1,29 @@
 <?php
 /**
- *
  * 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\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ResponseInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Product;
 
-class ExportDownloadsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Product
+/**
+ * Exporting list of product in Excel format.
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
+class ExportDownloadsExcel extends Product
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Reports::report_products';
+    public const ADMIN_RESOURCE = 'Magento_Reports::report_products';
 
     /**
      * Export products downloads report to XLS format
@@ -33,6 +41,6 @@ public function execute()
             $fileName
         );
 
-        return $this->_fileFactory->create($fileName, $content);
+        return $this->_fileFactory->create($fileName, $content, DirectoryList::VAR_DIR);
     }
 }

app/code/Magento/Reports/Test/Integration/Controller/Adminhtml/Report/Product/ExportDownloadsCsvTest.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Test\Integration\Controller\Adminhtml\Report\Product;
+
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class ExportDownloadsCsvTest extends AbstractBackendController
+{
+    public function testExecute()
+    {
+        $this->dispatch('backend/reports/report_product/exportDownloadsCsv');
+        $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
+    }
+}

app/code/Magento/Reports/Test/Integration/Controller/Adminhtml/Report/Product/ExportDownloadsExcelTest.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Test\Integration\Controller\Adminhtml\Report\Product;
+
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class ExportDownloadsExcelTest extends AbstractBackendController
+{
+    public function testExecute()
+    {
+        $this->dispatch('backend/reports/report_product/exportDownloadsExcel');
+        $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
+    }
+}