add: extract array context

ulcuber · Feb 22, 2024 · 053ca89 · 053ca89
1 parent 5aa9179
commit 053ca89
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Entities/LogEntry.php b/src/Entities/LogEntry.php
@@ -214,7 +214,7 @@ protected function setHeader(array $header)
 
         $reminder = array_pop($matches);
 
-        $regex = '/{(?:[^{}]|(?R))*}/xm';
+        $regex = '/(?:\[(?:[^\[\]]|(?R))*\]|{(?:[^{}]|(?R))*})/xm';
         $reminder = preg_replace_callback($regex, function ($replaceable) {
             if (! is_null($context = json_decode($replaceable[0], true))) {
                 $this->setContext($context);
@@ -224,6 +224,7 @@ protected function setHeader(array $header)
 
             return $replaceable[0];
         }, $reminder);
+        $regex = '/{(?:[^{}]|(?R))*}/xm';
         if (! $this->context && ! strpos($this->stack, '>>>>>>>>')) {
             $this->stack = preg_replace_callback($regex, function ($replaceable) {
                 if (! is_null($context = json_decode($replaceable[0], true))) {