CHANGELOG.md

@@ -1,6 +1,10 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/octane/compare/v2.3.10...2.x)
+## [Unreleased](https://github.com/laravel/octane/compare/v2.3.11...2.x)
+
+## [v2.3.11](https://github.com/laravel/octane/compare/v2.3.10...v2.3.11) - 2024-05-16
+
+* Fix to stuck in "Application change detected. Restarting workers" with Octane + FrankenPHP + Sail. by [@gazzoy](https://github.com/gazzoy) in https://github.com/laravel/octane/pull/890
 
 ## [v2.3.10](https://github.com/laravel/octane/compare/v2.3.9...v2.3.10) - 2024-05-07
 

bin/frankenphp-worker.php

@@ -76,4 +76,6 @@
     }
 } finally {
     $worker?->terminate();
+
+    gc_collect_cycles();
 }

src/Concerns/ProvidesDefaultConfigurationOptions.php

@@ -28,6 +28,7 @@ public static function prepareApplicationForNextOperation(): array
     {
         return [
             \Laravel\Octane\Listeners\CreateConfigurationSandbox::class,
+            \Laravel\Octane\Listeners\CreateUrlGeneratorSandbox::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToAuthorizationGate::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToBroadcastManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToDatabaseManager::class,

src/Listeners/CreateUrlGeneratorSandbox.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Laravel\Octane\Listeners;
+
+class CreateUrlGeneratorSandbox
+{
+    /**
+     * Handle the event.
+     *
+     * @param  mixed  $event
+     */
+    public function handle($event): void
+    {
+        $event->sandbox->instance('url', clone $event->sandbox['url']);
+    }
+}

src/OctaneServiceProvider.php

@@ -123,6 +123,7 @@ protected function bindListeners()
     {
         $this->app->singleton(Listeners\CollectGarbage::class);
         $this->app->singleton(Listeners\CreateConfigurationSandbox::class);
+        $this->app->singleton(Listeners\CreateUrlGeneratorSandbox::class);
         $this->app->singleton(Listeners\DisconnectFromDatabases::class);
         $this->app->singleton(Listeners\EnforceRequestScheme::class);
         $this->app->singleton(Listeners\EnsureRequestServerPortMatchesScheme::class);

tests/UrlGeneratorSandboxTest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Laravel\Octane\Tests;
+
+use Illuminate\Foundation\Application;
+use Illuminate\Http\Request;
+
+class UrlGeneratorSandboxTest extends TestCase
+{
+    public function test_url_is_reset_between_requests()
+    {
+        [$app, $worker, $client] = $this->createOctaneContext([
+            Request::create('/first', 'GET'),
+            Request::create('/second', 'GET'),
+        ]);
+
+        $app['url']->defaults(['param' => 'original']);
+        $app['url']->forceRootUrl('http://original');
+
+        $app['router']->get('/first', function (Application $app) {
+            $app['url']->defaults(['param' => 'changed']);
+            $app['url']->forceRootUrl('http://changed');
+
+            return [
+                'default' => $app['url']->getDefaultParameters(),
+                'url' => $app['url']->to('/'),
+            ];
+        });
+
+        $app['router']->get('/second', function (Application $app) {
+            return [
+                'default' => $app['url']->getDefaultParameters(),
+                'url' => $app['url']->to('/'),
+            ];
+        });
+
+        $worker->run();
+
+        $this->assertEquals([
+            'default' => ['param' => 'changed'],
+            'url' => 'http://changed',
+        ], $client->responses[0]->getData(true));
+
+        $this->assertEquals([
+            'default' => ['param' => 'original'],
+            'url' => 'http://original',
+        ], $client->responses[1]->getData(true));
+    }
+}