Issue #85: Support symfony/console 8, but also older symfony/console versions. (#86)

Author: donquixote

commands/web/drupal

@@ -40,20 +40,23 @@ $loader->addPsr4('DrupalCoreDev\\', $composer_root . '/.ddev/core-dev/src/');
 
 $application = new Application('drupal', \Drupal::VERSION);
 
-$application->add(new InstallCommand($loader));
-$application->add(new UninstallCommand());
-$application->add(new ModuleInstallCommand($loader));
-$application->add(new CacheCommand($loader));
-$application->add(new AdminLoginCommand($loader));
-$application->add(new GenerateTheme());
-$application->add(new TestCommand());
-$application->add(new TestExtensionsCommand());
-$application->add(new TestBrowserCommand());
-$application->add(new LintPhpCsCommand());
-$application->add(new LintPhpStanCommand());
-$application->add(new LintCssCommand());
-$application->add(new LintJsCommand());
-$application->add(new LintCspellCommand());
-$application->add(new LintCommand());
+// Use ->addCommands() which works in different versions of symfony/console.
+$application->addCommands([
+  new InstallCommand($loader),
+  new UninstallCommand(),
+  new ModuleInstallCommand($loader),
+  new CacheCommand($loader),
+  new AdminLoginCommand($loader),
+  new GenerateTheme(),
+  new TestCommand(),
+  new TestExtensionsCommand(),
+  new TestBrowserCommand(),
+  new LintPhpCsCommand(),
+  new LintPhpStanCommand(),
+  new LintCssCommand(),
+  new LintJsCommand(),
+  new LintCspellCommand(),
+  new LintCommand(),
+]);
 
 $application->run();

core-dev/src/Command/AdminLoginCommand.php

@@ -11,7 +11,7 @@ class AdminLoginCommand extends BootCommand {
     /**
      * {@inheritdoc}
      */
-    protected function configure() {
+    protected function configure(): void {
       $this->setName('login')
           ->setDescription('Generates a one-time login link for User 1');
 

core-dev/src/Command/CacheCommand.php

@@ -10,7 +10,7 @@ class CacheCommand extends BootCommand {
     /**
      * {@inheritdoc}
      */
-    protected function configure() {
+    protected function configure(): void {
       parent::configure();
       $this->setName('cache')
           ->setDescription('Clears all caches and the container registry');

core-dev/src/Command/ModuleInstallCommand.php

@@ -12,7 +12,7 @@ class ModuleInstallCommand extends BootCommand {
     /**
      * {@inheritdoc}
      */
-    protected function configure() {
+    protected function configure(): void {
       parent::configure();
       $this->setName('module:install')
           ->setDescription('Install modules')

core-dev/src/Command/TestCommand.php

@@ -14,7 +14,7 @@ class TestCommand extends Command {
     /**
      * {@inheritdoc}
      */
-    protected function configure() {
+    protected function configure(): void {
         $this->setName('test')
           ->setDescription('Run all core tests using the run-tests.sh script. You probably don\'t want to do this - instead run PHPUnit directly on selected tests e.g. ddev phpunit core/modules/sdc/tests');
 

core-dev/src/Command/UninstallCommand.php

@@ -12,7 +12,7 @@ class UninstallCommand extends Command {
     /**
      * {@inheritdoc}
      */
-    protected function configure() {
+    protected function configure(): void {
       $this->setName('uninstall')
           ->setDescription('Uninstall Drupal by deleting settings.');
     }