Merge branch '6.4' into 7.1

* 6.4:
  [Validator] Fix 58691 (missing plural-options in serbian language translation)
  profiler form data collector extart value property if it is setted
  [Process] Fix escaping /X arguments on Windows
  [Config] Handle Phar absolute path in `FileLocator`
  [Runtime] Remove unused `SKIPIF` from `dotenv_overload.phpt`

Author: nicolas-grekas

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

@@ -646,8 +646,10 @@
                     <td>{{ profiler_dump(value) }}</td>
                     <td>
                         {# values can be stubs #}
-                        {% set option_value = value.value|default(value) %}
-                        {% set resolved_option_value = data.resolved_options[option].value|default(data.resolved_options[option]) %}
+                        {% set option_value = (value.value is defined) ? value.value : value %}
+                        {% set resolved_option_value = (data.resolved_options[option].value is defined)
+                            ? data.resolved_options[option].value
+                            : data.resolved_options[option] %}
                         {% if resolved_option_value == option_value %}
                             <em class="font-normal text-muted">same as passed value</em>
                         {% else %}

src/Symfony/Component/Config/FileLocator.php

@@ -87,6 +87,7 @@ private function isAbsolutePath(string $file): bool
                 && ('\\' === $file[2] || '/' === $file[2])
             )
             || parse_url($file, \PHP_URL_SCHEME)
+            || str_starts_with($file, 'phar:///') // "parse_url()" doesn't handle absolute phar path, despite being valid
         ) {
             return true;
         }

src/Symfony/Component/Config/Tests/FileLocatorTest.php

@@ -38,6 +38,7 @@ public static function getIsAbsolutePathTests(): array
             ['\\server\\foo.xml'],
             ['https://server/foo.xml'],
             ['phar://server/foo.xml'],
+            ['phar:///server/foo.xml'],
         ];
     }
 

src/Symfony/Component/Process/Process.php

@@ -1631,7 +1631,7 @@ private function escapeArgument(?string $argument): string
         if (str_contains($argument, "\0")) {
             $argument = str_replace("\0", '?', $argument);
         }
-        if (!preg_match('/[\/()%!^"<>&|\s]/', $argument)) {
+        if (!preg_match('/[()%!^"<>&|\s]/', $argument)) {
             return $argument;
         }
         $argument = preg_replace('/(\\\\+)$/', '$1$1', $argument);

src/Symfony/Component/Process/Tests/ProcessTest.php

@@ -1470,7 +1470,12 @@ public function testGetCommandLine()
     {
         $p = new Process(['/usr/bin/php']);
 
-        $expected = '\\' === \DIRECTORY_SEPARATOR ? '"/usr/bin/php"' : "'/usr/bin/php'";
+        $expected = '\\' === \DIRECTORY_SEPARATOR ? '/usr/bin/php' : "'/usr/bin/php'";
+        $this->assertSame($expected, $p->getCommandLine());
+
+        $p = new Process(['cd', '/d']);
+
+        $expected = '\\' === \DIRECTORY_SEPARATOR ? 'cd /d' : "'cd' '/d'";
         $this->assertSame($expected, $p->getCommandLine());
     }
 

src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Test Dotenv overload
---SKIPIF--
-<?php require dirname(__DIR__, 6).'/vendor/autoload.php'; if (4 > (new \ReflectionMethod(\Symfony\Component\Dotenv\Dotenv::class, 'bootEnv'))->getNumberOfParameters()) die('Skip because Dotenv version is too low');
 --INI--
 display_errors=1
 --FILE--