MAGETWO-88432: Filesystem Directory Improvement

Author: Oleksandr Gorkun

app/code/Magento/CatalogImportExport/Model/Import/Uploader.php

@@ -177,7 +177,12 @@ public function move($fileName, $renameFileOff = false)
             );
         }
 
-        $filePath = $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName);
+        if ($this->getTmpDir()) {
+            $filePath = $this->getTmpDir() . '/';
+        } else {
+            $filePath = '';
+        }
+        $filePath = $this->_directory->getRelativePath($filePath . $fileName);
         $this->_setUploadFile($filePath);
         $destDir = $this->_directory->getAbsolutePath($this->getDestDir());
         $result = $this->save($destDir);

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php

@@ -48,7 +48,14 @@ protected function setUp()
         $mediaPath = $appParams[DirectoryList::MEDIA][DirectoryList::PATH];
         $this->directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $tmpDir = $this->directory->getRelativePath($mediaPath . '/import');
-        $this->uploader->setTmpDir($tmpDir);
+        if (!$this->directory->create($tmpDir)) {
+            throw new \RuntimeException('Failed to create temporary directory');
+        }
+        if (!$this->uploader->setTmpDir($tmpDir)) {
+            throw new \RuntimeException(
+                'Failed to set temporary directory for files.'
+            );
+        }
 
         parent::setUp();
     }
@@ -70,6 +77,7 @@ public function testMoveWithValidFile(): void
      * @magentoAppIsolation enabled
      * @return void
      * @expectedException \Exception
+     * @expectedExceptionMessage Disallowed file type
      */
     public function testMoveWithInvalidFile(): void
     {

lib/internal/Magento/Framework/Filesystem/Directory/Read.php

@@ -67,7 +67,7 @@ public function __construct(
      *
      * @return void
      */
-    protected final function validatePath(
+    protected function validatePath(
         ?string $path,
         ?string $scheme = null,
         bool $absolutePath = false