merge magento/2.3-develop into magento-borg/MAGETWO-91528

Author: Magento CICD

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

@@ -170,14 +170,25 @@ public function move($fileName, $renameFileOff = false)
                 }
             }
 
+            if ($this->getTmpDir()) {
+                $filePath = $this->getTmpDir() . '/';
+            } else {
+                $filePath = '';
+            }
             $fileName = preg_replace('/[^a-z0-9\._-]+/i', '', $fileName);
+            $filePath = $this->_directory->getRelativePath($filePath . $fileName);
             $this->_directory->writeFile(
-                $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName),
+                $filePath,
                 $read->readAll()
             );
         }
 
-        $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);

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php

@@ -103,7 +103,7 @@ protected function setUp()
     public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName)
     {
         $destDir = 'var/dest/dir';
-        $expectedRelativeFilePath = $this->uploader->getTmpDir() . '/' . $expectedFileName;
+        $expectedRelativeFilePath = $expectedFileName;
         $this->directoryMock->expects($this->once())->method('isWritable')->with($destDir)->willReturn(true);
         $this->directoryMock->expects($this->any())->method('getRelativePath')->with($expectedRelativeFilePath);
         $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($destDir)
@@ -139,7 +139,7 @@ public function testMoveFileName()
     {
         $destDir = 'var/dest/dir';
         $fileName = 'test_uploader_file';
-        $expectedRelativeFilePath = $this->uploader->getTmpDir() . '/' . $fileName;
+        $expectedRelativeFilePath = $fileName;
         $this->directoryMock->expects($this->once())->method('isWritable')->with($destDir)->willReturn(true);
         $this->directoryMock->expects($this->any())->method('getRelativePath')->with($expectedRelativeFilePath);
         $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($destDir)

app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php

@@ -53,9 +53,13 @@ public function execute()
                 $sitemap->load($id);
                 // delete file
                 $sitemapPath = $sitemap->getSitemapPath();
+                if ($sitemapPath && $sitemapPath[0] === DIRECTORY_SEPARATOR) {
+                    $sitemapPath = mb_substr($sitemapPath, 1);
+                }
                 $sitemapFilename = $sitemap->getSitemapFilename();
-
-                $path = $directory->getRelativePath($sitemapPath . $sitemapFilename);
+                $path = $directory->getRelativePath(
+                    $sitemapPath .$sitemapFilename
+                );
                 if ($sitemap->getSitemapFilename() && $directory->isFile($path)) {
                     $directory->delete($path);
                 }

app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.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
     {

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

@@ -101,11 +101,7 @@ public function testExecuteWithWrongFileName()
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
         $this->model->execute();
 
-        $this->assertTrue(
-            $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $fileName)
-            )
-        );
+        $this->assertFileExists($this->fullDirectoryPath . $fileName);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php

@@ -112,11 +112,7 @@ public function testExecuteWithWrongDirectoryName()
         $this->model->getRequest()->setParams(['node' => $this->imagesHelper->idEncode($directoryName)]);
         $this->model->execute();
 
-        $this->assertTrue(
-            $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $directoryName)
-            )
-        );
+        $this->assertFileExists($this->fullDirectoryPath . $directoryName);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php

@@ -111,10 +111,8 @@ public function testExecuteWithWrongPath()
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath . $dirPath);
         $this->model->execute();
 
-        $this->assertFalse(
-            $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $dirPath . $this->dirName)
-            )
+        $this->assertFileNotExists(
+            $this->fullDirectoryPath . $dirPath . $this->dirName
         );
     }
 

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolderTest.php

@@ -125,10 +125,8 @@ public function testExecuteWithWrongPath()
         $this->model->getStorage()->getSession()->setCurrentPath($dirPath);
         $this->model->execute();
 
-        $this->assertFalse(
-            $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $dirPath . $this->fileName)
-            )
+        $this->assertFileNotExists(
+            $this->fullDirectoryPath . $dirPath . $this->fileName
         );
     }
 
@@ -147,11 +145,7 @@ public function testExecuteWithWrongFileName()
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
         $this->model->execute();
 
-        $this->assertFalse(
-            $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $newFilename)
-            )
-        );
+        $this->assertFileNotExists($this->fullDirectoryPath . $newFilename);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php

@@ -52,7 +52,7 @@ public function testValidatePath($path, $directoryConfig, $expectation)
     {
         $directory = $this->filesystem
             ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
-        $path = $directory->getAbsolutePath($path);
+        $path = $directory->getAbsolutePath() .'/' .$path;
         $this->assertEquals($expectation, $this->directoryResolver->validatePath($path, $directoryConfig));
     }