update

Author: mevdschee

src/DebuggerTool.php

@@ -628,7 +628,7 @@ public function getCacheTabPane(int $requestId, Request $request): string
             $total += $call->duration;
 
             $html[] = '<tr>';
-            $html[] = '<td>' . strtoupper($call->command) . ' ' . implode(' ', $call->arguments) . '</td>';
+            $html[] = '<td>' . strtoupper($call->command) . ' ' . implode(' ', array_map(static fn($a) => is_scalar($a) ? (string) $a : '', $call->arguments)) . '</td>';
             $html[] = '<td>' . htmlspecialchars(is_string($call->result) ? $call->result : '') . '</td>';
             $html[] = '<td>' . sprintf('%.2f ms', $call->duration * 1000) . '</td>';
             $html[] = '</tr>';

src/Translator/TranslationCallAdder.php

@@ -68,9 +68,9 @@ function ($matches) use (&$phpBlocks, &$echoBlocks, &$phpId) {
 
                 // Preserve leading and trailing whitespace
                 preg_match('/^(\s*)(.*?)(\s*)$/s', $text, $whiteMatches);
-                $leadingWhite = $whiteMatches[1];
-                $trimmedText = $whiteMatches[2];
-                $trailingWhite = $whiteMatches[3];
+                $leadingWhite = $whiteMatches[1] ?? '';
+                $trimmedText = $whiteMatches[2] ?? '';
+                $trailingWhite = $whiteMatches[3] ?? '';
 
                 // Skip if no actual content or only a PHP echo placeholder
                 if (!$trimmedText || preg_match('/^__PHP-ECHO__\d+$/', $trimmedText)) {
@@ -110,7 +110,7 @@ private function createTranslationBlock(string $text, array $echoBlocks): string
             function ($matches) use (&$params, $echoBlocks) {
                 $echoBlock = $echoBlocks[$matches[1]];
                 preg_match('/<\?php\s*e\((.*?)\);\s*\?>/', $echoBlock, $innerMatches);
-                $params[] = $innerMatches[1];
+                $params[] = $innerMatches[1] ?? '""';
                 return '%s';
             },
             $text

src/TranslatorTool.php

@@ -485,11 +485,13 @@ private function parsePotFile(string $potFile): array
             if (str_starts_with($line, '#:')) {
                 $currentLocations[] = trim(substr($line, 2));
             } elseif (str_starts_with($line, 'msgid')) {
-                $currentMsgid = [json_decode(substr(trim($line), 6))];
+                $decoded = json_decode(substr(trim($line), 6));
+                $currentMsgid = [is_string($decoded) ? $decoded : ''];
                 // Check for multi-line msgid
                 $j = $i + 1;
                 while ($j < count($lines) && str_starts_with(trim($lines[$j]), '"')) {
-                    $currentMsgid[] = json_decode(trim($lines[$j]));
+                    $part = json_decode(trim($lines[$j]));
+                    $currentMsgid[] = is_string($part) ? $part : '';
                     $j++;
                 }
                 $i = $j - 1;
@@ -603,16 +605,20 @@ private function compileTranslations(string $domain): void
             $msgstr = [];
             while (($line = fgets($read)) !== false) {
                 if (substr($line, 0, 5) == 'msgid') {
-                    $msgid = [json_decode(substr(rtrim($line, "\n"), 6))];
+                    $decoded = json_decode(substr(rtrim($line, "\n"), 6));
+                    $msgid = [is_string($decoded) ? $decoded : ''];
                     $scanid = true;
                 } elseif (substr($line, 0, 6) == 'msgstr') {
-                    $msgstr = [json_decode(substr(rtrim($line, "\n"), 7))];
+                    $decoded = json_decode(substr(rtrim($line, "\n"), 7));
+                    $msgstr = [is_string($decoded) ? $decoded : ''];
                     $scanid = false;
                 } elseif (substr($line, 0, 1) == '"') {
                     if ($scanid) {
-                        $msgid[] = json_decode(rtrim($line, "\n"));
+                        $part = json_decode(rtrim($line, "\n"));
+                        $msgid[] = is_string($part) ? $part : '';
                     } else {
-                        $msgstr[] = json_decode(rtrim($line, "\n"));
+                        $part = json_decode(rtrim($line, "\n"));
+                        $msgstr[] = is_string($part) ? $part : '';
                     }
                 } else {
                     $strings[implode('', $msgid)] = implode('', $msgstr);