Merge branch '5.4' into 6.3

* 5.4:
  allow environment variables starting with an underscore
  Update a test
  Remove #StandWithUkraine
  [Notifier][Smsc] Require login and password

Author: fabpot

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

@@ -130,7 +130,7 @@ public function all(string $namespace = null): array
 
     public function getLongVersion(): string
     {
-        return parent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>) <bg=#0057B7;fg=#FFDD00>#StandWith</><bg=#FFDD00;fg=#0057B7>Ukraine</> <href=https://sf.to/ukraine>https://sf.to/ukraine</>', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
+        return parent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
     }
 
     public function add(Command $command): ?Command

src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container8.php

@@ -12,7 +12,7 @@
     'utf-8 valid string' => "\u{021b}\u{1b56}\ttest",
     'binary' => "\xf0\xf0\xf0\xf0",
     'binary-control-char' => "This is a Bell char \x07",
-    'console banner' => "\e[37;44m#StandWith\e[30;43mUkraine\e[0m",
+    'console banner' => "\e[37;44mHello\e[30;43mWorld\e[0m",
     'null string' => 'null',
     'string of digits' => '123',
     'string of digits prefixed with minus character' => '-123',

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php

@@ -98,7 +98,7 @@ protected function getDefaultParameters(): array
             'utf-8 valid string' => 'ț᭖	test',
             'binary' => 'ðððð',
             'binary-control-char' => 'This is a Bell char ',
-            'console banner' => '[37;44m#StandWith[30;43mUkraine[0m',
+            'console banner' => '[37;44mHello[30;43mWorld[0m',
             'null string' => 'null',
             'string of digits' => '123',
             'string of digits prefixed with minus character' => '-123',

src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services8.xml

@@ -21,7 +21,7 @@
     <parameter key="utf-8 valid string">&#x21B;&#x1B56;	test</parameter>
     <parameter key="binary" type="binary">8PDw8A==</parameter>
     <parameter key="binary-control-char" type="binary">VGhpcyBpcyBhIEJlbGwgY2hhciAH</parameter>
-    <parameter key="console banner" type="binary">G1szNzs0NG0jU3RhbmRXaXRoG1szMDs0M21Va3JhaW5lG1swbQ==</parameter>
+    <parameter key="console banner" type="binary">G1szNzs0NG1IZWxsbxtbMzA7NDNtV29ybGQbWzBt</parameter>
     <parameter key="null string" type="string">null</parameter>
     <parameter key="string of digits" type="string">123</parameter>
     <parameter key="string of digits prefixed with minus character" type="string">-123</parameter>

src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml

@@ -7,7 +7,7 @@ parameters:
     utf-8 valid string: "ț᭖\ttest"
     binary: !!binary 8PDw8A==
     binary-control-char: !!binary VGhpcyBpcyBhIEJlbGwgY2hhciAH
-    console banner: "\e[37;44m#StandWith\e[30;43mUkraine\e[0m"
+    console banner: "\e[37;44mHello\e[30;43mWorld\e[0m"
     null string: 'null'
     string of digits: '123'
     string of digits prefixed with minus character: '-123'

src/Symfony/Component/Dotenv/Dotenv.php

@@ -25,7 +25,7 @@
  */
 final class Dotenv
 {
-    public const VARNAME_REGEX = '(?i:[A-Z][A-Z0-9_]*+)';
+    public const VARNAME_REGEX = '(?i:_?[A-Z][A-Z0-9_]*+)';
     public const STATE_VARNAME = 0;
     public const STATE_VALUE = 1;
 
@@ -341,8 +341,8 @@ private function lexValue(): string
                 ++$this->cursor;
                 $value = str_replace(['\\"', '\r', '\n'], ['"', "\r", "\n"], $value);
                 $resolvedValue = $value;
-                $resolvedValue = $this->resolveVariables($resolvedValue, $loadedVars);
                 $resolvedValue = $this->resolveCommands($resolvedValue, $loadedVars);
+                $resolvedValue = $this->resolveVariables($resolvedValue, $loadedVars);
                 $resolvedValue = str_replace('\\\\', '\\', $resolvedValue);
                 $v .= $resolvedValue;
             } else {
@@ -364,8 +364,8 @@ private function lexValue(): string
                 }
                 $value = rtrim($value);
                 $resolvedValue = $value;
-                $resolvedValue = $this->resolveVariables($resolvedValue, $loadedVars);
                 $resolvedValue = $this->resolveCommands($resolvedValue, $loadedVars);
+                $resolvedValue = $this->resolveVariables($resolvedValue, $loadedVars);
                 $resolvedValue = str_replace('\\\\', '\\', $resolvedValue);
 
                 if ($resolvedValue === $value && preg_match('/\s+/', $value)) {

src/Symfony/Component/Dotenv/Tests/DotenvTest.php

@@ -53,6 +53,7 @@ public static function getEnvDataWithFormatErrors()
             ["FOO=\nBAR=\${FOO:-\'a{a}a}", "Unsupported character \"'\" found in the default value of variable \"\$FOO\". in \".env\" at line 2.\n...\\nBAR=\${FOO:-\'a{a}a}...\n                       ^ line 2 offset 24"],
             ["FOO=\nBAR=\${FOO:-a\$a}", "Unsupported character \"\$\" found in the default value of variable \"\$FOO\". in \".env\" at line 2.\n...FOO=\\nBAR=\${FOO:-a\$a}...\n                       ^ line 2 offset 20"],
             ["FOO=\nBAR=\${FOO:-a\"a}", "Unclosed braces on variable expansion in \".env\" at line 2.\n...FOO=\\nBAR=\${FOO:-a\"a}...\n                    ^ line 2 offset 17"],
+            ['_=FOO', "Invalid character in variable name in \".env\" at line 1.\n..._=FOO...\n  ^ line 1 offset 0"],
         ];
 
         if ('\\' !== \DIRECTORY_SEPARATOR) {
@@ -175,6 +176,10 @@ public static function getEnvData()
             ["FOO=\nBAR=\${FOO:=TEST}", ['FOO' => 'TEST', 'BAR' => 'TEST']],
             ["FOO=\nBAR=\$FOO:=TEST}", ['FOO' => 'TEST', 'BAR' => 'TEST}']],
             ["FOO=foo\nFOOBAR=\${FOO}\${BAR}", ['FOO' => 'foo', 'FOOBAR' => 'foo']],
+
+            // underscores
+            ['_FOO=BAR', ['_FOO' => 'BAR']],
+            ['_FOO_BAR=FOOBAR', ['_FOO_BAR' => 'FOOBAR']],
         ];
 
         if ('\\' !== \DIRECTORY_SEPARATOR) {

src/Symfony/Component/Notifier/Bridge/Smsc/SmscTransport.php

@@ -34,9 +34,9 @@ final class SmscTransport extends AbstractTransport
     private ?string $password;
     private string $from;
 
-    public function __construct(?string $username, #[\SensitiveParameter] ?string $password, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(string $login, #[\SensitiveParameter] string $password, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
     {
-        $this->login = $username;
+        $this->login = $login;
         $this->password = $password;
         $this->from = $from;