Use string based accessor for Schema facade

Author: driesvints

src/Illuminate/Database/DatabaseServiceProvider.php

@@ -72,6 +72,10 @@ protected function registerConnectionServices()
             return $app['db']->connection();
         });
 
+        $this->app->bind('db.schema', function ($app) {
+            return $app['db']->connection()->getSchemaBuilder();
+        });
+
         $this->app->singleton('db.transactions', function ($app) {
             return new DatabaseTransactionsManager;
         });

src/Illuminate/Foundation/Application.php

@@ -1304,6 +1304,7 @@ public function registerCoreContainerAliases()
             'cookie' => [\Illuminate\Cookie\CookieJar::class, \Illuminate\Contracts\Cookie\Factory::class, \Illuminate\Contracts\Cookie\QueueingFactory::class],
             'db' => [\Illuminate\Database\DatabaseManager::class, \Illuminate\Database\ConnectionResolverInterface::class],
             'db.connection' => [\Illuminate\Database\Connection::class, \Illuminate\Database\ConnectionInterface::class],
+            'db.schema' => [\Illuminate\Database\Schema\Builder::class],
             'encrypter' => [\Illuminate\Encryption\Encrypter::class, \Illuminate\Contracts\Encryption\Encrypter::class, \Illuminate\Contracts\Encryption\StringEncrypter::class],
             'events' => [\Illuminate\Events\Dispatcher::class, \Illuminate\Contracts\Events\Dispatcher::class],
             'files' => [\Illuminate\Filesystem\Filesystem::class],

src/Illuminate/Support/Facades/Facade.php

@@ -23,6 +23,13 @@ abstract class Facade
      */
     protected static $resolvedInstance;
 
+    /**
+     * Determine if the resolved facade should be cached.
+     *
+     * @var bool
+     */
+    protected static $cached = true;
+
     /**
      * Run a Closure when the facade has been resolved.
      *
@@ -84,8 +91,8 @@ public static function shouldReceive()
         $name = static::getFacadeAccessor();
 
         $mock = static::isMock()
-                    ? static::$resolvedInstance[$name]
-                    : static::createFreshMockInstance();
+            ? static::$resolvedInstance[$name]
+            : static::createFreshMockInstance();
 
         return $mock->shouldReceive(...func_get_args());
     }
@@ -197,21 +204,21 @@ protected static function getFacadeAccessor()
     /**
      * Resolve the facade root instance from the container.
      *
-     * @param  object|string  $name
+     * @param  string  $name
      * @return mixed
      */
     protected static function resolveFacadeInstance($name)
     {
-        if (is_object($name)) {
-            return $name;
-        }
-
         if (isset(static::$resolvedInstance[$name])) {
             return static::$resolvedInstance[$name];
         }
-
+        dump(array_keys(static::$resolvedInstance));
         if (static::$app) {
-            return static::$resolvedInstance[$name] = static::$app[$name];
+            if (static::$cached) {
+                return static::$resolvedInstance[$name] = static::$app[$name];
+            }
+
+            return static::$app[$name];
         }
     }
 

src/Illuminate/Support/Facades/RateLimiter.php

@@ -24,6 +24,6 @@ class RateLimiter extends Facade
      */
     protected static function getFacadeAccessor()
     {
-        return 'Illuminate\Cache\RateLimiter';
+        return \Illuminate\Cache\RateLimiter::class;
     }
 }

src/Illuminate/Support/Facades/Schema.php

@@ -24,6 +24,13 @@
  */
 class Schema extends Facade
 {
+    /**
+     * Determine if the resolved facade should be cached.
+     *
+     * @var bool
+     */
+    protected static $cached = false;
+
     /**
      * Get a schema builder instance for a connection.
      *
@@ -36,12 +43,12 @@ public static function connection($name)
     }
 
     /**
-     * Get a schema builder instance for the default connection.
+     * Get the registered name of the component.
      *
-     * @return \Illuminate\Database\Schema\Builder
+     * @return string
      */
     protected static function getFacadeAccessor()
     {
-        return static::$app['db']->connection()->getSchemaBuilder();
+        return 'db.schema';
     }
 }

tests/Database/DatabaseMigratorIntegrationTest.php

@@ -41,6 +41,9 @@ protected function setUp(): void
 
         $container = new Container;
         $container->instance('db', $db->getDatabaseManager());
+        $container->bind('db.schema', function ($app) {
+            return $app['db']->connection()->getSchemaBuilder();
+        });
 
         Facade::setFacadeApplication($container);