use the filesystem abstraction to check if a file/directory exists

Author: Baptouuuu

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Requires PHP `8.4`
 - `Innmind\OperatingSystem\Remote::sql()` now returns an `Innmind\Immutable\Attempt`
+- `Innmind\OperatingSystem\Filesystem::mount()` now longer automatically create the directory
 
 ## 6.2.0 - 2025-08-10
 

src/Config.php

@@ -10,6 +10,7 @@
 use Innmind\Filesystem\{
     Adapter as Filesystem,
     CaseSensitivity,
+    Exception\RecoverMount,
 };
 use Innmind\FileWatch\Watch;
 use Innmind\Server\Status\EnvironmentPath;
@@ -595,9 +596,21 @@ public function clock(): Clock
     #[\NoDiscard]
     public function filesystem(Path $path): Attempt
     {
-        return ($this->filesystem)($path, $this)->map(
-            fn($adapter) => ($this->mapFilesystem)($adapter, $this),
+        $map = fn(Filesystem $adapter): Filesystem => ($this->mapFilesystem)(
+            $adapter,
+            $this,
         );
+
+        return ($this->filesystem)($path, $this)
+            ->mapError(static fn($e) => match (true) {
+                $e instanceof RecoverMount => new RecoverMount(
+                    static fn() => $e
+                        ->recover()
+                        ->map($map),
+                ),
+                default => $e,
+            })
+            ->map($map);
     }
 
     /**

src/Filesystem.php

@@ -6,6 +6,8 @@
 use Innmind\Filesystem\{
     Adapter,
     File\Content,
+    Directory,
+    Name,
 };
 use Innmind\Url\Path;
 use Innmind\Server\Control\Server\Processes;
@@ -76,16 +78,28 @@ public function mount(Path $path): Attempt
     #[\NoDiscard]
     public function contains(Path $path): bool
     {
-        // todo find a way to not directly access the filesystem
-        if (!\file_exists($path->toString())) {
-            return false;
-        }
+        $dir = \rtrim(\dirname($path->toString()), '/').'/';
+        $name = \basename($path->toString());
 
-        if ($path->directory() && !\is_dir($path->toString())) {
-            return false;
+        $exists = $this
+            ->config
+            ->filesystem(Path::of($dir))
+            ->maybe();
+
+        // empty when the path === '/'
+        if ($name !== '') {
+            $exists = $exists
+                ->flatMap(static fn($adapter) => $adapter->get(Name::of($name)))
+                ->filter(static fn($file) => match (true) {
+                    $path->directory() && !($file instanceof Directory) => false,
+                    default => true,
+                });
         }
 
-        return true;
+        return $exists->match(
+            static fn() => true,
+            static fn() => false,
+        );
     }
 
     /**

tests/FactoryTest.php

@@ -15,6 +15,7 @@
     File\Content,
     Directory,
     CaseSensitivity,
+    Recover,
 };
 use Innmind\Url\Path;
 use Symfony\Component\Filesystem\Filesystem as FS;
@@ -62,6 +63,7 @@ public function testPersistingFileOnCaseInsensitiveFilesystem()
         $adapter = $os
             ->filesystem()
             ->mount(Path::of($path))
+            ->recover(Recover::mount(...))
             ->unwrap();
         $adapter->add(
             $directory = Directory::named('0')

tests/FilesystemTest.php

@@ -79,6 +79,9 @@ public function testContainsDirectory()
         \mkdir('/tmp/some-dir/');
         $this->assertTrue($filesystem->contains(Path::of('/tmp/some-dir/')));
         \rmdir('/tmp/some-dir/');
+        \file_put_contents('/tmp/foo', 'data');
+        $this->assertFalse($filesystem->contains(Path::of('/tmp/foo/')));
+        \unlink('/tmp/foo');
     }
 
     public function testWatch()