Replace default value and update handling of Enter input from the user (

#3730)
hechoendrupal · Jan 23, 2018 · b0a14a8 · b0a14a8
1 parent c1c7deb
commit b0a14a8
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/src/Command/Generate/PluginBlockCommand.php b/src/Command/Generate/PluginBlockCommand.php
@@ -264,7 +264,7 @@ function ($class) {
             $themeRegion =  $this->getIo()->choiceNoList(
                 $this->trans('commands.generate.plugin.block.questions.theme-region'),
                 array_values($themeRegions),
-                null,
+                '',
                 true
             );
             $themeRegion = array_search($themeRegion, $themeRegions);

diff --git a/src/Command/Migrate/ExecuteCommand.php b/src/Command/Migrate/ExecuteCommand.php
@@ -251,11 +251,11 @@ protected function interact(InputInterface $input, OutputInterface $output)
                 $exclude_id = $this->getIo()->choiceNoList(
                     $this->trans('commands.migrate.execute.questions.exclude-id'),
                     array_keys($migrations_list),
-                    null,
+                    '',
                     true
                 );
 
-                if (empty($exclude_id)) {
+                if (empty($exclude_id) || is_numeric($exclude_id)) {
                     break;
                 } else {
                     unset($migrations_list[$exclude_id]);

diff --git a/src/Command/Role/DeleteCommand.php b/src/Command/Role/DeleteCommand.php
@@ -125,11 +125,11 @@ protected function interact(InputInterface $input, OutputInterface $output)
                 $role = $this->getIo()->choiceNoList(
                     $this->trans('commands.common.questions.roles.name'),
                     $roles,
-                    null,
+                    '',
                     true
                 );
                 $role = trim($role);
-                if (empty($role)) {
+                if (empty($role) || is_numeric($role)) {
                     break;
                 }
 

diff --git a/src/Command/Shared/EventsTrait.php b/src/Command/Shared/EventsTrait.php
@@ -28,11 +28,11 @@ public function eventsQuestion()
             $event = $this->getIo()->choiceNoList(
                 $this->trans('commands.common.questions.events.name'),
                 $events,
-                null,
+                '',
                 true
             );
 
-            if (empty($event)) {
+            if (empty($event) || is_numeric($event)) {
                 break;
             }
 

diff --git a/src/Command/Shared/FormTrait.php b/src/Command/Shared/FormTrait.php
@@ -46,11 +46,11 @@ public function formQuestion()
                 $input_type = $this->getIo()->choiceNoList(
                     $this->trans('commands.common.questions.inputs.type'),
                     $input_types,
-                    null,
+                    '',
                     true
                 );
 
-                if (empty($input_type)) {
+                if (empty($input_type) || is_numeric($input_type)) {
                     break;
                 }
 
@@ -78,7 +78,7 @@ public function formQuestion()
                     $inputFieldSet = $this->getIo()->choiceNoList(
                         $this->trans('commands.common.questions.inputs.fieldset'),
                         $fieldSets,
-                        null,
+                        '',
                         true
                     );
 

diff --git a/src/Command/Shared/ProjectDownloadTrait.php b/src/Command/Shared/ProjectDownloadTrait.php
@@ -33,11 +33,11 @@ public function modulesQuestion()
             $moduleName = $this->getIo()->choiceNoList(
                 $this->trans('commands.module.install.questions.module'),
                 $modules,
-                null,
+                '',
                 true
             );
 
-            if (empty($moduleName)) {
+            if (empty($moduleName) && is_numeric($moduleName)) {
                 break;
             }
 
@@ -65,11 +65,11 @@ public function modulesUninstallQuestion()
             $moduleName = $this->getIo()->choiceNoList(
                 $this->trans('commands.module.uninstall.questions.module'),
                 $modules,
-                null,
+                '',
                 true
             );
 
-            if (empty($moduleName)) {
+            if (empty($moduleName) || is_numeric($modules)) {
                 break;
             }
 

diff --git a/src/Command/Theme/InstallCommand.php b/src/Command/Theme/InstallCommand.php
@@ -100,11 +100,11 @@ protected function interact(InputInterface $input, OutputInterface $output)
                 $theme_name = $this->getIo()->choiceNoList(
                     $this->trans('commands.theme.install.questions.theme'),
                     array_keys($theme_list),
-                    null,
+                    '',
                     true
                 );
 
-                if (empty($theme_name)) {
+                if (empty($theme_name) || is_numeric($theme_name)) {
                     break;
                 }
 

diff --git a/src/Command/Theme/UninstallCommand.php b/src/Command/Theme/UninstallCommand.php
@@ -93,11 +93,11 @@ protected function interact(InputInterface $input, OutputInterface $output)
                 $theme_name = $this->getIo()->choiceNoList(
                     $this->trans('commands.theme.uninstall.questions.theme'),
                     array_keys($theme_list),
-                    null,
+                    '',
                     true
                 );
 
-                if (empty($theme_name)) {
+                if (empty($theme_name) || is_numeric($theme_name)) {
                     break;
                 }