Merge branch '2.4.2-develop' of github.com:magento/magento2ce into engcom-regression-bugfixes

Author: Gabriel Galvao da Gama

app/code/Magento/AwsS3/Model/HttpLoggerHandler.php

@@ -61,10 +61,10 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
         $resultRedirect->setPath('adminhtml/export/index');
         $fileName = $this->getRequest()->getParam('filename');
-        $exportDirectory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_EXPORT);
+        $exportDirectory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_IMPORT_EXPORT);
 
         try {
-            $fileExist = $exportDirectory->isExist($fileName);
+            $fileExist = $exportDirectory->isExist('export/' . $fileName);
         } catch (Throwable $e) {
             $fileExist = false;
         }

app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Download.php

@@ -180,7 +180,8 @@ protected function appendResultSaveRemoteImage($fileName)
         $result['name'] = $fileInfo['basename'];
         $result['type'] = $this->imageAdapter->getMimeType();
         $result['error'] = 0;
-        $result['size'] = filesize($this->appendAbsoluteFileSystemPath($fileName));
+        $result['size'] = $this->fileSystem->getDirectoryWrite(DirectoryList::MEDIA)
+            ->getDriver()->stat(($this->appendAbsoluteFileSystemPath($fileName)))['size'];
         $result['url'] = $this->mediaConfig->getTmpMediaUrl($tmpFileName);
         $result['file'] = $tmpFileName;
         return $result;

app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php

@@ -10,6 +10,7 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Catalog\Model\Product\Media\Config;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Raw;
 use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Framework\DataObject;
 use Magento\Framework\Filesystem;
@@ -99,6 +100,11 @@ class RetrieveImageTest extends TestCase
      */
     private $fileDriverMock;
 
+    /**
+     * @var Raw|MockObject
+     */
+    private $responseMock;
+
     private function setupObjectManagerForCheckImageExist($return)
     {
         $objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
@@ -119,8 +125,8 @@ protected function setUp(): void
             ->createMock(NotProtectedExtension::class);
         $this->rawFactoryMock =
             $this->createPartialMock(RawFactory::class, ['create']);
-        $response = new DataObject();
-        $this->rawFactoryMock->expects($this->once())->method('create')->willReturn($response);
+        $this->responseMock = $this->createMock(Raw::class);
+        $this->rawFactoryMock->expects($this->once())->method('create')->willReturn($this->responseMock);
         $this->configMock = $this->createMock(Config::class);
         $this->filesystemMock = $this->createMock(Filesystem::class);
         $this->adapterMock =
@@ -140,6 +146,8 @@ protected function setUp(): void
             ->getMockForAbstractClass();
         $this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->request);
         $this->contextMock->expects($this->any())->method('getObjectManager')->willReturn($managerMock);
+        $this->fileDriverMock->method('stat')
+            ->willReturn(['size' => 200]);
 
         $this->image = $objectManager->getObject(
             RetrieveImage::class,
@@ -172,12 +180,24 @@ public function testExecute()
         $writeInterface = $this->createMock(
             WriteInterface::class
         );
+        $writeInterface->method('getDriver')
+            ->willReturn($this->fileDriverMock);
         $this->filesystemMock->expects($this->any())->method('getDirectoryRead')->willReturn($readInterface);
         $readInterface->expects($this->any())->method('getAbsolutePath')->willReturn('');
         $this->abstractAdapter->expects($this->any())->method('validateUploadFile')->willReturn('true');
         $this->validatorMock->expects($this->once())->method('isValid')->with('jpg')->willReturn('true');
         $this->filesystemMock->expects($this->once())->method('getDirectoryWrite')->willReturn($writeInterface);
         $this->curlMock->expects($this->once())->method('read')->willReturn('testimage');
+        $this->responseMock->expects(self::once())
+            ->method('setContents')
+            ->with(json_encode([
+                'name' => 'test.jpg',
+                'type' => null,
+                'error' => 0,
+                'size' => 200,
+                'url' => null,
+                'file' => '/t/e/test.jpg'
+            ], JSON_THROW_ON_ERROR));
 
         $this->image->execute();
     }
@@ -192,6 +212,8 @@ public function testExecuteInvalidFileImage()
         );
         $readInterface = $this->createMock(ReadInterface::class);
         $writeInterface = $this->createMock(WriteInterface::class);
+        $writeInterface->method('getDriver')
+            ->willReturn($this->fileDriverMock);
         $this->filesystemMock->expects($this->any())->method('getDirectoryRead')->willReturn($readInterface);
         $readInterface->expects($this->any())->method('getAbsolutePath')->willReturn('');
         $this->abstractAdapter->expects($this->any())
@@ -216,6 +238,8 @@ public function testExecuteInvalidFileType()
         );
         $readInterface = $this->createMock(ReadInterface::class);
         $writeInterface = $this->createMock(WriteInterface::class);
+        $writeInterface->method('getDriver')
+            ->willReturn($this->fileDriverMock);
         $this->filesystemMock->expects($this->any())->method('getDirectoryRead')->willReturn($readInterface);
         $readInterface->expects($this->any())->method('getAbsolutePath')->willReturn('');
         $this->abstractAdapter->expects($this->never())->method('validateUploadFile');