[13.x] Bind manager instances to custom driver closures

src/Illuminate/Auth/AuthManager.php

@@ -263,11 +263,14 @@ public function resolveUsersUsing(Closure $userResolver)
      *
      * @param  string  $driver
      * @param  \Closure  $callback
+     *
+     * @param-closure-this  $this  $callback
+     *
      * @return $this
      */
     public function extend($driver, Closure $callback)
     {
-        $this->customCreators[$driver] = $callback;
+        $this->customCreators[$driver] = $callback->bindTo($this, $this);
 
         return $this;
     }

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -476,11 +476,14 @@ public function purge($name = null)
      *
      * @param  string  $driver
      * @param  \Closure  $callback
+     *
+     * @param-closure-this  $this  $callback
+     *
      * @return $this
      */
     public function extend($driver, Closure $callback)
     {
-        $this->customCreators[$driver] = $callback;
+        $this->customCreators[$driver] = $callback->bindTo($this, $this);
 
         return $this;
     }

src/Illuminate/Filesystem/FilesystemManager.php

@@ -426,11 +426,14 @@ public function purge($name = null)
      *
      * @param  string  $driver
      * @param  \Closure  $callback
+     *
+     * @param-closure-this  $this  $callback
+     *
      * @return $this
      */
     public function extend($driver, Closure $callback)
     {
-        $this->customCreators[$driver] = $callback;
+        $this->customCreators[$driver] = $callback->bindTo($this, $this);
 
         return $this;
     }

src/Illuminate/Support/Manager.php

@@ -120,11 +120,14 @@ protected function callCustomCreator($driver)
      *
      * @param  string  $driver
      * @param  \Closure  $callback
+     *
+     * @param-closure-this  $this  $callback
+     *
      * @return $this
      */
     public function extend($driver, Closure $callback)
     {
-        $this->customCreators[$driver] = $callback;
+        $this->customCreators[$driver] = $callback->bindTo($this, $this);
 
         return $this;
     }

tests/Auth/AuthenticateMiddlewareTest.php

@@ -148,6 +148,12 @@ public function testMultipleDriversAuthenticatedUpdatesDefault()
         $this->assertSame($secondary, $this->auth->guard());
     }
 
+    public function testCustomDriverClosureBoundObjectIsAuthManager()
+    {
+        $this->auth->extend(__CLASS__, fn () => $this);
+        $this->assertSame($this->auth, $this->auth->guard(__CLASS__));
+    }
+
     /**
      * Create a new config repository instance.
      *
@@ -161,6 +167,7 @@ protected function createConfig()
                 'guards' => [
                     'default' => ['driver' => 'default'],
                     'secondary' => ['driver' => 'secondary'],
+                    __CLASS__ => ['driver' => __CLASS__],
                 ],
             ],
         ]);

tests/Cache/CacheManagerTest.php

@@ -22,18 +22,17 @@ protected function tearDown(): void
 
     public function testCustomDriverClosureBoundObjectIsCacheManager()
     {
-        $cacheManager = new CacheManager([
-            'config' => [
-                'cache.stores.'.__CLASS__ => [
-                    'driver' => __CLASS__,
+        $manager = new CacheManager($this->getApp([
+            'cache' => [
+                'stores' => [
+                    __CLASS__ => [
+                        'driver' => __CLASS__,
+                    ],
                 ],
             ],
-        ]);
-        $driver = function () {
-            return $this;
-        };
-        $cacheManager->extend(__CLASS__, $driver);
-        $this->assertEquals($cacheManager, $cacheManager->store(__CLASS__));
+        ]));
+        $manager->extend(__CLASS__, fn () => $this);
+        $this->assertSame($manager, $manager->store(__CLASS__));
     }
 
     public function testCustomDriverOverridesInternalDrivers()

tests/Filesystem/FilesystemManagerTest.php

@@ -187,4 +187,17 @@ public function testCanBuildInlineScopedDisks()
             rmdir(__DIR__.'/../../to-be-scoped');
         }
     }
+
+    public function testCustomDriverClosureBoundObjectIsFilesystemManager()
+    {
+        $manager = new FilesystemManager(tap(new Application, function ($app) {
+            $app['config'] = [
+                'filesystems.disks.'.__CLASS__ => [
+                    'driver' => __CLASS__,
+                ],
+            ];
+        }));
+        $manager->extend(__CLASS__, fn () => $this);
+        $this->assertSame($manager, $manager->disk(__CLASS__));
+    }
 }

tests/Integration/Broadcasting/BroadcastManagerTest.php

@@ -100,6 +100,21 @@ public function testThrowExceptionWhenUnknownStoreIsUsed()
         $broadcastManager->connection('alien_connection');
     }
 
+    public function testCustomDriverClosureBoundObjectIsBroadcastManager()
+    {
+        $manager = new BroadcastManager($this->getApp([
+            'broadcasting' => [
+                'connections' => [
+                    __CLASS__ => [
+                        'driver' => __CLASS__,
+                    ],
+                ],
+            ],
+        ]));
+        $manager->extend(__CLASS__, fn () => $this);
+        $this->assertSame($manager, $manager->connection(__CLASS__));
+    }
+
     protected function getApp(array $userConfig)
     {
         $app = new Container;

tests/Integration/Support/Fixtures/MultipleInstanceManager.php

@@ -89,6 +89,10 @@ public function getInstanceConfig($name)
                     'driver' => 'mysql_database-connection',
                     'mysql_database-connection-option' => 'option-value',
                 ];
+            case 'custom':
+                return [
+                    'driver' => 'custom',
+                ];
             default:
                 return [];
         }

tests/Integration/Support/ManagerTest.php

@@ -14,4 +14,11 @@ public function testDefaultDriverCannotBeNull()
 
         (new NullableManager($this->app))->driver();
     }
+
+    public function testCustomDriverClosureBoundObjectIsManager()
+    {
+        $manager = new NullableManager($this->app);
+        $manager->extend(__CLASS__, fn () => $this);
+        $this->assertSame($manager, $manager->driver(__CLASS__));
+    }
 }

tests/Integration/Support/MultipleInstanceManagerTest.php

@@ -37,4 +37,11 @@ public function test_unresolvable_instances_throw_errors()
 
         $instance = $manager->instance('missing');
     }
+
+    public function test_custom_driver_closure_bound_object_is_multiple_instance_manager()
+    {
+        $manager = new MultipleInstanceManager($this->app);
+        $manager->extend('custom', fn () => $this);
+        $this->assertSame($manager, $manager->instance('custom'));
+    }
 }

tests/Log/LogManagerTest.php

@@ -752,6 +752,18 @@ public function testDriverUsersPsrLoggerManagerReturnsLogger()
         $this->assertCount(1, $loggerSpy->logs);
         $this->assertEquals('some alert', $loggerSpy->logs[0]['message']);
     }
+
+    public function testCustomDriverClosureBoundObjectIsLogManager()
+    {
+        $config = $this->app['config'];
+        $config->set('logging.channels.'.__CLASS__, [
+            'driver' => __CLASS__,
+        ]);
+
+        $manager = new LogManager($this->app);
+        $manager->extend(__CLASS__, fn () => $this);
+        $this->assertSame($manager, $manager->channel(__CLASS__)->getLogger());
+    }
 }
 
 class CustomizeFormatter