backport cloud support

Author: taylorotwell

src/Illuminate/Database/Migrations/Migrator.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Database\Migrations;
 
+use Closure;
 use Doctrine\DBAL\Schema\SchemaException;
 use Illuminate\Console\View\Components\BulletList;
 use Illuminate\Console\View\Components\Error;
@@ -52,6 +53,13 @@ class Migrator
      */
     protected $resolver;
 
+    /**
+     * The custom connection resolver callback.
+     *
+     * @var \Closure|null
+     */
+    protected static $connectionResolverCallback;
+
     /**
      * The name of the default connection.
      *
@@ -660,7 +668,26 @@ public function setConnection($name)
      */
     public function resolveConnection($connection)
     {
-        return $this->resolver->connection($connection ?: $this->connection);
+        if (static::$connectionResolverCallback) {
+            return call_user_func(
+                static::$connectionResolverCallback,
+                $this->resolver,
+                $connection ?: $this->connection
+            );
+        } else {
+            return $this->resolver->connection($connection ?: $this->connection);
+        }
+    }
+
+    /**
+     * Set a connection resolver callback.
+     *
+     * @param  \Closure  $callback
+     * @return void
+     */
+    public static function resolveConnectionsUsing(Closure $callback)
+    {
+        static::$connectionResolverCallback = $callback;
     }
 
     /**

src/Illuminate/Foundation/Application.php

@@ -204,6 +204,7 @@ public function __construct($basePath = null)
         $this->registerBaseBindings();
         $this->registerBaseServiceProviders();
         $this->registerCoreContainerAliases();
+        $this->registerLaravelCloudServices();
     }
 
     /**
@@ -247,6 +248,28 @@ protected function registerBaseServiceProviders()
         $this->register(new RoutingServiceProvider($this));
     }
 
+    /**
+     * Register any services needed for Laravel Cloud.
+     *
+     * @return void
+     */
+    protected function registerLaravelCloudServices()
+    {
+        if (! laravel_cloud()) {
+            return;
+        }
+
+        $this['events']->listen(
+            'bootstrapping: *',
+            fn ($bootstrapper) => Cloud::bootstrapperBootstrapping($this, Str::after($bootstrapper, 'bootstrapping: '))
+        );
+
+        $this['events']->listen(
+            'bootstrapped: *',
+            fn ($bootstrapper) => Cloud::bootstrapperBootstrapped($this, Str::after($bootstrapper, 'bootstrapped: '))
+        );
+    }
+
     /**
      * Run the given array of bootstrap classes.
      *

src/Illuminate/Foundation/Bootstrap/HandleExceptions.php

@@ -54,10 +54,6 @@ public function bootstrap(Application $app)
         if (! $app->environment('testing')) {
             ini_set('display_errors', 'Off');
         }
-
-        if (laravel_cloud()) {
-            $this->configureCloudLogging($app);
-        }
     }
 
     /**
@@ -250,34 +246,6 @@ protected function fatalErrorFromPhpError(array $error, $traceOffset = null)
         return new FatalError($error['message'], 0, $error, $traceOffset);
     }
 
-    /**
-     * Configure the Laravel Cloud log channels.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
-     * @return void
-     */
-    protected function configureCloudLogging(Application $app)
-    {
-        $app['config']->set('logging.channels.stderr.formatter_with', [
-            'includeStacktraces' => true,
-        ]);
-
-        $app['config']->set('logging.channels.laravel-cloud-socket', [
-            'driver' => 'monolog',
-            'handler' => SocketHandler::class,
-            'formatter' => JsonFormatter::class,
-            'formatter_with' => [
-                'includeStacktraces' => true,
-            ],
-            'with' => [
-                'connectionString' => $_ENV['LARAVEL_CLOUD_LOG_SOCKET'] ??
-                                      $_SERVER['LARAVEL_CLOUD_LOG_SOCKET'] ??
-                                      'unix:///tmp/cloud-init.sock',
-                'persistent' => true,
-            ],
-        ]);
-    }
-
     /**
      * Forward a method call to the given method if an application instance exists.
      *