Merge pull request #704 from hydephp/add-a-filesystem-facade-for-easi…

…er-and-safer-filesystem-access

Refactor filesystem facade to move logic to the underlying class hydephp/develop@448d623

src/Facades/Filesystem.php

@@ -4,13 +4,10 @@
 
 namespace Hyde\Facades;
 
-use function array_map;
-use function collect;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Support\Contracts\FilesystemContract;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\File;
-use function is_array;
 
 /**
  * Proxies the Laravel File facade with extra features and helpers tailored for HydePHP.
@@ -67,8 +64,7 @@ public static function relativePath(string $path): string
      */
     public static function smartGlob(string $pattern, int $flags = 0): Collection
     {
-        return collect(self::glob($pattern, $flags))
-            ->map(fn (string $path): string => self::relativePath($path));
+        return self::kernel()->filesystem()->smartGlob($pattern, $flags);
     }
 
     /**
@@ -390,22 +386,18 @@ public static function cleanDirectory(string $directory): bool
         return self::filesystem()->cleanDirectory(self::absolutePath($directory));
     }
 
-    protected static function kernel(): HydeKernel
+    protected static function qualifyPossiblePathArray(array|string $paths): array|string
     {
-        return HydeKernel::getInstance();
+        return self::kernel()->filesystem()->qualifyPossiblePathArray($paths);
     }
 
     protected static function filesystem(): \Illuminate\Filesystem\Filesystem
     {
         return File::getFacadeRoot();
     }
 
-    protected static function qualifyPossiblePathArray(array|string $paths): array|string
+    protected static function kernel(): HydeKernel
     {
-        if (is_array($paths)) {
-            return array_map(fn ($path) => self::absolutePath($path), $paths);
-        }
-
-        return self::absolutePath($paths);
+        return HydeKernel::getInstance();
     }
 }

src/Foundation/Filesystem.php

@@ -4,6 +4,7 @@
 
 namespace Hyde\Foundation;
 
+use function collect;
 use function copy;
 use Hyde\Facades\Site;
 use Hyde\Framework\Services\DiscoveryService;
@@ -12,6 +13,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Illuminate\Support\Collection;
 use function is_string;
 use function str_replace;
 use function touch;
@@ -184,6 +186,22 @@ public function getDocumentationPagePath(string $path = ''): string
         return $this->getModelSourcePath(DocumentationPage::class, $path);
     }
 
+    public function smartGlob(string $pattern, int $flags = 0): Collection
+    {
+        return collect(\Hyde\Facades\Filesystem::glob($pattern, $flags))
+            ->map(fn (string $path): string => $this->pathToRelative($path));
+    }
+
+    /** @internal */
+    public function qualifyPossiblePathArray(array|string $paths): array|string
+    {
+        if (is_array($paths)) {
+            return array_map(fn ($path) => $this->pathToAbsolute($path), $paths);
+        }
+
+        return $this->pathToAbsolute($paths);
+    }
+
     /**
      * Implode path components into a string with directory separators.
      */

tests/Feature/FilesystemFacadeTest.php

@@ -13,6 +13,7 @@
 
 /**
  * @covers \Hyde\Facades\Filesystem
+ * @covers \Hyde\Foundation\Filesystem
  */
 class FilesystemFacadeTest extends TestCase
 {