Next major release

.github/workflows/ci.yml

@@ -4,15 +4,13 @@ on: [push]
 
 jobs:
   blackbox:
-    uses: innmind/github-workflows/.github/workflows/black-box-matrix.yml@main
+    uses: innmind/github-workflows/.github/workflows/black-box-matrix.yml@next
     with:
       scenarii: 20
   coverage:
-    uses: innmind/github-workflows/.github/workflows/coverage-matrix.yml@main
+    uses: innmind/github-workflows/.github/workflows/coverage-matrix.yml@next
     secrets: inherit
   psalm:
-    uses: innmind/github-workflows/.github/workflows/psalm-matrix.yml@main
+    uses: innmind/github-workflows/.github/workflows/psalm-matrix.yml@next
   cs:
-    uses: innmind/github-workflows/.github/workflows/cs.yml@main
-    with:
-      php-version: '8.2'
+    uses: innmind/github-workflows/.github/workflows/cs.yml@next

.github/workflows/extensive.yml

@@ -0,0 +1,12 @@
+name: Extensive CI
+
+on:
+  push:
+    tags:
+      - '*'
+    paths:
+      - '.github/workflows/extensive.yml'
+
+jobs:
+  blackbox:
+    uses: innmind/github-workflows/.github/workflows/extensive.yml@main

.gitignore

@@ -1,4 +1,3 @@
 composer.lock
 vendor
-.phpunit.result.cache
 .cache

CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [Unreleased]
+
+### Added
+
+- `Innmind\Filesystem\Recover`
+
+### Changed
+
+- Requires PHP `8.4`
+- Links are not silently ignored when listing files/directories. An error is still returned when trying to remove a link.
+- `Innmind\Filesystem\Adapter\Filesystem::mount()` now returns an `Innmind\Immutable\Attempt`
+- `Innmind\Filesystem\Directory::removed()` is now flagged as internal
+- `Innmind\Filesystem\Adapter` is now a final class
+- `Innmind\Filesystem\Adapter\Filesystem` is now flagged as internal
+- `Innmind\Filesystem\Adapter\InMemory` is now flagged as internal
+- `Innmind\Filesystem\Adapter\Logger` is now flagged as internal
+- `Innmind\Filesystem\Adapter::mount()` no longer automatically create the directory if it doesn't exist
+
+### Removed
+
+- `Innmind\Filesystem\Adapter\InMemory::new()`
+- `Innmind\Filesystem\Adapter\Filesystem::withCaseSensitivity()`, case sensitivity can be specified as the second argument of `::mount()`
+- `Innmind\Filesystem\Exception\*`
+- `Innmind\Filesystem\File\Content::atPath()`, use `Content::io()` instead
+
 ## 8.1.0 - 2025-05-09
 
 ### Added

blackbox.php

@@ -26,9 +26,6 @@
             )
             ->scenariiPerProof(1),
     )
-    ->when(
-        \method_exists(Application::class, 'allowProofsToNotMakeAnyAssertions'),
-        static fn($app) => $app->allowProofsToNotMakeAnyAssertions(),
-    )
+    ->allowProofsToNotMakeAnyAssertions()
     ->tryToProve(Load::everythingIn(__DIR__.'/proofs/'))
     ->exit();

composer.json

