Prevent regenerating asset meta file for non-images (#3609)

statamic · Apr 28, 2021 · 14cc1fa · 14cc1fa
1 parent e8d1696
commit 14cc1fa
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
@@ -533,6 +533,10 @@ public function move($folder, $filename = null)
      */
     public function dimensions()
     {
+        if (! $this->isImage()) {
+            return [null, null];
+        }
+
         return [$this->meta('width'), $this->meta('height')];
     }
 

diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
@@ -690,6 +690,28 @@ public function it_gets_dimensions()
         $this->assertEquals(60, $asset->height());
     }
 
+    /** @test */
+    public function it_gets_no_dimensions_for_non_images()
+    {
+        $file = UploadedFile::fake()->create('file.txt');
+        Storage::fake('test')->putFileAs('foo', $file, 'file.txt');
+        $asset = (new Asset)->path('foo/file.txt')->container($this->container);
+
+        $this->assertEquals([null, null], $asset->dimensions());
+        $this->assertEquals(null, $asset->width());
+        $this->assertEquals(null, $asset->height());
+    }
+
+    /** @test */
+    public function it_doesnt_regenerate_the_meta_file_when_getting_non_image_dimensions()
+    {
+        $asset = $this->partialMock(Asset::class);
+
+        $asset->shouldReceive('meta')->times(0);
+
+        $this->assertEquals([null, null], $asset->dimensions());
+    }
+
     /** @test */
     public function it_gets_file_size_in_bytes()
     {