rename Directory::files() to ::all()

Innmind · Oct 15, 2023 · 5bd8e41 · 5bd8e41
1 parent 80a3de8
commit 5bd8e41
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - `Innmind\Filesystem\Directory` no longer extends `File`, all previous function typed against `File` are now typed `File|Directory`
 - `Innmind\Filesystem\File` is now a final class instead of an interface
 - `Innmind\Filesystem\Directory` is now a final class instead of an interface
+- `Innmind\Filesystem\Directory::files()` has been renamed to `::all()`
 
 ### Removed
 

diff --git a/properties/Adapter/AllRootFilesAreAccessible.php b/properties/Adapter/AllRootFilesAreAccessible.php
@@ -32,7 +32,6 @@ public function ensureHeldBy(Assert $assert, object $adapter): object
     {
         $adapter
             ->root()
-            ->files()
             ->foreach(static function($file) use ($assert, $adapter) {
                 $assert->true($adapter->contains($file->name()));
 

diff --git a/properties/Adapter/ReAddingFilesHasNoSideEffect.php b/properties/Adapter/ReAddingFilesHasNoSideEffect.php
@@ -32,7 +32,6 @@ public function ensureHeldBy(Assert $assert, object $adapter): object
     {
         $adapter
             ->root()
-            ->files()
             ->foreach(static function($file) use ($assert, $adapter) {
                 $adapter->add($file);
                 $assert->true($adapter->contains($file->name()));

diff --git a/properties/Directory/AllFilesAreAccessible.php b/properties/Directory/AllFilesAreAccessible.php
@@ -32,7 +32,7 @@ public function ensureHeldBy(Assert $assert, object $directory): object
                 [],
                 static fn($all, $file) => \array_merge($all, [$file]),
             ),
-            $directory->files()->toList(),
+            $directory->all()->toList(),
         );
 
         return $directory;

diff --git a/properties/Directory/FlatMapFiles.php b/properties/Directory/FlatMapFiles.php
@@ -42,7 +42,7 @@ public static function any(): Set
 
     public function applicableTo(object $directory): bool
     {
-        return !$directory->files()->empty();
+        return !$directory->all()->empty();
     }
 
     public function ensureHeldBy(Assert $assert, object $directory): object
@@ -62,14 +62,14 @@ public function ensureHeldBy(Assert $assert, object $directory): object
             ->same($directory2);
         $assert->same($directory->name()->toString(), $directory2->name()->toString());
         $assert
-            ->expected($directory->files())
+            ->expected($directory->all())
             ->not()
-            ->same($directory2->files());
-        $assert->same($directory->files()->size() * 2, $directory2->files()->size());
+            ->same($directory2->all());
+        $assert->same($directory->all()->size() * 2, $directory2->all()->size());
         $assert->same(
             [$this->file1->content(), $this->file2->content()],
             $directory2
-                ->files()
+                ->all()
                 ->map(static fn($file) => $file->content())
                 ->distinct()
                 ->toList(),

diff --git a/properties/Directory/MapFiles.php b/properties/Directory/MapFiles.php
@@ -33,7 +33,7 @@ public static function any(): Set
 
     public function applicableTo(object $directory): bool
     {
-        return !$directory->files()->empty();
+        return !$directory->all()->empty();
     }
 
     public function ensureHeldBy(Assert $assert, object $directory): object
@@ -46,14 +46,14 @@ public function ensureHeldBy(Assert $assert, object $directory): object
             ->same($directory2);
         $assert->same($directory->name()->toString(), $directory2->name()->toString());
         $assert
-            ->expected($directory->files())
+            ->expected($directory->all())
             ->not()
-            ->same($directory2->files());
-        $assert->same($directory->files()->size(), $directory2->files()->size());
+            ->same($directory2->all());
+        $assert->same($directory->all()->size(), $directory2->all()->size());
         $assert->same(
             [$this->file->content()],
             $directory2
-                ->files()
+                ->all()
                 ->map(static fn($file) => $file->content())
                 ->distinct()
                 ->toList(),

diff --git a/properties/Directory/Rename.php b/properties/Directory/Rename.php
@@ -50,8 +50,8 @@ public function ensureHeldBy(Assert $assert, object $directory): object
             ->same($directory->name());
         $assert->same($this->name, $directory2->name());
         $assert->same(
-            $directory->files(),
-            $directory2->files(),
+            $directory->all(),
+            $directory2->all(),
         );
         $assert->same(
             $directory->removed(),

diff --git a/properties/Directory/ThrowWhenFlatMappingToSameFileTwice.php b/properties/Directory/ThrowWhenFlatMappingToSameFileTwice.php
@@ -42,7 +42,7 @@ public static function any(): Set
 
     public function applicableTo(object $directory): bool
     {
-        return $directory->files()->size() >= 2;
+        return $directory->all()->size() >= 2;
     }
 
     public function ensureHeldBy(Assert $assert, object $directory): object
@@ -64,7 +64,7 @@ public function ensureHeldBy(Assert $assert, object $directory): object
                         ),
                     ),
                 ))
-                ->files()
+                ->all()
                 ->toList();
 
             $assert->fail('It should throw');

diff --git a/properties/Directory/ThrowWhenMappingToSameFileTwice.php b/properties/Directory/ThrowWhenMappingToSameFileTwice.php
@@ -34,20 +34,20 @@ public static function any(): Set
 
     public function applicableTo(object $directory): bool
     {
-        return $directory->files()->size() >= 2;
+        return $directory->all()->size() >= 2;
     }
 
     public function ensureHeldBy(Assert $assert, object $directory): object
     {
         try {
-            // calling toList in case it uses a lazy Set of files, so we need to
-            // unwrap the list to trigger the safeguard
+            // calling toList in case it uses a lazy Sequence of files, so we
+            // need to unwrap the list to trigger the safeguard
             $directory
                 ->map(fn() => File::of(
                     $this->file->name(),
                     $this->file->content(),
                 ))
-                ->files()
+                ->all()
                 ->toList();
 
             $assert->fail('It should throw');

diff --git a/src/Adapter/Filesystem.php b/src/Adapter/Filesystem.php
@@ -136,7 +136,7 @@ private function createFileAt(Path $path, File|Directory $file): void
         if ($file instanceof Directory) {
             $this->filesystem->mkdir($path->toString());
             $persisted = $file
-                ->files()
+                ->all()
                 ->map(function($file) use ($path) {
                     $this->createFileAt($path, $file);
 

diff --git a/src/Directory.php b/src/Directory.php
@@ -177,7 +177,7 @@ public function map(callable $map): self
     public function flatMap(callable $map): self
     {
         /** @var callable(File|self): Sequence<File|self> */
-        $map = static fn(File|self $file): Sequence => $map($file)->files();
+        $map = static fn(File|self $file): Sequence => $map($file)->all();
 
         return new self(
             $this->name,
@@ -213,7 +213,7 @@ public function removed(): Set
     /**
      * @return Sequence<File|self>
      */
-    public function files(): Sequence
+    public function all(): Sequence
     {
         return $this->files;
     }

diff --git a/tests/Adapter/FilesystemTest.php b/tests/Adapter/FilesystemTest.php
@@ -220,7 +220,7 @@ public function testRoot()
         \mkdir('/tmp/test/baz');
         \file_put_contents('/tmp/test/baz/foobar', 'baz');
 
-        $all = $adapter->root()->files();
+        $all = $adapter->root()->all();
         $this->assertCount(3, $all);
         $all = Map::of(
             ...$all
@@ -427,7 +427,7 @@ public function testThrowsWhenListContainsALink()
         $this->expectException(LinksAreNotSupported::class);
         $this->expectExceptionMessage($path.'bar');
 
-        $filesystem->root()->files()->toList();
+        $filesystem->root()->all()->toList();
     }
 
     public function testDotFilesAreListed()
@@ -442,7 +442,7 @@ public function testDotFilesAreListed()
 
                 $filesystem = Filesystem::mount(Path::of($path));
 
-                $all = $filesystem->root()->files()->toList();
+                $all = $filesystem->root()->all()->toList();
                 $this->assertCount(1, $all);
                 $this->assertSame($name, $all[0]->name()->toString());
             });

diff --git a/tests/Adapter/InMemoryTest.php b/tests/Adapter/InMemoryTest.php
@@ -65,7 +65,7 @@ public function testRoot()
             Content::ofString('bar'),
         ));
 
-        $all = $adapter->root()->files();
+        $all = $adapter->root()->all();
         $this->assertSame(
             [$foo, $bar],
             $all->toList(),

diff --git a/tests/Adapter/LoggerTest.php b/tests/Adapter/LoggerTest.php
@@ -129,6 +129,6 @@ public function testRoot()
                 $all,
             ));
 
-        $this->assertSame([$file], $adapter->root()->files()->toList());
+        $this->assertSame([$file], $adapter->root()->all()->toList());
     }
 }