fix: Avoid manipulating config when resolving disks (#901)

* fix: Avoid manipulating config when resolving disks

This commit updates the storage integration such that it does not manipulate the filesystems
config when a disk is resolved.
This fixes an issue when using scoped disks where the disk's prefix property was injected
into the parent disk's config, making the parent disk unusable from that point forward.

* Change approach

* Fix phpstan

* CS

---------

Co-authored-by: Alex Bouma <[email protected]>

Author: hansnn

src/Sentry/Laravel/Features/Storage/Integration.php

@@ -48,10 +48,16 @@ function (Application $application, array $config) use ($filesystemManager): Fil
 
                     $diskResolver = (function (string $disk, array $config) {
                         // This is a "hack" to make sure that the original driver is resolved by the FilesystemManager
+                        $oldConfig = config("filesystems.disks.{$disk}");
+
                         config(["filesystems.disks.{$disk}" => $config]);
 
                         /** @var FilesystemManager $this */
-                        return $this->resolve($disk);
+                        $resolved = $this->resolve($disk);
+
+                        config(["filesystems.disks.{$disk}" => $oldConfig]);
+
+                        return $resolved;
                     })->bindTo($filesystemManager, FilesystemManager::class);
 
                     /** @var Filesystem $originalFilesystem */

test/Sentry/Features/StorageIntegrationTest.php

@@ -159,6 +159,19 @@ public function testDriverWorksWhenDisabled(): void
         $this->expectNotToPerformAssertions();
     }
 
+    public function testResolvingDiskDoesNotModifyConfig(): void
+    {
+        $this->resetApplicationWithConfig([
+            'filesystems.disks' => Integration::configureDisks(config('filesystems.disks')),
+        ]);
+
+        $originalConfig = config('filesystems.disks.local');
+
+        Storage::disk('local');
+
+        $this->assertEquals($originalConfig, config('filesystems.disks.local'));
+    }
+
     public function testThrowsIfDiskConfigurationDoesntSpecifyDiskName(): void
     {
         $this->resetApplicationWithConfig([