Merge branch '7.4' into 8.0

* 7.4: (21 commits)
  [SecurityBundle] Fix tests with Symfony 7.4
  [DependencyInjection] Ensure deprecation detection does not trigger a PHP error
  [DependencyInjection][FrameworkBundle] fix BC break when dumping container for build/lint commands
  [Form] Clean up wrong method docblocks in data transformers
  Fix merge
  [DependencyInjection] Throw when using `$this` or its internal scope from PHP config files; use the `$loader` variable instead
  [HttpClient] Fix sharing CurlClientState between clones of CurlHttpClient instances
  [FrameworkBundle] Don't exclude classes with constraint/serialization attributes from being registered as services
  Revert "[HttpClient] Lazily initialize CurlClientState"
  [Yaml] Fix regression handling blank lines in unquoted scalars
  [Cache] Fix NullAdapter must set taggable
  [FrameworkBundle] Order alphabetically known tags of `UnusedTagsPass`
  allow the installation of MercureBundle 0.4
  [Console] don't discard existing aliases when constructing Command
  Import all node definition classes to DefinitionConfigurator
  Fix the creation of a redis connection with only ext-relay
  [FrameworkBundle] Dump bundles config reference first
  [DependencyInjection] Don't add the .container.known_envs parameter when empty
  [DependencyInjection] Reset resolved state when setting a parameter
  [HttpKernel] Don't reset services between fragments redering when using in HttpCache
  ...

Author: nicolas-grekas

Command/Command.php

@@ -84,6 +84,12 @@ public function __construct(?string $name = null, ?callable $code = null)
                 $name = array_shift($aliases);
             }
 
+            // we must not overwrite existing aliases, combine new ones with existing ones
+            $aliases = array_unique([
+                ...$this->aliases,
+                ...$aliases,
+            ]);
+
             $this->setAliases($aliases);
         }
 

Tests/Command/CommandTest.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Console\Tests\Command;
 
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\TestWithJson;
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -196,14 +196,27 @@ public function testGetProcessedHelp()
     public function testGetSetAliases()
     {
         $command = new \TestCommand();
-        $this->assertEquals(['name'], $command->getAliases(), '->getAliases() returns the aliases');
         $ret = $command->setAliases(['name1']);
         $this->assertEquals($command, $ret, '->setAliases() implements a fluent interface');
         $this->assertEquals(['name1'], $command->getAliases(), '->setAliases() sets the aliases');
     }
 
-    #[TestWithJson('["name|alias1|alias2", "name", ["alias1", "alias2"], false]')]
-    #[TestWithJson('["|alias1|alias2", "alias1", ["alias2"], true]')]
+    public function testAliasesSetBeforeParentConstructorArePreserved()
+    {
+        $command = new class extends Command {
+            public function __construct()
+            {
+                // set aliases before calling parent constructor
+                $this->setAliases(['existingalias']);
+                parent::__construct('foo|newalias');
+            }
+        };
+
+        $this->assertSame(['existingalias', 'newalias'], $command->getAliases(), 'Aliases set before parent::__construct() must be preserved.');
+    }
+
+    #[TestWith(['name|alias1|alias2', 'name', ['alias1', 'alias2'], false])]
+    #[TestWith(['|alias1|alias2', 'alias1', ['alias2'], true])]
     public function testSetAliasesAndHiddenViaName(string $name, string $expectedName, array $expectedAliases, bool $expectedHidden)
     {
         $command = new Command($name);