Make falling back to inconclusive mime-type configurable.

thephpleague · Dec 4, 2023 · 03fcf05 · 03fcf05
1 parent d18526e
commit 03fcf05
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 4 deletions.
diff --git a/src/Local/FallbackMimeTypeDetector.php b/src/Local/FallbackMimeTypeDetector.php
@@ -5,7 +5,6 @@
 namespace League\Flysystem\Local;
 
 use League\MimeTypeDetection\MimeTypeDetector;
-
 use function in_array;
 
 class FallbackMimeTypeDetector implements MimeTypeDetector
@@ -20,7 +19,8 @@ class FallbackMimeTypeDetector implements MimeTypeDetector
 
     public function __construct(
         private MimeTypeDetector $detector,
-        private array $inconclusiveMimetypes = self::INCONCLUSIVE_MIME_TYPES
+        private array $inconclusiveMimetypes = self::INCONCLUSIVE_MIME_TYPES,
+        private bool $useInconclusiveMimeTypeFallback = false,
     ) {
     }
 
@@ -47,6 +47,6 @@ public function detectMimeTypeFromFile(string $path): ?string
             return $mimeType;
         }
 
-        return $this->detector->detectMimeTypeFromPath($path) ?? $mimeType;
+        return $this->detector->detectMimeTypeFromPath($path) ?? ($this->useInconclusiveMimeTypeFallback ? $mimeType : null);
     }
 }
diff --git a/src/Local/LocalFilesystemAdapter.php b/src/Local/LocalFilesystemAdapter.php
@@ -76,12 +76,16 @@ public function __construct(
         private int $linkHandling = self::DISALLOW_LINKS,
         MimeTypeDetector $mimeTypeDetector = null,
         bool $lazyRootCreation = false,
+        bool $useInconclusiveMimeTypeFallback = false,
     ) {
         $this->prefixer = new PathPrefixer($location, DIRECTORY_SEPARATOR);
         $visibility ??= new PortableVisibilityConverter();
         $this->visibility = $visibility;
         $this->rootLocation = $location;
-        $this->mimeTypeDetector = $mimeTypeDetector ?? new FallbackMimeTypeDetector(new FinfoMimeTypeDetector());
+        $this->mimeTypeDetector = $mimeTypeDetector ?? new FallbackMimeTypeDetector(
+            detector: new FinfoMimeTypeDetector(),
+            useInconclusiveMimeTypeFallback: $useInconclusiveMimeTypeFallback,
+        );
 
         if ( ! $lazyRootCreation) {
             $this->ensureRootDirectoryExists();

diff --git a/src/Local/LocalFilesystemAdapterTest.php b/src/Local/LocalFilesystemAdapterTest.php
@@ -630,6 +630,41 @@ public function getting_mimetype(): void
         $this->assertStringStartsWith('image/svg+xml', $adapter->mimeType('flysystem.svg')->mimeType());
     }
 
+    /**
+     * @test
+     */
+    public function failing_to_get_the_mimetype(): void
+    {
+        $adapter = new LocalFilesystemAdapter(static::ROOT);
+        $adapter->write(
+            'file.unknown',
+            '',
+            new Config()
+        );
+
+        $this->expectException(UnableToRetrieveMetadata::class);
+
+        $adapter->mimeType('file.unknown');
+    }
+
+    /**
+     * @test
+     */
+    public function allowing_inconclusive_mime_type(): void
+    {
+        $adapter = new LocalFilesystemAdapter(
+            location: static::ROOT,
+            useInconclusiveMimeTypeFallback: true,
+        );
+        $adapter->write(
+            'file.unknown',
+            '',
+            new Config()
+        );
+
+        $this->assertEquals('application/x-empty', $adapter->mimeType('file.unknown')->mimeType());
+    }
+
     /**
      * @test
      */