ENGCOM-7227: Add follow symlinks to support linked folders #27413

Author: slavvka

dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php

@@ -64,6 +64,32 @@ protected function tearDown(): void
         $this->removeGeneratedDirectory();
     }
 
+    /**
+     * Tests read directory with symlynked folders.
+     *
+     * @return void
+     */
+    public function testReadDirectoryRecursivelyWithSymlinkedFolders(): void
+    {
+        $sourceDirectory = $this->generatedPath . '/source';
+        $destinationDirectory = $this->generatedPath . '/destination';
+
+        $this->driver->createDirectory($sourceDirectory);
+        $this->driver->createDirectory($sourceDirectory . '/directory1');
+        $this->driver->createDirectory($destinationDirectory);
+
+        $linkName = $destinationDirectory . '/link';
+        $this->driver->symlink($sourceDirectory, $linkName);
+
+        $paths = [
+            $destinationDirectory . '/link' . '/directory1',
+            $destinationDirectory . '/link'
+
+        ];
+        $actual = $this->driver->readDirectoryRecursively($destinationDirectory);
+        $this->assertEquals($paths, $actual);
+    }
+
     /**
      * Tests directory recursive read.
      *

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

@@ -254,7 +254,10 @@ private function mkdirRecursive($path, $permissions = 0777)
     public function readDirectory($path)
     {
         try {
-            $flags = \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS;
+            $flags = \FilesystemIterator::SKIP_DOTS |
+                     \FilesystemIterator::UNIX_PATHS |
+                     \RecursiveDirectoryIterator::FOLLOW_SYMLINKS;
+            
             $iterator = new \FilesystemIterator($path, $flags);
             $result = [];
             /** @var \FilesystemIterator $file */
@@ -946,7 +949,10 @@ protected function getScheme($scheme = null)
     public function readDirectoryRecursively($path = null)
     {
         $result = [];
-        $flags = \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS;
+        $flags = \FilesystemIterator::SKIP_DOTS |
+                 \FilesystemIterator::UNIX_PATHS |
+                 \RecursiveDirectoryIterator::FOLLOW_SYMLINKS;
+ 
         try {
             $iterator = new \RecursiveIteratorIterator(
                 new \RecursiveDirectoryIterator($path, $flags),