Merge branch '6.2' into 6.3

* 6.2:
  Fix test class name
  trim(): Argument #1 () must be of type string, bool given
  Check if trace.curlCommand is defined in profiler
  [Dumper] Trim leading newlines when checking if value begins with a space
  [FrameworkBundle] Make service edges unique
  Fix the list of supported shells for completions in a phar
  Fix the usage of the zsh completion through the fpath discovery

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php

@@ -337,7 +337,10 @@ private function getContainerEnvVars(ContainerBuilder $container): array
     protected function getServiceEdges(ContainerBuilder $builder, string $serviceId): array
     {
         try {
-            return array_map(fn (ServiceReferenceGraphEdge $edge) => $edge->getSourceNode()->getId(), $builder->getCompiler()->getServiceReferenceGraph()->getNode($serviceId)->getInEdges());
+            return array_values(array_unique(array_map(
+                fn (ServiceReferenceGraphEdge $edge) => $edge->getSourceNode()->getId(),
+                $builder->getCompiler()->getServiceReferenceGraph()->getNode($serviceId)->getInEdges()
+            )));
         } catch (InvalidArgumentException $exception) {
             return [];
         }

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/http_client.html.twig

@@ -127,7 +127,7 @@
                                                 Profile
                                             </th>
                                         {% endif %}
-                                        {% if trace.curlCommand is not null %}
+                                        {% if trace.curlCommand is defined and trace.curlCommand %}
                                             <th>
                                                 <button class="btn btn-sm hidden" title="Copy as cURL" data-clipboard-text="{{ trace.curlCommand }}">Copy as cURL</button>
                                             </th>
@@ -143,7 +143,7 @@
                                     {% endif %}
                                     <tr>
                                         <th class="font-normal">Response</th>
-                                        <td{% if trace.curlCommand %} colspan="2"{% endif %}>
+                                        <td{% if trace.curlCommand is defined and trace.curlCommand %} colspan="2"{% endif %}>
                                             {% if trace.http_code >= 500 %}
                                                 {% set responseStatus = 'error' %}
                                             {% elseif trace.http_code >= 400 %}

src/Symfony/Component/Console/Command/DumpCompletionCommand.php

@@ -48,7 +48,7 @@ protected function configure(): void
         $shell = $this->guessShell();
         [$rcFile, $completionFile] = match ($shell) {
             'fish' => ['~/.config/fish/config.fish', "/etc/fish/completions/$commandName.fish"],
-            'zsh' => ['~/.zshrc', '$fpath[1]/'.$commandName],
+            'zsh' => ['~/.zshrc', '$fpath[1]/_'.$commandName],
             default => ['~/.bashrc', "/etc/bash_completion.d/$commandName"],
         };
 
@@ -143,6 +143,18 @@ private function tailDebugLog(string $commandName, OutputInterface $output): voi
      */
     private function getSupportedShells(): array
     {
-        return $this->supportedShells ??= array_map(fn ($f) => pathinfo($f, \PATHINFO_EXTENSION), glob(__DIR__.'/../Resources/completion.*'));
+        if (null !== $this->supportedShells) {
+            return $this->supportedShells;
+        }
+
+        $shells = [];
+
+        foreach (new \DirectoryIterator(__DIR__.'/../Resources/') as $file) {
+            if (str_starts_with($file->getBasename(), 'completion.') && $file->isFile()) {
+                $shells[] = $file->getExtension();
+            }
+        }
+
+        return $this->supportedShells = $shells;
     }
 }

src/Symfony/Component/Console/Resources/completion.zsh

@@ -1,3 +1,5 @@
+#compdef {{ COMMAND_NAME }}
+
 # This file is part of the Symfony package.
 #
 # (c) Fabien Potencier <[email protected]>

src/Symfony/Component/Console/Terminal.php

