Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit c8743d425aa0 · 2024-09-17T14:47:12.000+02:00
* 5.4:
  [Process] minor fix
  [Process] Fix finding executables independently of open_basedir
  [HttpKernel] Skip logging uncaught exceptions in ErrorHandler, assume $kernel-&gt;terminateWithException() will do it
  parse empty sequence elements as null
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -67,6 +67,7 @@ public function configure(?object $event = null): void
             return;
         }
         $this->firstCall = $this->hasTerminatedWithException = false;
+        $hasRun = null;
 
         if (!$this->exceptionHandler) {
             if ($event instanceof KernelEvent) {
@@ -103,6 +104,19 @@ public function configure(?object $event = null): void
 
             if ($handler instanceof ErrorHandler) {
                 $handler->setExceptionHandler($this->exceptionHandler);
+                if (null !== $hasRun) {
+                    $throwAt = $handler->throwAt(0) | \E_ERROR | \E_CORE_ERROR | \E_COMPILE_ERROR | \E_USER_ERROR | \E_RECOVERABLE_ERROR | \E_PARSE;
+                    $loggers = [];
+
+                    foreach ($handler->setLoggers([]) as $type => $log) {
+                        if ($type & $throwAt) {
+                            $loggers[$type] = [null, $log[1]];
+                        }
+                    }
+
+                    // Assume $kernel->terminateWithException() will log uncaught exceptions appropriately
+                    $handler->setLoggers($loggers);
+                }
             }
             $this->exceptionHandler = null;
         }
diff --git a/src/Symfony/Component/Process/CHANGELOG.md b/src/Symfony/Component/Process/CHANGELOG.md
@@ -7,7 +7,6 @@ CHANGELOG
  * Add `PhpSubprocess` to handle PHP subprocesses that take over the
    configuration from their parent
  * Add `RunProcessMessage` and `RunProcessMessageHandler`
- * Support using `Process::findExecutable()` independently of `open_basedir`
 
 5.2.0
 -----
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -353,11 +353,18 @@ private static function parseSequence(string $sequence, int $flags, int &$i = 0,
         ++$i;
 
         // [foo, bar, ...]
+        $lastToken = null;
         while ($i < $len) {
             if (']' === $sequence[$i]) {
                 return $output;
             }
             if (',' === $sequence[$i] || ' ' === $sequence[$i]) {
+                if (',' === $sequence[$i] && (null === $lastToken || 'separator' === $lastToken)) {
+                    $output[] = null;
+                } elseif (',' === $sequence[$i]) {
+                    $lastToken = 'separator';
+                }
+
                 ++$i;
 
                 continue;
@@ -401,6 +408,7 @@ private static function parseSequence(string $sequence, int $flags, int &$i = 0,
 
             $output[] = $value;
 
+            $lastToken = 'value';
             ++$i;
         }
 
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -1128,4 +1128,11 @@ public function testParseQuotedReferenceLikeStringsInSequence()
 
         $this->assertSame(['&foo', '&bar', '&baz'], Inline::parse($yaml));
     }
+
+    public function testParseSequenceWithEmptyElement()
+    {
+        $this->assertSame(['foo', null, 'bar'], Inline::parse('[foo, , bar]'));
+        $this->assertSame([null, 'foo', 'bar'], Inline::parse('[, foo, bar]'));
+        $this->assertSame(['foo', 'bar'], Inline::parse('[foo, bar, ]'));
+    }
 }
