Merge branch 'ACP2E-2298' of https://github.com/magento-l3/magento2ce into PR2-L3-09132023

Author: chittima

app/code/Magento/ImportExport/Test/Unit/Ui/DataProvider/ExportFileDataProviderTest.php

@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Test\Unit\Ui\DataProvider;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\ReportingInterface;
+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Filesystem\Io\File;
+use Magento\ImportExport\Ui\DataProvider\ExportFileDataProvider;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class ExportFileDataProviderTest extends TestCase
+{
+    /**
+     * @var WriteInterface|MockObject
+     */
+    private $directoryMock;
+
+    /**
+     * @var File|MockObject
+     */
+    private $fileIOMock;
+
+    /**
+     * @var RequestInterface|MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var ExportFileDataProvider
+     */
+    private ExportFileDataProvider $model;
+
+    protected function setUp(): void
+    {
+        $reportingMock = $this->createMock(ReportingInterface::class);
+        $searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
+        $filterBuilderMock = $this->createMock(FilterBuilder::class);
+        $fileMock = $this->createMock(DriverInterface::class);
+        $filesystemMock = $this->createMock(Filesystem::class);
+        $this->directoryMock = $this->createMock(WriteInterface::class);
+        $filesystemMock->method('getDirectoryWrite')
+            ->willReturn($this->directoryMock);
+        $this->fileIOMock = $this->createMock(File::class);
+
+        $this->model = new ExportFileDataProvider(
+            'export_grid_data_source',
+            'file_name',
+            'file_name',
+            $reportingMock,
+            $searchCriteriaBuilderMock,
+            $this->requestMock,
+            $filterBuilderMock,
+            $fileMock,
+            $filesystemMock,
+            $this->fileIOMock
+        );
+    }
+
+    public function testGetData(): void
+    {
+        $this->directoryMock->method('getAbsolutePath')
+            ->willReturnCallback(fn ($path) => $path ?: '/var/');
+        $this->directoryMock->expects(self::once())
+            ->method('isExist')
+            ->with('/var/export/')
+            ->willReturn(true);
+        $driverMock = $this->createMock(DriverInterface::class);
+        $this->directoryMock->method('getDriver')
+            ->willReturn($driverMock);
+        $files = [
+            '/var/export/file1.csv' => ['mtime' => 1000000001],
+            '/var/export/file2.csv' => ['mtime' => 1000000002],
+            '/var/export/file3.csv' => ['mtime' => 1000000002],
+            '/var/export/file4.csv' => ['mtime' => 1000000003],
+        ];
+        $driverMock->expects(self::once())
+            ->method('readDirectoryRecursively')
+            ->with('/var/export/')
+            ->willReturn(array_keys($files));
+        $this->directoryMock->expects(self::exactly(count($files)))
+            ->method('isFile')
+            ->willReturn(true);
+        $this->directoryMock->method('stat')
+            ->willReturnCallback(fn ($path) => $files[$path]);
+        $this->fileIOMock->expects(self::exactly(count($files)))
+            ->method('getPathInfo')
+            ->willReturnCallback(
+                fn ($path) => [
+                    'dirname' => '/var/export',
+                    'extension' => 'csv',
+                    'basename' => str_replace('/var/export/', '', $path),
+                    'filename' => preg_replace('/(.*)\/([a-z0-9]+)(\.csv)/', '$2', $path),
+                ]
+            );
+        $this->requestMock->method('getParam')
+            ->with('paging')
+            ->willReturn(['pageSize' => 10, 'current' => 1]);
+
+        $data = $this->model->getData();
+        self::assertEquals(count($files), $data['totalRecords']);
+        self::assertEquals(
+            ['file4.csv', 'file2.csv', 'file3.csv', 'file1.csv'],
+            array_column($data['items'], 'file_name')
+        );
+    }
+}

app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php

@@ -162,12 +162,13 @@ private function getExportFiles(string $directoryPath): array
         foreach ($files as $filePath) {
             $filePath = $this->directory->getAbsolutePath($filePath);
             if ($this->directory->isFile($filePath)) {
-                $fileModificationTime = $this->directory->stat($filePath)['mtime'];
-                $sortedFiles[$fileModificationTime] = $filePath;
+                $sortedFiles[] = $filePath;
             }
         }
-        //sort array elements using key value
-        krsort($sortedFiles);
+        usort(
+            $sortedFiles,
+            fn ($f1, $f2) => ($this->directory->stat($f1)['mtime'] <=> $this->directory->stat($f2)['mtime']) * -1
+        );
 
         return $sortedFiles;
     }