MC-31362: Media folder update

- Fixed unit test failures
- Fixed minor invalid logic in filedriver

Author: Hwashiang Yu

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

@@ -139,7 +139,7 @@ protected function setUp()
 
         $this->directoryMock = $this->createPartialMock(
             \Magento\Framework\Filesystem\Directory\Write::class,
-            ['delete', 'getDriver', 'create', 'getRelativePath', 'isExist', 'isFile']
+            ['delete', 'getDriver', 'create', 'getRelativePath', 'getAbsolutePath', 'isExist', 'isFile']
         );
         $this->directoryMock->expects(
             $this->any()
@@ -283,6 +283,7 @@ public function testGetResizeHeight()
     public function testDeleteDirectoryOverRoot()
     {
         $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
+        $this->directoryMock->expects($this->atLeastOnce())->method('getAbsolutePath')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::INVALID_DIRECTORY_OVER_ROOT);
     }
 
@@ -294,6 +295,7 @@ public function testDeleteDirectoryOverRoot()
     public function testDeleteRootDirectory()
     {
         $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
+        $this->directoryMock->expects($this->atLeastOnce())->method('getAbsolutePath')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::STORAGE_ROOT_DIR);
     }
 

lib/internal/Magento/Framework/Filesystem/Driver/File.php

@@ -984,7 +984,7 @@ public function getRealPathSafety($path)
         );
         $pathParts = explode(DIRECTORY_SEPARATOR, $path);
         if (end($pathParts) == '.') {
-            $pathParts[count($pathParts)] = '';
+            $pathParts[count($pathParts) - 1] = '';
         }
         $realPath = [];
         foreach ($pathParts as $pathPart) {

lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php

@@ -107,10 +107,14 @@ public function dataProviderForTestGetRealPathSafety(): array
     {
         return [
             ['/1/2/3', '/1/2/3'],
+            ['/1/.test', '/1/.test'],
+            ['/1/..test', '/1/..test'],
+            ['/1/.test/.test', '/1/.test/.test'],
+            ['/1/2/./.', '/1/2/'],
             ['/1/2/3/../..', '/1'],
-            ['/1/2/3/.', '/1/2/3'],
+            ['/1/2/3/.', '/1/2/3/'],
             ['/1/2/3/./4/5', '/1/2/3/4/5'],
-            ['/1/2/3/../4/5', '/1/2/4/5'],
+            ['/1/2/3/../4/5', '/1/2/4/5']
         ];
     }
 }