ACP2E-1627: [Cloud] Magento Product Recommendation/Data Services Causing File Download Warning

Author: bubasuma

lib/internal/Magento/Framework/App/Response/File.php

@@ -12,7 +12,6 @@
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\PageCache\NotCacheableInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
-use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Driver\File\Mime;
 use Magento\Framework\Session\Config\ConfigInterface;
@@ -43,74 +42,72 @@ class File extends Http implements NotCacheableInterface
     /**
      * @var array
      */
-    private array $fileOptions = [
+    private array $options = [
         'directoryCode' => DirectoryList::ROOT,
         'filePath' => null,
         // File name to send to the client
         'fileName' => null,
         'contentType' => null,
         'contentLength' => null,
-        // Whether to remove after file is sent to the client
+        // Whether to remove the file after it is sent to the client
         'remove' => false,
     ];
 
     /**
      * @param HttpRequest $request
-     * @param Http $response
      * @param CookieManagerInterface $cookieManager
      * @param CookieMetadataFactory $cookieMetadataFactory
      * @param Context $context
      * @param DateTime $dateTime
      * @param ConfigInterface $sessionConfig
+     * @param Http $response
      * @param Filesystem $filesystem
      * @param Mime $mime
-     * @param array $fileOptions
+     * @param array $options
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @throws FileSystemException
      */
     public function __construct(
         HttpRequest $request,
-        Http $response,
         CookieManagerInterface $cookieManager,
         CookieMetadataFactory $cookieMetadataFactory,
         Context $context,
         DateTime $dateTime,
         ConfigInterface $sessionConfig,
+        Http $response,
         Filesystem $filesystem,
         Mime $mime,
-        array $fileOptions = []
+        array $options = []
     ) {
         parent::__construct($request, $cookieManager, $cookieMetadataFactory, $context, $dateTime, $sessionConfig);
-        $this->filesystem = $filesystem;
         $this->response = $response;
+        $this->filesystem = $filesystem;
         $this->mime = $mime;
-        $this->fileOptions = array_merge($this->fileOptions, $fileOptions);
-        if (!isset($this->fileOptions['filePath'])) {
-            throw new InvalidArgumentException("File path is required");
-        }
-        $dir = $this->filesystem->getDirectoryRead($this->fileOptions['directoryCode']);
-        if (!$dir->isExist($this->fileOptions['filePath'])) {
-            throw new InvalidArgumentException("File '{$this->fileOptions['filePath']}' does not exists.");
-        }
+        $this->options = array_merge($this->options, $options);
     }
 
     /**
      * @inheritDoc
      */
     public function sendResponse()
     {
-        $dir = $this->filesystem->getDirectoryWrite($this->fileOptions['directoryCode']);
-        $filePath = $this->fileOptions['filePath'];
-        $contentType = $this->fileOptions['contentType']
+        $dir = $this->filesystem->getDirectoryWrite($this->options['directoryCode']);
+        if (!isset($this->options['filePath'])) {
+            throw new InvalidArgumentException("File path is required.");
+        }
+        if (!$dir->isExist($this->options['filePath'])) {
+            throw new InvalidArgumentException("File '{$this->options['filePath']}' does not exists.");
+        }
+        $filePath = $this->options['filePath'];
+        $contentType = $this->options['contentType']
             ?? $dir->stat($filePath)['mimeType']
             ?? $this->mime->getMimeType($dir->getAbsolutePath($filePath));
-        $contentLength = $this->fileOptions['contentLength']
+        $contentLength = $this->options['contentLength']
             ?? $dir->stat($filePath)['size'];
-        $fileName = $this->fileOptions['fileName']
+        $fileName = $this->options['fileName']
             ?? basename($filePath);
         $this->response->setHttpResponseCode(200);
         $this->response->setHeader('Content-type', $contentType, true)
-            ->setHeader('Content-Length', $contentLength)
+            ->setHeader('Content-Length', $contentLength, true)
             ->setHeader('Content-Disposition', 'attachment; filename="' . $fileName . '"', true)
             ->setHeader('Pragma', 'public', true)
             ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true)
@@ -125,7 +122,7 @@ public function sendResponse()
                 echo $stream->read(1024);
             }
             $stream->close();
-            if ($this->fileOptions['remove']) {
+            if ($this->options['remove']) {
                 $dir->delete($filePath);
             }
             $this->response->clearBody();

lib/internal/Magento/Framework/App/Response/Http/FileFactory.php

@@ -39,7 +39,7 @@ class FileFactory
     /**
      * @param ResponseInterface $response
      * @param Filesystem $filesystem
-     * @param \Magento\Framework\App\Response\FileFactory $fileResponseFactory
+     * @param \Magento\Framework\App\Response\FileFactory|null $fileResponseFactory
      */
     public function __construct(
         \Magento\Framework\App\ResponseInterface $response,
@@ -101,7 +101,7 @@ public function create(
             }
         }
         return $this->fileResponseFactory->create([
-            'fileOptions' => [
+            'options' => [
                 'filePath' => $file,
                 'fileName' => $fileName,
                 'contentType' => $contentType,