[10.x] league/flysystem 3.22.0 now prefer inclusive mime-type inste…

…ad of `null`. (#49229) * [10.x] Test Improvements Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * Apply fixes from StyleCI * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> --------- Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> Co-authored-by: StyleCI Bot <bot@styleci.io>
laravel · Dec 4, 2023 · 0947618 · 0947618
1 parent c59ef1f
commit 0947618
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/tests/Filesystem/FilesystemAdapterTest.php b/tests/Filesystem/FilesystemAdapterTest.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Tests\Filesystem;
 
 use Carbon\Carbon;
+use Composer\InstalledVersions;
 use GuzzleHttp\Psr7\Stream;
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Filesystem\FilesystemManager;
@@ -198,9 +199,19 @@ public function testJsonReturnsNullIfJsonDataIsInvalid()
         $this->assertNull($filesystemAdapter->json('file.json'));
     }
 
-    public function testMimeTypeNotDetected()
+    public function testMimeTypeDetectedPreferInclusiveMimeTypeOverNullAsEmpty()
     {
+        if (version_compare(InstalledVersions::getPrettyVersion('league/flysystem'), '3.22.0', '<')) {
+            $this->markTestSkipped('Require league/flysystem 3.22.0');
+        }
+
         $this->filesystem->write('unknown.mime-type', '');
+        $filesystemAdapter = new FilesystemAdapter($this->filesystem, $this->adapter);
+        $this->assertSame('application/x-empty', $filesystemAdapter->mimeType('unknown.mime-type'));
+    }
+
+    public function testMimeTypeNotDetected()
+    {
         $filesystemAdapter = new FilesystemAdapter($this->filesystem, $this->adapter);
         $this->assertFalse($filesystemAdapter->mimeType('unknown.mime-type'));
     }
@@ -531,8 +542,6 @@ public function testThrowExceptionsForPut()
 
     public function testThrowExceptionsForMimeType()
     {
-        $this->filesystem->write('unknown.mime-type', '');
-
         $adapter = new FilesystemAdapter($this->filesystem, $this->adapter, ['throw' => true]);
 
         try {