@@ -15,14 +15,16 @@
         "issues": "http://github.com/Innmind/filesystem/issues"
     },
     "require": {
-        "php": "~8.2",
-        "innmind/immutable": "~4.15|~5.0",
-        "symfony/filesystem": "~6.0|~7.0",
-        "innmind/media-type": "~2.1",
-        "innmind/url": "~4.2",
+        "php": "~8.4",
+        "innmind/immutable": "dev-next",
+        "innmind/media-type": "dev-next",
+        "innmind/url": "dev-next",
         "psr/log": "~3.0",
-        "innmind/io": "^3.0.1",
-        "innmind/validation": "~2.0"
+        "innmind/io": "dev-next",
+        "innmind/validation": "dev-next",
+        "innmind/time-continuum": "dev-next",
+        "innmind/ip": "dev-next",
+        "innmind/mutable": "dev-next"
     },
     "autoload": {
         "psr-4": {
@@ -38,8 +40,9 @@
     },
     "require-dev": {
         "innmind/static-analysis": "^1.2.1",
-        "innmind/black-box": "^6.0.2",
+        "innmind/black-box": "~6.5",
         "innmind/coding-standard": "~2.0",
+        "symfony/filesystem": "~6.0|~7.0",
         "ramsey/uuid": "^4.6"
     },
     "conflict": {

proofs/adapter/filesystem.php

@@ -2,67 +2,115 @@
 declare(strict_types = 1);
 
 use Innmind\Filesystem\{
-    Adapter\Filesystem,
+    Adapter,
     Directory,
     File,
     File\Content,
     CaseSensitivity,
+    Recover,
+};
+use Innmind\IO\{
+    IO,
+    Simulation\Disk,
 };
 use Innmind\Url\Path;
-use Properties\Innmind\Filesystem\Adapter;
+use Properties\Innmind\Filesystem\Adapter as PAdapter;
 use Innmind\BlackBox\Set;
 use Symfony\Component\Filesystem\Filesystem as FS;
 
 return static function() {
+    $path = \rtrim(\sys_get_temp_dir(), '/').'/innmind/filesystem/';
+
     yield properties(
         'Filesystem properties',
-        Adapter::properties(),
-        Set::call(static function() {
-            $path = \sys_get_temp_dir().'/innmind/filesystem/';
+        PAdapter::properties(),
+        Set::call(static function() use ($path) {
             (new FS)->remove($path);
 
-            return Filesystem::mount(Path::of($path))->withCaseSensitivity(match (\PHP_OS) {
-                'Darwin' => CaseSensitivity::insensitive,
-                default => CaseSensitivity::sensitive,
-            });
+            return Adapter::mount(
+                Path::of($path),
+                match (\PHP_OS) {
+                    'Darwin' => CaseSensitivity::insensitive,
+                    default => CaseSensitivity::sensitive,
+                },
+            )
+                ->recover(Recover::mount(...))
+                ->unwrap();
         }),
     );
 
-    foreach (Adapter::alwaysApplicable() as $property) {
+    foreach (PAdapter::alwaysApplicable() as $property) {
         yield property(
             $property,
-            Set::call(static function() {
-                $path = \sys_get_temp_dir().'/innmind/filesystem/';
+            Set::call(static function() use ($path) {
                 (new FS)->remove($path);
 
-                return Filesystem::mount(Path::of($path))->withCaseSensitivity(match (\PHP_OS) {
-                    'Darwin' => CaseSensitivity::insensitive,
-                    default => CaseSensitivity::sensitive,
-                });
+                return Adapter::mount(
+                    Path::of($path),
+                    match (\PHP_OS) {
+                        'Darwin' => CaseSensitivity::insensitive,
+                        default => CaseSensitivity::sensitive,
+                    },
+                )
+                    ->recover(Recover::mount(...))
+                    ->unwrap();
             }),
         )->named('Filesystem');
     }
 
     yield test(
         'Regression adding file in directory due to case sensitivity',
-        static function($assert) {
-            $property = new Adapter\AddRemoveAddModificationsStillAddTheFile(
+        static function($assert) use ($path) {
+            $property = new PAdapter\AddRemoveAddModificationsStillAddTheFile(
                 Directory::named('0')
                     ->add($file = File::named('L', Content::none()))
                     ->remove($file->name()),
                 File::named('l', Content::none()),
             );
 
-            $path = \sys_get_temp_dir().'/innmind/filesystem/';
             (new FS)->remove($path);
-            $adapter = Filesystem::mount(Path::of($path))->withCaseSensitivity(match (\PHP_OS) {
-                'Darwin' => CaseSensitivity::insensitive,
-                default => CaseSensitivity::sensitive,
-            });
+            $adapter = Adapter::mount(
+                Path::of($path),
+                match (\PHP_OS) {
+                    'Darwin' => CaseSensitivity::insensitive,
+                    default => CaseSensitivity::sensitive,
+                },
+            )
+                ->recover(Recover::mount(...))
+                ->unwrap();
 
             $property->ensureHeldBy($assert, $adapter);
 
             (new FS)->remove($path);
         },
     );
+
+    foreach (CaseSensitivity::cases() as $case) {
+        yield properties(
+            'Filesystem properties on simulated disk',
+            PAdapter::properties(),
+            Set::call(static fn() => Adapter::mount(
+                Path::of('/'),
+                $case,
+                IO::simulation(
+                    IO::fromAmbientAuthority(),
+                    Disk::new(),
+                ),
+            )->unwrap()),
+        );
+
+        foreach (PAdapter::alwaysApplicable() as $property) {
+            yield property(
+                $property,
+                Set::call(static fn() => Adapter::mount(
+                    Path::of('/'),
+                    $case,
+                    IO::simulation(
+                        IO::fromAmbientAuthority(),
+                        Disk::new(),
+                    ),
+                )->unwrap()),
+            )->named('Filesystem on simulated disk');
+        }
+    }
 };

proofs/adapter/inMemory.php

@@ -1,30 +1,46 @@
 <?php
 declare(strict_types = 1);
 
-use Innmind\Filesystem\Adapter\InMemory;
-use Properties\Innmind\Filesystem\Adapter;
+use Innmind\Filesystem\{
+    Adapter,
+    Name,
+    File,
+    File\Content,
+};
+use Properties\Innmind\Filesystem\Adapter as PAdapter;
 use Innmind\BlackBox\Set;
 
 return static function() {
-    yield properties(
-        'InMemory properties',
-        Adapter::properties(),
-        Set::call(InMemory::new(...)),
-    );
     yield properties(
         'InMemory properties emulating filesystem',
-        Adapter::properties(),
-        Set::call(InMemory::emulateFilesystem(...)),
+        PAdapter::properties(),
+        Set::call(Adapter::inMemory(...)),
     );
 
-    foreach (Adapter::alwaysApplicable() as $property) {
-        yield property(
-            $property,
-            Set::call(InMemory::new(...)),
-        )->named('InMemory');
+    foreach (PAdapter::alwaysApplicable() as $property) {
         yield property(
             $property,
-            Set::call(InMemory::emulateFilesystem(...)),
+            Set::call(Adapter::inMemory(...)),
         )->named('InMemory emulating filesystem');
     }
+
+    yield test(
+        'Adding a file in a directory should not remove other files starting with the same name',
+        static function($assert) {
+            $adapter = Adapter::inMemory();
+            $property = new PAdapter\AddDirectoryFromAnotherAdapterWithFileAdded(
+                Name::of('0'),
+                File::named(
+                    '+1',
+                    Content::none(),
+                ),
+                File::named(
+                    '+',
+                    Content::none(),
+                ),
+            );
+
+            $property->ensureHeldBy($assert, $adapter);
+        },
+    );
 };

proofs/file/content.php

@@ -26,15 +26,6 @@
                 static fn($lines) => Model::ofString(\implode("\n", $lines)),
             ),
         ],
-        [
-            'Content::atPath()',
-            Set::of('LICENSE', 'CHANGELOG.md', 'composer.json')
-                ->map(Path::of(...))
-                ->map(static fn($path) => Model::atPath(
-                    $io,
-                    $path,
-                )),
-        ],
         [
             'Content::io()',
             Set::of('LICENSE', 'CHANGELOG.md', 'composer.json')
@@ -262,10 +253,12 @@ static function($assert, $a, $b) use ($io) {
     yield test(
         'Content::ofChunks()->size() does not load the whole file in memory',
         static function($assert) use ($io) {
-            $atPath = Model::atPath(
-                $io,
-                Path::of('samples/sample.pdf'),
-            );
+            $atPath = $io
+                ->files()
+                ->access(Path::of('samples/sample.pdf'))
+                ->map(static fn($file) => $file->read())
+                ->map(Model::io(...))
+                ->unwrap();
             $content = Model::ofChunks($atPath->chunks());
 
             $assert

properties/Adapter/AddFileWithSameNameAsDirectoryDeleteTheDirectory.php

@@ -51,7 +51,7 @@ public function applicableTo(object $adapter): bool
 
     public function ensureHeldBy(Assert $assert, object $adapter): object
     {
-        $adapter->remove($this->file->name())->unwrap();
+        $_ = $adapter->remove($this->file->name())->unwrap();
         $assert
             ->object($adapter->add($this->directory)->unwrap())
             ->instance(SideEffect::class);

properties/Adapter/AddRemoveAddModificationsStillAddTheFile.php

@@ -48,7 +48,7 @@ public function applicableTo(object $adapter): bool
 
     public function ensureHeldBy(Assert $assert, object $adapter): object
     {
-        $adapter
+        $_ = $adapter
             ->add(
                 $this
                     ->directory