Clean-up base generators

Author: Chi-teck

src/Command/DrupalGenerator.php

@@ -101,7 +101,7 @@ protected function askNameQuestion() :string {
     $root_directory = basename(Utils::getExtensionRoot($this->directory) ?: $this->directory);
     $default_value = Utils::machine2human($root_directory);
     $name_question = new Question($this->nameQuestion, $default_value);
-    $name_question->setValidator([__CLASS__, 'validateRequired']);
+    $name_question->setValidator([get_class($this), 'validateRequired']);
     if (!$this->isNewExtension && $extensions = $this->getExtensionList()) {
       $name_question->setAutocompleterValues($extensions);
     }
@@ -114,7 +114,7 @@ protected function askNameQuestion() :string {
   protected function askMachineNameQuestion() :string {
     $default_value = Utils::human2machine($this->vars['name'] ?? basename($this->directory));
     $machine_name_question = new Question($this->machineNameQuestion, $default_value);
-    $machine_name_question->setValidator([__CLASS__, 'validateRequiredMachineName']);
+    $machine_name_question->setValidator([get_class($this), 'validateRequiredMachineName']);
     if (!$this->isNewExtension && $extensions = $this->getExtensionList()) {
       $machine_name_question->setAutocompleterValues(array_keys($extensions));
     }

src/Command/Generator.php

@@ -89,32 +89,14 @@ abstract class Generator extends Command implements GeneratorInterface, IOAwareI
   /**
    * {@inheritdoc}
    */
-  protected function configure():void {
+  protected function configure() :void {
     $this
       ->setName($this->name)
       ->setDescription($this->description)
-      ->addOption(
-        'directory',
-        '-d',
-        InputOption::VALUE_OPTIONAL,
-        'Working directory'
-      )
-      ->addOption(
-        'answer',
-        '-a',
-        InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL,
-        'Answer to generator question'
-      )
-      ->addOption(
-        'dry-run',
-        NULL,
-        InputOption::VALUE_NONE,
-        'Output the generated code but not save it to file system'
-      );
-
-    if ($this->alias) {
-      $this->setAliases([$this->alias]);
-    }
+      ->addOption('directory', '-d', InputOption::VALUE_OPTIONAL, 'Working directory')
+      ->addOption('answer', '-a', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'Answer to generator question')
+      ->addOption('dry-run', NULL, InputOption::VALUE_NONE, 'Output the generated code but not save it to file system')
+      ->setAliases($this->alias ? [$this->alias] : []);
   }
 
   /**
@@ -221,7 +203,7 @@ protected function ask(string $question, $default = NULL, $validator = NULL) {
     // Allow the validators to be referenced in a short form like
     // '::validateMachineName'.
     if (is_string($validator) && substr($validator, 0, 2) == '::') {
-      $validator = [__CLASS__, substr($validator, 2)];
+      $validator = [get_class($this), substr($validator, 2)];
     }
     return $this->io->ask($question, $default, $validator);
   }