Merge remote-tracking branch 'origin/MC-30148' into 2.4-develop-pr11

Author: serhii-balko

app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php

@@ -5,13 +5,16 @@
  */
 namespace Magento\ImportExport\Model\Export\Adapter;
 
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\File\Write;
+
 /**
  * Export adapter csv.
  *
  * @api
  * @since 100.0.2
  */
-class Csv extends \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
+class Csv extends AbstractAdapter
 {
     /**
      * Field delimiter.
@@ -30,28 +33,28 @@ class Csv extends \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
     /**
      * Source file handler.
      *
-     * @var \Magento\Framework\Filesystem\File\Write
+     * @var Write
      */
     protected $_fileHandler;
 
     /**
-     * {@inheritdoc }
+     * Object destructor
      */
-    public function __construct(\Magento\Framework\Filesystem $filesystem, $destination = null)
+    public function __destruct()
     {
-        register_shutdown_function([$this, 'destruct']);
-        parent::__construct($filesystem, $destination);
+        $this->destruct();
     }
 
     /**
-     * Object destructor.
+     * Clean cached values
      *
      * @return void
      */
     public function destruct()
     {
         if (is_object($this->_fileHandler)) {
             $this->_fileHandler->close();
+            $this->_directoryHandle->delete($this->_destination);
         }
     }
 
@@ -96,7 +99,7 @@ public function getFileExtension()
     public function setHeaderCols(array $headerColumns)
     {
         if (null !== $this->_headerCols) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('The header column names are already set.'));
+            throw new LocalizedException(__('The header column names are already set.'));
         }
         if ($headerColumns) {
             foreach ($headerColumns as $columnName) {

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\ImportExport\Model\Export\Adapter\AbstractAdapter;
 use Magento\Store\Model\Store;
 
 /**
@@ -62,6 +63,11 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
         'tax_class_id',
     ];
 
+    /**
+     * @var AbstractAdapter
+     */
+    private $writer;
+
     /**
      * @inheritdoc
      */
@@ -367,7 +373,7 @@ protected function executeImportReplaceTest(
      * Export products in the system.
      *
      * @param \Magento\CatalogImportExport\Model\Export\Product|null $exportProduct
-     * @return string Return exported file name
+     * @return string Return exported file
      */
     private function exportProducts(\Magento\CatalogImportExport\Model\Export\Product $exportProduct = null)
     {
@@ -376,12 +382,11 @@ private function exportProducts(\Magento\CatalogImportExport\Model\Export\Produc
         $exportProduct = $exportProduct ?: $this->objectManager->create(
             \Magento\CatalogImportExport\Model\Export\Product::class
         );
-        $exportProduct->setWriter(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\ImportExport\Model\Export\Adapter\Csv::class,
-                ['fileSystem' => $this->fileSystem, 'destination' => $csvfile]
-            )
+        $this->writer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\ImportExport\Model\Export\Adapter\Csv::class,
+            ['fileSystem' => $this->fileSystem, 'destination' => $csvfile]
         );
+        $exportProduct->setWriter($this->writer);
         $this->assertNotEmpty($exportProduct->export());
 
         return $csvfile;

dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Adapter/CsvTest.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\ImportExport\Model\Export\Adapter;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for Export adapter csv
+ */
+class CsvTest extends TestCase
+{
+    /**
+     * @var string Destination file name
+     */
+    private $destination = 'destinationFile';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Csv
+     */
+    private $csv;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->csv = $this->objectManager->create(
+            Csv::class,
+            ['destination' => $this->destination]
+        );
+    }
+
+    /**
+     * Test to destruct export adapter
+     */
+    public function testDestruct(): void
+    {
+        /** @var Filesystem $fileSystem */
+        $fileSystem = $this->objectManager->get(Filesystem::class);
+        $directoryHandle = $fileSystem->getDirectoryRead(DirectoryList::VAR_DIR);
+        /** Assert that the destination file is present after construct */
+        $this->assertFileExists(
+            $directoryHandle->getAbsolutePath($this->destination),
+            'The destination file was\'t created after construct'
+        );
+        /** Assert that the destination file was removed after destruct */
+        $this->csv = null;
+        $this->assertFileNotExists(
+            $directoryHandle->getAbsolutePath($this->destination),
+            'The destination file was\'t removed after destruct'
+        );
+    }
+}