MC-31733: Media gallery breaks in some filesystems

Author: nathanjosiah

app/code/Magento/Theme/Helper/Storage.php

@@ -255,9 +255,7 @@ public function getCurrentPath()
             if ($path && $path !== self::NODE_ROOT) {
                 $path = $this->convertIdToPath($path);
 
-                $realPath = $this->filesystemDriver->getRealPathSafety($path);
-
-                $path = $realPath ?: $path;
+                $path = $this->filesystemDriver->getRealPathSafety($path);
 
                 if (strpos($path, $currentPath) !== 0) {
                     $path = $currentPath;

app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php

@@ -274,6 +274,8 @@ public function testGetAllowedExtensionsByType()
      */
     public function testGetThumbnailPathNotFound()
     {
+        $this->filesystemDriver->method('getRealpathSafety')
+            ->willReturnArgument(0);
         $image = 'notFoundImage.png';
         $root = '/image';
         $sourceNode = '/not/a/root';
@@ -452,6 +454,20 @@ public function testGetThemeNotFound()
         $helper->getStorageRoot();
     }
 
+    /**
+     * @dataProvider getCurrentPathDataProvider
+     */
+    public function testGetCurrentPathCachesResult()
+    {
+        $this->request->expects($this->once())
+            ->method('getParam')
+            ->with(Storage::PARAM_NODE)
+            ->willReturn(Storage::NODE_ROOT);
+
+        $actualPath = $this->helper->getCurrentPath();
+        self::assertSame('/image', $actualPath);
+    }
+
     /**
      * @dataProvider getCurrentPathDataProvider
      */
@@ -479,8 +495,7 @@ public function testGetCurrentPath(
                 ->willReturnArgument(0);
         }
 
-        $this->request->expects($this->once())
-            ->method('getParam')
+        $this->request->method('getParam')
             ->with(Storage::PARAM_NODE)
             ->willReturn($requestedPath);
 
@@ -494,11 +509,11 @@ public function getCurrentPathDataProvider(): array
         $rootPath = '/' . \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE;
 
         return [
-            [$rootPath, Storage::NODE_ROOT],
-            [$rootPath, $rootPath . '/foo'],
-            [$rootPath, $rootPath . '/something', true, null, '/bar'],
-            ['foo/', $rootPath . '/foo', true, 'foo/'],
-            [$rootPath, $rootPath . '/foo', false],
+            'requested path "root" should short-circuit' => [$rootPath, Storage::NODE_ROOT],
+            'non-existent directory should default to the base path' => [$rootPath, $rootPath . '/foo'],
+            'requested path that resolves to a bad path should default to root' =>
+                [$rootPath, $rootPath . '/something', true, null, '/bar'],
+            'real path should resolve to relative path' => ['foo/', $rootPath . '/foo', true, 'foo/'],
         ];
     }
 }