fix: iterator for local filesystems

oat-sa · Oct 15, 2024 · 810ab96 · 810ab96
1 parent ada7d99
commit 810ab96
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 409 deletions.
diff --git a/common/oatbox/filesystem/Directory.php b/common/oatbox/filesystem/Directory.php
@@ -87,14 +87,13 @@ public function getFlyIterator($flags = null)
         $contents = $this->getFileSystem()->listContents($this->getPrefix(), $recursive);
 
         if (!empty($contents)) {
-            $dirPath = $this->getPrefix();
             foreach ($contents as $content) {
                 if ($withDirectories && $content['type'] == 'dir') {
-                    $iterator[] = $this->getDirectory(str_replace($dirPath, '', $content['path']));
+                    $iterator[] = $this->getDirectory($this->stripDirectoryPath($content['path']));
                 }
 
                 if ($withFiles && $content['type'] == 'file') {
-                    $iterator[] = $this->getFile(str_replace($dirPath, '', $content['path']));
+                    $iterator[] = $this->getFile($this->stripDirectoryPath($content['path']));
                 }
             }
         }
@@ -207,4 +206,10 @@ public function rename($path)
 
         return true;
     }
+
+    private function stripDirectoryPath(string $path): string
+    {
+        $strippedPath = str_replace($this->getPrefix(), '', $path);
+        return str_replace($this->getFileSystemId(), '', $strippedPath);
+    }
 }
diff --git a/common/oatbox/filesystem/FileSystemService.php b/common/oatbox/filesystem/FileSystemService.php
@@ -152,7 +152,7 @@ public function registerLocalFileSystem($id, $path)
         $adapters = $this->hasOption(self::OPTION_ADAPTERS) ? $this->getOption(self::OPTION_ADAPTERS) : [];
         $adapters[$id] = [
             'class' => LocalFilesystemAdapter::class,
-            'options' => ['root' => $path]
+            'options' => ['location' => $path]
         ];
         $this->setOption(self::OPTION_ADAPTERS, $adapters);
         return true;

diff --git a/common/oatbox/filesystem/utils/FlyWrapperTrait.php b/common/oatbox/filesystem/utils/FlyWrapperTrait.php