bug(test): give TestImage the same assertions as TestFile

src/Filesystem/Test/Node/FileAssertions.php

@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * This file is part of the zenstruck/filesystem package.
+ *
+ * (c) Kevin Bond <kevinbond@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Zenstruck\Filesystem\Test\Node;
+
+use League\Flysystem\UnableToGeneratePublicUrl;
+use Zenstruck\Assert;
+use Zenstruck\Filesystem\Node\File\Image;
+
+/**
+ * @author Kevin Bond <kevinbond@gmail.com>
+ */
+trait FileAssertions
+{
+    public function assertContentIs(string $expected): self
+    {
+        Assert::that($this->contents())->is($expected);
+
+        return $this;
+    }
+
+    public function assertContentIsNot(string $expected): self
+    {
+        Assert::that($this->contents())->isNot($expected);
+
+        return $this;
+    }
+
+    public function assertContentContains(string $expected): self
+    {
+        Assert::that($this->contents())->contains($expected);
+
+        return $this;
+    }
+
+    public function assertContentDoesNotContain(string $expected): self
+    {
+        Assert::that($this->contents())->doesNotContain($expected);
+
+        return $this;
+    }
+
+    public function assertMimeTypeIs(string $expected): self
+    {
+        Assert::that($this->mimeType())->is($expected);
+
+        return $this;
+    }
+
+    public function assertMimeTypeIsNot(string $expected): self
+    {
+        Assert::that($this->mimeType())->isNot($expected);
+
+        return $this;
+    }
+
+    public function assertSize(int $expected): self
+    {
+        Assert::that($this->size())->is($expected);
+
+        return $this;
+    }
+
+    public function assertChecksum(string $expected): self
+    {
+        Assert::that($this->checksum())->is($expected);
+
+        return $this;
+    }
+
+    public function dump(): static
+    {
+        $what = [
+            'path' => (string) $this->path(),
+            'mimeType' => $this->mimeType(),
+            'lastModified' => $this->lastModified(),
+            'size' => $this->size(),
+        ];
+
+        try {
+            $what['public_url'] = $this->publicUrl();
+        } catch (UnableToGeneratePublicUrl) {
+        }
+
+        if ($this instanceof Image) {
+            $what['image']['height'] = $this->dimensions()->height();
+            $what['image']['width'] = $this->dimensions()->width();
+        }
+
+        \function_exists('dump') ? dump($what) : \var_dump($what);
+
+        return $this;
+    }
+}

src/Filesystem/Test/Node/TestDirectory.php

@@ -33,7 +33,7 @@ public function assertCount(int $expected): self
         return $this;
     }
 
-    public function dump(): self
+    public function dump(): static
     {
         $files = \array_map(static fn($d) => (string) $d->path(), \iterator_to_array($this));
 
@@ -42,15 +42,6 @@ public function dump(): self
         return $this;
     }
 
-    /**
-     * @return no-return
-     */
-    public function dd(): void
-    {
-        $this->dump();
-        exit(1);
-    }
-
     protected function inner(): Directory
     {
         return $this->inner;

src/Filesystem/Test/Node/TestFile.php

@@ -11,103 +11,20 @@
 
 namespace Zenstruck\Filesystem\Test\Node;
 
-use League\Flysystem\UnableToGeneratePublicUrl;
-use Zenstruck\Assert;
 use Zenstruck\Filesystem\Node\File;
 use Zenstruck\Filesystem\Node\File\DecoratedFile;
-use Zenstruck\Filesystem\Node\File\Image;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
  */
 class TestFile extends TestNode implements File
 {
-    use DecoratedFile;
+    use DecoratedFile, FileAssertions;
 
     public function __construct(private File $inner)
     {
     }
 
-    public function assertContentIs(string $expected): self
-    {
-        Assert::that($this->contents())->is($expected);
-
-        return $this;
-    }
-
-    public function assertContentIsNot(string $expected): self
-    {
-        Assert::that($this->contents())->isNot($expected);
-
-        return $this;
-    }
-
-    public function assertContentContains(string $expected): self
-    {
-        Assert::that($this->contents())->contains($expected);
-
-        return $this;
-    }
-
-    public function assertContentDoesNotContain(string $expected): self
-    {
-        Assert::that($this->contents())->doesNotContain($expected);
-
-        return $this;
-    }
-
-    public function assertMimeTypeIs(string $expected): self
-    {
-        Assert::that($this->mimeType())->is($expected);
-
-        return $this;
-    }
-
-    public function assertMimeTypeIsNot(string $expected): self
-    {
-        Assert::that($this->mimeType())->isNot($expected);
-
-        return $this;
-    }
-
-    public function assertSize(int $expected): self
-    {
-        Assert::that($this->size())->is($expected);
-
-        return $this;
-    }
-
-    public function assertChecksum(string $expected): self
-    {
-        Assert::that($this->checksum())->is($expected);
-
-        return $this;
-    }
-
-    public function dump(): self
-    {
-        $what = [
-            'path' => (string) $this->path(),
-            'mimeType' => $this->mimeType(),
-            'lastModified' => $this->lastModified(),
-            'size' => $this->size(),
-        ];
-
-        try {
-            $what['public_url'] = $this->publicUrl();
-        } catch (UnableToGeneratePublicUrl) {
-        }
-
-        if ($this instanceof Image) {
-            $what['image']['height'] = $this->dimensions()->height();
-            $what['image']['width'] = $this->dimensions()->width();
-        }
-
-        \function_exists('dump') ? dump($what) : \var_dump($what);
-
-        return $this;
-    }
-
     protected function inner(): File
     {
         return $this->inner;

src/Filesystem/Test/Node/TestImage.php

@@ -22,7 +22,7 @@
  */
 final class TestImage extends TestNode implements Image
 {
-    use DecoratedFile, DecoratedImage;
+    use DecoratedFile, DecoratedImage, FileAssertions;
 
     public function __construct(private Image $inner)
     {

src/Filesystem/Test/Node/TestNode.php

@@ -86,6 +86,17 @@ public function assertLastModified(string|\DateTimeInterface|callable $expected)
         return $this;
     }
 
+    abstract public function dump(): static;
+
+    /**
+     * @return no-return
+     */
+    public function dd(): void
+    {
+        $this->dump();
+        exit(1);
+    }
+
     protected function inner(): Node
     {
         return $this->inner;

tests/Filesystem/Test/TestFilesystemTest.php

@@ -62,6 +62,7 @@ public function can_make_assertions(): void
                     ->assertContentContains('1')
                     ->assertContentDoesNotContain('foo')
                     ->assertMimeTypeIs('text/plain')
+                    ->assertSize(9)
                     ->assertMimeTypeIsNot('foo')
                     ->assertLastModified(function(\DateTimeInterface $actual) {
                         $this->assertTrue($actual->getTimestamp() > 0);
@@ -71,6 +72,8 @@ public function can_make_assertions(): void
             })
             ->assertImageExists('symfony.png', function(TestImage $image) {
                 $image
+                    ->assertMimeTypeIs('image/png')
+                    ->assertSize(10862)
                     ->assertHeight(678)
                     ->assertWidth(563)
                 ;