MC-18100: Changes in Downloadable product upload controller

Author: OlgaVasyltsun

dev/tests/integration/testsuite/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/UploadTest.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\File;
 
@@ -47,6 +48,9 @@ public function testUploadWrongUploadType($postData): void
         $this->assertEquals(0, $result['errorcode']);
     }
 
+    /**
+     * @return array
+     */
     public function uploadWrongUploadTypeDataProvider(): array
     {
         return [

dev/tests/integration/testsuite/Magento/Framework/File/UploaderTest.php

@@ -39,7 +39,7 @@ protected function setUp()
     /**
      * @return void
      */
-    public function testUploadFileFromAllowedFolder(): void
+    public function testUploadFileFromAllowedFolder()
     {
         $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
@@ -67,7 +67,7 @@ public function testUploadFileFromAllowedFolder(): void
      *
      * @return void
      */
-    public function testUploadFileFromNotAllowedFolder(): void
+    public function testUploadFileFromNotAllowedFolder()
     {
         $fileName = 'text.txt';
         $tmpDir = 'tmp';
@@ -89,8 +89,6 @@ public function testUploadFileFromNotAllowedFolder(): void
      */
     protected function tearDown()
     {
-        parent::tearDown();
-
         $tmpDir = 'tmp';
         $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $mediaDirectory->delete($tmpDir);

lib/internal/Magento/Framework/File/Uploader.php

@@ -173,17 +173,12 @@ class Uploader
      *
      * @param string|array $fileId
      * @param \Magento\Framework\File\Mime|null $fileMime
-     * @param DirectoryList|null $directoryList
      * @throws \DomainException
      */
     public function __construct(
         $fileId,
-        Mime $fileMime = null,
-        DirectoryList $directoryList = null
+        Mime $fileMime = null
     ) {
-        $this->directoryList= $directoryList ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(DirectoryList::class);
-
         $this->_setUploadFileId($fileId);
         if (!file_exists($this->_file['tmp_name'])) {
             $code = empty($this->_file['tmp_name']) ? self::TMP_NAME_EMPTY : 0;
@@ -606,7 +601,7 @@ private function _setUploadFileId($fileId)
      * @return void
      * @throws \InvalidArgumentException
      */
-    private function validateFileId(array $fileId): void
+    private function validateFileId(array $fileId)
     {
         $isValid = false;
         if (isset($fileId['tmp_name'])) {
@@ -615,14 +610,14 @@ private function validateFileId(array $fileId): void
             if (preg_match('/\.\.(\\\|\/)/', $tmpName) !== 1) {
                 $allowedFolders = [
                     sys_get_temp_dir(),
-                    $this->directoryList->getPath(DirectoryList::MEDIA),
-                    $this->directoryList->getPath(DirectoryList::VAR_DIR),
-                    $this->directoryList->getPath(DirectoryList::TMP),
-                    $this->directoryList->getPath(DirectoryList::UPLOAD),
+                    $this->getDirectoryList()->getPath(DirectoryList::MEDIA),
+                    $this->getDirectoryList()->getPath(DirectoryList::VAR_DIR),
+                    $this->getDirectoryList()->getPath(DirectoryList::TMP),
+                    $this->getDirectoryList()->getPath(DirectoryList::UPLOAD),
                 ];
 
                 $disallowedFolders = [
-                    $this->directoryList->getPath(DirectoryList::LOG),
+                    $this->getDirectoryList()->getPath(DirectoryList::LOG),
                 ];
 
                 foreach ($allowedFolders as $allowedFolder) {
@@ -648,6 +643,19 @@ private function validateFileId(array $fileId): void
         }
     }
 
+    /**
+     * @return DirectoryList
+     */
+    private function getDirectoryList(): DirectoryList
+    {
+        if ($this->directoryList === null) {
+            $this->directoryList = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(DirectoryList::class);
+        }
+
+        return $this->directoryList;
+    }
+
     /**
      * Create destination folder
      *