revert facade change

laravel · Feb 27, 2019 · 63d87d7 · 63d87d7
1 parent d37abcf
commit 63d87d7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/src/Illuminate/Database/DatabaseServiceProvider.php b/src/Illuminate/Database/DatabaseServiceProvider.php
@@ -65,10 +65,6 @@ protected function registerConnectionServices()
         $this->app->bind('db.connection', function ($app) {
             return $app['db']->connection();
         });
-
-        $this->app->bind('db.schema', function ($app) {
-            return $app['db']->connection()->getSchemaBuilder();
-        });
     }
 
     /**

diff --git a/src/Illuminate/Support/Facades/Facade.php b/src/Illuminate/Support/Facades/Facade.php
@@ -159,11 +159,15 @@ protected static function getFacadeAccessor()
     /**
      * Resolve the facade root instance from the container.
      *
-     * @param  string  $name
+     * @param  object|string  $name
      * @return mixed
      */
     protected static function resolveFacadeInstance($name)
     {
+        if (is_object($name)) {
+            return $name;
+        }
+
         if (isset(static::$resolvedInstance[$name])) {
             return static::$resolvedInstance[$name];
         }

diff --git a/src/Illuminate/Support/Facades/Schema.php b/src/Illuminate/Support/Facades/Schema.php
@@ -25,12 +25,12 @@ public static function connection($name)
     }
 
     /**
-     * Get the registered name of the component.
+     * Get a schema builder instance for the default connection.
      *
-     * @return string
+     * @return \Illuminate\Database\Schema\Builder
      */
     protected static function getFacadeAccessor()
     {
-        return 'db.schema';
+        return static::$app['db']->connection()->getSchemaBuilder();
     }
 }
diff --git a/tests/Database/DatabaseMigratorIntegrationTest.php b/tests/Database/DatabaseMigratorIntegrationTest.php
@@ -37,10 +37,6 @@ protected function setUp(): void
         $container = new Container;
         $container->instance('db', $db->getDatabaseManager());
 
-        $container->bind('db.schema', function ($c) {
-            return $c['db']->connection()->getSchemaBuilder();
-        });
-
         Facade::setFacadeApplication($container);
 
         $this->migrator = new Migrator(