Merge branch '5.x' into 5.next

LordSimal · LordSimal · commit 3702de8e5941 · 2025-11-03T20:50:10.000+01:00
# Conflicts:
#	composer.json
diff --git a/src/ToolbarService.php b/src/ToolbarService.php
@@ -291,10 +291,31 @@ public function saveData(ServerRequest $request, ResponseInterface $response): R
         foreach ($this->registry->loaded() as $name) {
             $panel = $this->registry->{$name};
             try {
-                $content = serialize($panel->data());
+                $data = $panel->data();
+
+                // Set error handler to catch warnings/errors during serialization
+                set_error_handler(function ($errno, $errstr) use ($name): void {
+                    throw new Exception("Serialization error in panel '{$name}': {$errstr}");
+                });
+
+                $content = serialize($data);
+
+                restore_error_handler();
             } catch (Exception $e) {
+                restore_error_handler();
+
+                $errorMessage = sprintf(
+                    'Failed to serialize data for panel "%s": %s',
+                    $name,
+                    $e->getMessage(),
+                );
+
+                Log::warning($errorMessage);
+                Log::debug('Panel data type: ' . gettype($data ?? null));
+
                 $content = serialize([
-                    'error' => $e->getMessage(),
+                    'error' => $errorMessage,
+                    'panel' => $name,
                 ]);
             }
             $row->panels[] = $requests->Panels->newEntity([
diff --git a/tests/TestCase/ToolbarServiceTest.php b/tests/TestCase/ToolbarServiceTest.php
@@ -26,6 +26,7 @@
 use Cake\TestSuite\TestCase;
 use DebugKit\Model\Entity\Request as RequestEntity;
 use DebugKit\Panel\SqlLogPanel;
+use DebugKit\TestApp\Panel\SimplePanel;
 use DebugKit\ToolbarService;
 use PHPUnit\Framework\Attributes\DataProvider;
 
@@ -506,4 +507,56 @@ public function testIsEnabledForceEnableCallable()
         ]);
         $this->assertTrue($bar->isEnabled(), 'debug is off, panel is forced on');
     }
+
+    /**
+     * Test that saveData handles serialization errors gracefully
+     *
+     * @return void
+     */
+    public function testSaveDataSerializationError()
+    {
+        $request = new Request([
+            'url' => '/articles',
+            'environment' => ['REQUEST_METHOD' => 'GET'],
+        ]);
+        $response = new Response([
+            'statusCode' => 200,
+            'type' => 'text/html',
+            'body' => '<html><title>test</title><body><p>some text</p></body>',
+        ]);
+
+        $bar = new ToolbarService($this->events, []);
+        $bar->loadPanels();
+
+        // Create a panel with unserializable data
+        /** @var SimplePanel $panel */
+        $panel = $bar->registry()->load('DebugKit.TestApp\Panel\SimplePanel', [
+            'className' => SimplePanel::class,
+        ]);
+        // Mock the data() method to return something problematic
+        $panel->setData(['closure' => fn() => 'test']);
+
+        $row = $bar->saveData($request, $response);
+        $this->assertNotEmpty($row, 'Should save data even with serialization errors');
+
+        $requests = $this->getTableLocator()->get('DebugKit.Requests');
+        $result = $requests->find()
+            ->orderBy(['Requests.requested_at' => 'DESC'])
+            ->contain('Panels')
+            ->first();
+
+        // Find the SimplePanel in the results
+        $simplePanel = null;
+        foreach ($result->panels as $p) {
+            if ($p->panel === 'DebugKit.TestApp\Panel\SimplePanel') {
+                $simplePanel = $p;
+                break;
+            }
+        }
+
+        $this->assertNotNull($simplePanel, 'SimplePanel should be present');
+        $content = unserialize($simplePanel->content);
+        $this->assertArrayHasKey('error', $content, 'Should have error key');
+        $this->assertStringContainsString('SimplePanel', $content['error'], 'Error should mention panel name');
+    }
 }
diff --git a/tests/test_app/Panel/SimplePanel.php b/tests/test_app/Panel/SimplePanel.php
@@ -22,4 +22,8 @@
  */
 class SimplePanel extends DebugPanel
 {
+    public function setData(array $data): void
+    {
+        $this->_data = $data;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,8 @@`
`22`	`22`	`*/`
`23`	`23`	`class SimplePanel extends DebugPanel`
`24`	`24`	`{`
	`25`	`+ public function setData(array $data): void`
	`26`	`+ {`
	`27`	`+ $this->_data = $data;`
	`28`	`+ }`
`25`	`29`	`}`