Add tests and remove Client instanciation from Configuration

Author: GromNaN

src/MongoDBServiceProvider.php

@@ -4,6 +4,7 @@
 
 namespace MongoDB\Laravel;
 
+use Closure;
 use Illuminate\Cache\CacheManager;
 use Illuminate\Cache\Repository;
 use Illuminate\Filesystem\FilesystemAdapter;
@@ -14,7 +15,6 @@
 use League\Flysystem\Filesystem;
 use League\Flysystem\GridFS\GridFSAdapter;
 use League\Flysystem\ReadOnly\ReadOnlyFilesystemAdapter;
-use MongoDB\Client;
 use MongoDB\GridFS\Bucket;
 use MongoDB\Laravel\Cache\MongoStore;
 use MongoDB\Laravel\Eloquent\Model;
@@ -106,23 +106,15 @@ private function registerFlysystemAdapter(): void
 
                     $bucket = $connection->getMongoClient()
                         ->selectDatabase($config['database'] ?? $connection->getDatabaseName())
-                        ->selectGridFSBucket(['bucketName' => $config['bucket'] ?? 'fs']);
-                } elseif (isset($config['mongodb_uri'])) {
-                    // Create a new MongoDB client from the config
-                    if (! isset($config['database'])) {
-                        throw new InvalidArgumentException('MongoDB "database" name is required for filesystem GridFS configuration');
-                    }
+                        ->selectGridFSBucket(['bucketName' => $config['bucket'] ?? 'fs', 'disableMD5' => true]);
 
-                    $bucket = (new Client($config['mongodb_uri'], $config['mongodb_uri_options'] ?? [], $config['mongodb_driver_options'] ?? []))
-                        ->selectDatabase($config['database'])
-                        ->selectGridFSBucket(['bucketName' => $config['bucket'] ?? 'fs']);
-                } elseif (isset($config['bucket'])) {
                     // Allows setting the bucket instance directly
+                } elseif (isset($config['bucket'])) {
                     $bucket = $config['bucket'];
+                    // Resolves the "bucket" service
                     if (is_string($bucket)) {
-                        // Resolves the "bucket" service
                         $bucket = $app->get($bucket);
-                    } elseif ($bucket instanceof \Closure) {
+                    } elseif ($bucket instanceof Closure) {
                         $bucket = $bucket($app, $config);
                     }
 

tests/FilesystemsTest.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace MongoDB\Laravel\Tests;
+
+use Generator;
+use Illuminate\Foundation\Application;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use League\Flysystem\UnableToWriteFile;
+use PHPUnit\Framework\Attributes\DataProvider;
+
+use function env;
+use function microtime;
+
+class FilesystemsTest extends TestCase
+{
+    public function tearDown(): void
+    {
+        DB::connection('mongodb')->getMongoDB()->drop();
+
+        parent::tearDown();
+    }
+
+    public static function provideDiskConfigurations(): Generator
+    {
+        yield [
+            'gridfs-connection-minimal',
+            [
+                'driver' => 'gridfs',
+                'connection' => 'mongodb',
+            ],
+        ];
+
+        yield [
+            'gridfs-connection-full',
+            [
+                'driver' => 'gridfs',
+                'connection' => 'mongodb',
+                'database' => env('MONGODB_DATABASE', 'unittest'),
+                'bucket' => 'fs',
+                'prefix' => 'foo/',
+            ],
+        ];
+
+        yield [
+            'gridfs-bucket-service',
+            [
+                'driver' => 'gridfs',
+                'bucket' => 'bucket',
+            ],
+        ];
+
+        yield [
+            'gridfs-bucket-factory',
+            [
+                'driver' => 'gridfs',
+                'bucket' => static fn (Application $app) => $app['db']
+                    ->connection('mongodb')
+                    ->getMongoDB()
+                    ->selectGridFSBucket(),
+            ],
+        ];
+    }
+
+    #[DataProvider('provideDiskConfigurations')]
+    public function testConfig(string $name, array $options)
+    {
+        // Service used by "gridfs-bucket-service"
+        $this->app->singleton('bucket', static fn (Application $app) => $app['db']
+            ->connection('mongodb')
+            ->getMongoDB()
+            ->selectGridFSBucket());
+
+        $this->app['config']->set('filesystems.disks.' . $name, $options);
+
+        $disk = Storage::disk($name);
+        $disk->put($filename = $name . '.txt', $value = microtime());
+        $this->assertEquals($value, $disk->get($filename), 'File saved');
+    }
+
+    public function testReadOnlyAndThrowOption()
+    {
+        $this->app['config']->set('filesystems.disks.gridfs-readonly', [
+            'driver' => 'gridfs',
+            'connection' => 'mongodb',
+            // Use ReadOnlyAdapter
+            'read-only' => true,
+            // Throw exceptions
+            'throw' => true,
+        ]);
+
+        $disk = Storage::disk('gridfs-readonly');
+
+        $this->expectException(UnableToWriteFile::class);
+        $this->expectExceptionMessage('This is a readonly adapter.');
+
+        $disk->put('file.txt', '');
+    }
+}

tests/config/filesystems.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Foundation\Application;
+
+return [
+    'disks' => [
+        'gridfs-connection-minimal' => [
+            'driver' => 'gridfs',
+            'connection' => 'mongodb',
+        ],
+
+        'gridfs-connection-full' => [
+            'driver' => 'gridfs',
+            'connection' => 'mongodb',
+        ],
+
+        'gridfs-bucket-service' => [
+            'driver' => 'gridfs',
+            'bucket' => 'bucket',
+        ],
+
+        'gridfs-bucket-factory' => [
+            'driver' => 'gridfs',
+            'bucket' => static fn (Application $app) => $app['db']
+                ->connection('mongodb')
+                ->getMongoDB()
+                ->selectGridFSBucket(),
+        ],
+    ],
+];