Refreshes log manager container (#910)

* Refreshes log manager container

* formatting

Author: timacdonald

src/Concerns/ProvidesDefaultConfigurationOptions.php

@@ -35,6 +35,7 @@ public static function prepareApplicationForNextOperation(): array
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToDatabaseSessionHandler::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToFilesystemManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToHttpKernel::class,
+            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToLogManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToMailManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToNotificationChannelManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToPipelineHub::class,

src/Listeners/GiveNewApplicationInstanceToLogManager.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Laravel\Octane\Listeners;
+
+class GiveNewApplicationInstanceToLogManager
+{
+    /**
+     * Handle the event.
+     *
+     * @param  mixed  $event
+     */
+    public function handle($event): void
+    {
+        if (! $event->sandbox->resolved('log')) {
+            return;
+        }
+
+        if (method_exists($log = $event->sandbox->make('log'), 'setApplication')) {
+            $log->setApplication($event->sandbox);
+        }
+    }
+}

src/OctaneServiceProvider.php

@@ -136,6 +136,7 @@ protected function bindListeners()
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToAuthorizationGate::class);
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToBroadcastManager::class);
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToHttpKernel::class);
+        $this->app->singleton(Listeners\GiveNewApplicationInstanceToLogManager::class);
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToMailManager::class);
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToNotificationChannelManager::class);
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToPipelineHub::class);

tests/Listeners/GiveNewApplicationInstanceToLogManagerTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Laravel\Octane\Tests\Listeners;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Context;
+use Illuminate\Support\Facades\Log;
+use Laravel\Octane\Tests\TestCase;
+
+class GiveNewApplicationInstanceToLogManagerTest extends TestCase
+{
+    public function test_context_is_appened_to_logs()
+    {
+        if (! class_exists(Context::class)) {
+            $this->markTestSkipped('Context is not available in this version of Laravel.');
+        }
+        [$app, $worker, $client] = $this->createOctaneContext([
+            Request::create('/', 'GET'),
+        ]);
+        $path = $app['config']->get('logging.channels.single.path');
+        @unlink($path);
+
+        $this->assertFileDoesNotExist($path);
+
+        $app['router']->middleware('web')->get('/', function () {
+            Context::add('foo', 'bar');
+            Log::info('Hello world');
+        });
+
+        $worker->run();
+
+        $this->assertStringContainsString('{"foo":"bar"}', file_get_contents($path));
+    }
+}