CHANGELOG.md

@@ -1,6 +1,16 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/octane/compare/v1.2.9...1.x)
+## [Unreleased](https://github.com/laravel/octane/compare/v1.2.10...1.x)
+
+## [v1.2.10](https://github.com/laravel/octane/compare/v1.2.9...v1.2.10) - 2022-05-13
+
+### Changed
+
+- Revert PaginationState to resolve using new instance of the app by @farmani in https://github.com/laravel/octane/pull/519
+
+### Fixed
+
+- Warm transaction manager by @taylorotwell in https://github.com/laravel/octane/commit/752d02dc5973a11bf55f332eee0d9e5566442519
 
 ## [v1.2.9](https://github.com/laravel/octane/compare/v1.2.8...v1.2.9) - 2022-05-10
 

src/RoadRunner/ServerProcessInspector.php

@@ -51,6 +51,7 @@ public function reloadServer(): void
             $this->findRoadRunnerBinary(),
             'reset',
             '-o', "rpc.listen=tcp://$host:$rpcPort",
+            '-s',
         ], base_path()))->start()->waitUntil(function ($type, $buffer) {
             if ($type === Process::ERR) {
                 throw new RuntimeException('Cannot reload RoadRunner: '.$buffer);

tests/Listeners/FlushLogContextTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Laravel\Octane\Listeners;
+
+use Illuminate\Foundation\Application;
+use Illuminate\Http\Request;
+use Laravel\Octane\Tests\TestCase;
+
+class FlushLogContextTest extends TestCase
+{
+    public function test_shared_context_is_flushed()
+    {
+        if (version_compare(Application::VERSION, '9.0.0', '<')) {
+            $this->markTestSkipped('Shared context is only supported in Laravel 9+');
+        }
+
+        [$app, $worker, $client] = $this->createOctaneContext([
+            Request::create('/', 'GET'),
+        ]);
+        $app['router']->middleware('web')->get('/', function () {
+            // ..
+        });
+        $log = $app['log'];
+        $log->shareContext(['shared' => 'context']);
+
+        $this->assertSame(['shared' => 'context'], $log->sharedContext());
+
+        $worker->run();
+
+        $this->assertSame([], $log->sharedContext());
+    }
+}

tests/RoadRunnerServerProcessInspectorTest.php

@@ -62,7 +62,7 @@ public function test_roadrunner_server_process_can_be_reloaded()
         ]);
 
         $processFactory->shouldReceive('createProcess')->with(
-            [$this->findRoadRunnerBinary(), 'reset', '-o', 'rpc.listen=tcp://127.0.0.1:6002'],
+            [$this->findRoadRunnerBinary(), 'reset', '-o', 'rpc.listen=tcp://127.0.0.1:6002', '-s'],
             base_path(),
         )->andReturn($process = Mockery::mock('stdClass'));