Pass to generators

Author: Chi-teck

src/Command/Composer.php

@@ -19,8 +19,8 @@ final class Composer extends DrupalGenerator {
   /**
    * {@inheritdoc}
    */
-  protected function generate(): void {
-    $vars = &$this->collectDefault();
+  protected function generate(array &$vars): void {
+    $this->collectDefault($vars);
     $vars['description'] = $this->ask('Description');
 
     $type_question = new Question('Type', 'drupal-module');

src/Command/ConfigurationEntity.php

@@ -14,8 +14,8 @@ final class ConfigurationEntity extends ModuleGenerator {
   /**
    * {@inheritdoc}
    */
-  protected function generate(): void {
-    $vars = &$this->collectDefault();
+  protected function generate(array &$vars): void {
+    $this->collectDefault($vars);
 
     $vars['entity_type_label'] = $this->ask('Entity type label', '{name}');
     $vars['entity_type_id'] = $this->ask('Entity type ID', '{entity_type_label|h2m}');

src/Command/Console/DcgCommand.php

@@ -18,9 +18,7 @@ final class DcgCommand extends Generator {
   /**
    * {@inheritdoc}
    */
-  protected function generate(): void {
-    $vars = &$this->vars;
-
+  protected function generate(array &$vars): void {
     $command_name_validator = static function (?string $value): ?string {
       return self::validate($value, '^[a-z][a-z0-9-_:]*[a-z0-9]$', 'The value is not correct command name.');
     };

src/Command/Console/DrupalConsoleCommand.php

@@ -16,8 +16,8 @@ final class DrupalConsoleCommand extends ModuleGenerator {
   /**
    * {@inheritdoc}
    */
-  protected function generate(): void {
-    $vars = &$this->collectDefault();
+  protected function generate(array &$vars): void {
+    $this->collectDefault($vars);
 
     $vars['command_name'] = $this->ask('Command name', '{machine_name}:example');
     $vars['description'] = $this->ask('Command description', 'Command description.');

src/Command/Console/DrushCommand.php

@@ -16,9 +16,7 @@ final class DrushCommand extends Generator {
   /**
    * {@inheritdoc}
    */
-  protected function generate(): void {
-    $vars = &$this->vars;
-
+  protected function generate(array &$vars): void {
     $vars['command_name'] = $this->ask('Command name', '');
     $vars['alias'] = $this->ask('Command alias', \substr($vars['command_name'], 0, 3));
     $vars['description'] = $this->ask('Command description', 'Command description.');

src/Command/Console/SymfonyCommand.php

@@ -17,8 +17,8 @@ final class SymfonyCommand extends ModuleGenerator {
   /**
    * {@inheritdoc}
    */
-  protected function generate(): void {
-    $vars = &$this->collectDefault();
+  protected function generate(array &$vars): void {
+    $this->collectDefault($vars);
     $command_name_validator = static function (?string $value): ?string {
       return self::validate($value, '^[a-z][a-z0-9-_:]*[a-z0-9]$', 'The value is not correct command name.');
     };

src/Command/ContentEntity.php

@@ -13,8 +13,8 @@ final class ContentEntity extends ModuleGenerator {
   /**
    * {@inheritdoc}
    */
-  protected function generate(): void {
-    $vars = &$this->collectDefault();
+  protected function generate(array &$vars): void {
+    $this->collectDefault($vars);
 
     $vars['entity_type_label'] = $this->ask('Entity type label', '{name}');
     $vars['entity_type_id'] = $this->ask('Entity type ID', '{entity_type_label|h2m}');

src/Command/Controller.php

@@ -13,11 +13,11 @@ final class Controller extends ModuleGenerator {
   /**
    * {@inheritdoc}
    */
-  protected function generate(): void {
-    $vars = &$this->collectDefault();
+  protected function generate(array &$vars): void {
+    $this->collectDefault($vars);
     $vars['class'] = $this->ask('Class', '{machine_name|camelize}Controller');
 
-    $this->collectServices(FALSE);
+    $this->collectServices($vars, FALSE);
 
     if ($this->confirm('Would you like to create a route for this controller?')) {
       $vars['route_name'] = $this->ask('Route name', '{machine_name}.example');

src/Command/DrupalGenerator.php

@@ -79,23 +79,22 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
   /**
    * Collects default variables.
    */
-  protected function &collectDefault(): array {
+  protected function collectDefault(array &$vars): void {
     // If both name and machine_name questions are defined it is quite possible
     // that we can provide the extension name without interacting with a user.
     if (!$this->isNewExtension && $this->drupalContext && $this->nameQuestion && $this->machineNameQuestion) {
       $extensions = $this->getExtensionList();
-      $this->vars['machine_name'] = $this->askMachineNameQuestion();
-      $this->vars['name'] = $extensions[$this->vars['machine_name']] ?? Utils::machine2human($this->vars['machine_name']);
+      $vars['machine_name'] = $this->askMachineNameQuestion($vars);
+      $vars['name'] = $extensions[$vars['machine_name']] ?? Utils::machine2human($vars['machine_name']);
     }
     else {
       if ($this->nameQuestion) {
-        $this->vars['name'] = $this->askNameQuestion();
+        $vars['name'] = $this->askNameQuestion();
       }
       if ($this->machineNameQuestion) {
-        $this->vars['machine_name'] = $this->askMachineNameQuestion();
+        $vars['machine_name'] = $this->askMachineNameQuestion($vars);
       }
     }
-    return $this->vars;
   }
 
   /**
@@ -115,8 +114,8 @@ protected function askNameQuestion(): string {
   /**
    * Asks machine name question.
    */
-  protected function askMachineNameQuestion(): string {
-    $default_value = Utils::human2machine($this->vars['name'] ?? \basename($this->directory));
+  protected function askMachineNameQuestion(array $vars): string {
+    $default_value = Utils::human2machine($vars['name'] ?? \basename($this->directory));
     $machine_name_question = new Question($this->machineNameQuestion, $default_value);
     $machine_name_question->setValidator([static::class, 'validateRequiredMachineName']);
     if (!$this->isNewExtension && $extensions = $this->getExtensionList()) {
@@ -139,15 +138,15 @@ protected function getExtensionList(): array {
   /**
    * {@inheritdoc}
    */
-  protected function getDestination(): ?string {
+  protected function getDestination(array $vars): ?string {
     if ($this->drupalContext && $this->extensionType) {
       $destination = $this->drupalContext->getDestination(
         $this->extensionType,
         $this->isNewExtension,
-        $this->vars['machine_name'] ?? NULL,
+        $vars['machine_name'] ?? NULL,
       );
     }
-    return $destination ?? parent::getDestination();
+    return $destination ?? parent::getDestination($vars);
   }
 
 }

src/Command/Field.php

@@ -113,9 +113,9 @@ final class Field extends ModuleGenerator {
   /**
    * {@inheritdoc}
    */
-  protected function generate(): void {
+  protected function generate(array &$vars): void {
 
-    $vars = &$this->collectDefault();
+    $this->collectDefault($vars);
 
     $vars['field_label'] = $this->ask('Field label', 'Example', '::validateRequired');
     $vars['field_id'] = $this->ask('Field ID', '{machine_name}_{field_label|h2m}', '::validateRequiredMachineName');