@@ -136,7 +136,8 @@ public static function hasSttyAvailable(): bool
     private static function initDimensions(): void
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
-            if (preg_match('/^(\d+)x(\d+)(?: \((\d+)x(\d+)\))?$/', trim(getenv('ANSICON')), $matches)) {
+            $ansicon = getenv('ANSICON');
+            if (false !== $ansicon && preg_match('/^(\d+)x(\d+)(?: \((\d+)x(\d+)\))?$/', trim($ansicon), $matches)) {
                 // extract [w, H] from "wxh (WxH)"
                 // or [w, h] from "wxh"
                 self::$width = (int) $matches[1];

src/Symfony/Component/Yaml/Dumper.php

@@ -71,9 +71,7 @@ public function dump(mixed $input, int $inline = 0, int $indent = 0, int $flags
                 }
 
                 if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && str_contains($value, "\n") && !str_contains($value, "\r")) {
-                    // If the first line starts with a space character, the spec requires a blockIndicationIndicator
-                    // http://www.yaml.org/spec/1.2/spec.html#id2793979
-                    $blockIndentationIndicator = str_starts_with($value, ' ') ? (string) $this->indentation : '';
+                    $blockIndentationIndicator = $this->getBlockIndentationIndicator($value);
 
                     if (isset($value[-2]) && "\n" === $value[-2] && "\n" === $value[-1]) {
                         $blockChompingIndicator = '+';
@@ -100,9 +98,7 @@ public function dump(mixed $input, int $inline = 0, int $indent = 0, int $flags
                     $output .= sprintf('%s%s !%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', $value->getTag());
 
                     if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && str_contains($value->getValue(), "\n") && !str_contains($value->getValue(), "\r\n")) {
-                        // If the first line starts with a space character, the spec requires a blockIndicationIndicator
-                        // http://www.yaml.org/spec/1.2/spec.html#id2793979
-                        $blockIndentationIndicator = str_starts_with($value->getValue(), ' ') ? (string) $this->indentation : '';
+                        $blockIndentationIndicator = $this->getBlockIndentationIndicator($value->getValue());
                         $output .= sprintf(' |%s', $blockIndentationIndicator);
 
                         foreach (explode("\n", $value->getValue()) as $row) {
@@ -147,9 +143,7 @@ private function dumpTaggedValue(TaggedValue $value, int $inline, int $indent, i
         $output = sprintf('%s!%s', $prefix ? $prefix.' ' : '', $value->getTag());
 
         if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && str_contains($value->getValue(), "\n") && !str_contains($value->getValue(), "\r\n")) {
-            // If the first line starts with a space character, the spec requires a blockIndicationIndicator
-            // http://www.yaml.org/spec/1.2/spec.html#id2793979
-            $blockIndentationIndicator = (' ' === substr($value->getValue(), 0, 1)) ? (string) $this->indentation : '';
+            $blockIndentationIndicator = $this->getBlockIndentationIndicator($value->getValue());
             $output .= sprintf(' |%s', $blockIndentationIndicator);
 
             foreach (explode("\n", $value->getValue()) as $row) {
@@ -165,4 +159,20 @@ private function dumpTaggedValue(TaggedValue $value, int $inline, int $indent, i
 
         return $output."\n".$this->dump($value->getValue(), $inline - 1, $indent, $flags);
     }
+
+    private function getBlockIndentationIndicator(string $value): string
+    {
+        $lines = explode("\n", $value);
+
+        // If the first line (that is neither empty nor contains only spaces)
+        // starts with a space character, the spec requires a block indentation indicator
+        // http://www.yaml.org/spec/1.2/spec.html#id2793979
+        foreach ($lines as $line) {
+            if ('' !== trim($line, ' ')) {
+                return (' ' === substr($line, 0, 1)) ? (string) $this->indentation : '';
+            }
+        }
+
+        return '';
+    }
 }

src/Symfony/Component/Yaml/Tests/DumperTest.php

@@ -710,6 +710,42 @@ public function testDumpMultiLineStringAsScalarBlockWhenFirstLineHasLeadingSpace
         $this->assertSame($data, $this->parser->parse($yml));
     }
 
+    public function testDumpMultiLineStringAsScalarBlockWhenFirstLineIsEmptyAndSecondLineHasLeadingSpace()
+    {
+        $data = [
+            'data' => [
+                'multi_line' => "\n    the second line has leading spaces\nThe third line does not.",
+            ],
+        ];
+
+        $expected = "data:\n    multi_line: |4-\n\n            the second line has leading spaces\n        The third line does not.";
+
+        $yml = $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
+        $this->assertSame($expected, $yml);
+        $this->assertSame($data, $this->parser->parse($yml));
+    }
+
+    public function testDumpMultiLineStringAsScalarBlockWhenFirstLineHasOnlySpaces()
+    {
+        $data = [
+            'data' => [
+                'multi_line' => "    \nthe second line\nThe third line.",
+            ],
+        ];
+
+        $expectedData = [
+            'data' => [
+                'multi_line' => "\nthe second line\nThe third line.",
+            ],
+        ];
+
+        $expectedYml = "data:\n    multi_line: |-\n            \n        the second line\n        The third line.";
+
+        $yml = $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
+        $this->assertSame($expectedYml, $yml);
+        $this->assertSame($expectedData, $this->parser->parse($yml));
+    }
+
     public function testCarriageReturnFollowedByNewlineIsMaintainedWhenDumpingAsMultiLineLiteralBlock()
     {
         $data = ["a\r\nb\nc"];

src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php

@@ -15,7 +15,7 @@
 use Psr\Container\ContainerInterface;
 use Symfony\Contracts\Service\ServiceLocatorTrait;
 
-abstract class ServiceLocatorTest extends TestCase
+abstract class ServiceLocatorTestCase extends TestCase
 {
     protected function getServiceLocator(array $factories): ContainerInterface
     {