update some logic

Author: inhere

src/AbstractApplication.php

@@ -53,20 +53,6 @@ abstract class AbstractApplication implements ApplicationInterface
         'list'    => 'List all group and alone commands',
     ];
 
-    /**
-     * @var int[]
-     */
-    protected static $globalOptionNames = [
-        'debug'          => 1,
-        'profile'        => 1,
-        'no-color'       => 1,
-        'h'              => 1,
-        'help'           => 1,
-        'V'              => 1,
-        'version'        => 1,
-        'no-interactive' => 1,
-    ];
-
     /** @var array */
     protected static $globalOptions = [
         '--debug'          => 'Setting the application runtime debug level(0 - 4)',
@@ -96,8 +82,9 @@ abstract class AbstractApplication implements ApplicationInterface
         'updateAt'     => '2019.01.01',
         'rootPath'     => '',
         'strictMode'   => false,
-        'interactive'  => true,
         'hideRootPath' => true,
+        // global options
+        'no-interactive'  => true,
 
         // 'timeZone' => 'Asia/Shanghai',
         // 'env' => 'prod', // dev test prod
@@ -169,7 +156,7 @@ protected function init(): void
      */
     public static function isGlobalOption(string $name): bool
     {
-        return isset(self::$globalOptionNames[$name]);
+        return isset(GlobalOption::KEY_MAP[$name]);
     }
 
     /**
@@ -563,7 +550,9 @@ public function isStrictMode(): bool
      */
     public function getVerbLevel(): int
     {
-        return (int)$this->input->getLongOpt('debug', (int)$this->config['debug']);
+        $key = GlobalOption::DEBUG;
+
+        return (int)$this->input->getLongOpt($key, (int)$this->config[$key]);
     }
 
     /**
@@ -573,7 +562,10 @@ public function getVerbLevel(): int
      */
     public function isProfile(): bool
     {
-        return (bool)$this->input->getOpt('profile', $this->getParam('profile', false));
+        $key = GlobalOption::PROFILE;
+        $def = (bool)$this->getParam($key, false);
+
+        return $this->input->getBoolOpt($key, $def);
     }
 
     /**
@@ -583,8 +575,9 @@ public function isProfile(): bool
      */
     public function isInteractive(): bool
     {
-        $key = 'no-interactive';
-        $val = (bool)$this->input->getOpt($key, $this->getParam($key, true));
+        $key = GlobalOption::NO_INTERACTIVE;
+        $def = (bool)$this->getParam($key, true);
+        $val = $this->input->getBoolOpt($key, $def);
 
         return $val === false;
     }

src/GlobalOption.php

@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+namespace Inhere\Console;
+
+/**
+ * Class GlobalOption
+ *
+ * @package Inhere\Console
+ */
+class GlobalOption
+{
+    public const HELP = 'help';
+
+    public const DEBUG = 'debug';
+
+    public const VERSION = 'version';
+
+    public const PROFILE = 'profile';
+
+    public const NO_COLOR = 'no-color';
+
+    public const NO_INTERACTIVE = 'no-interactive';
+
+    public const KEY_MAP = [
+        'debug'          => 1,
+        'profile'        => 1,
+        'no-color'       => 1,
+        'h'              => 1,
+        'help'           => 1,
+        'V'              => 1,
+        'version'        => 1,
+        'no-interactive' => 1,
+    ];
+}

src/Traits/FormatOutputAwareTrait.php

@@ -63,7 +63,8 @@
  *
  * @method Generator counterTxt($msg = 'Pending ', $ended = false)
  *
- * @method confirm(string $question, bool $default = true, bool $nl = true): bool
+ * @method confirm(string $question, bool $default = true): bool
+ * @method unConfirm(string $question, bool $default = true): bool
  * @method select(string $description, $options, $default = null, bool $allowExit = true): string
  * @method checkbox(string $description, $options, $default = null, bool $allowExit = true): array
  * @method ask(string $question, string $default = '', Closure $validator = null): string
@@ -299,6 +300,7 @@ public function __call($method, array $args = [])
             return Show::$method(...$args);
         }
 
+        // interact methods
         if (method_exists(Interact::class, $method)) {
             return Interact::$method(...$args);
         }

src/Traits/UserInteractAwareTrait.php

@@ -25,6 +25,8 @@
  * @method array checkbox(string $description, $options, $default = null, $allowExit = true)
  * @method array multiSelect(string $description, $options, $default = null, $allowExit = true)
  *
+ * @method unConfirm(string $question, bool $default = true): bool
+ *
  * @method string askHiddenInput(string $prompt = 'Enter Password:')
  * @method string promptSilent(string $prompt = 'Enter Password:')
  * @method string askPassword(string $prompt = 'Enter Password:')
@@ -52,7 +54,6 @@ public function select(string $description, $options, $default = null, $allowExi
      * @param bool         $allowExit
      *
      * @return string
-     * @see Interact::choice()
      */
     public function choice(string $description, $options, $default = null, $allowExit = true): string
     {
@@ -64,7 +65,6 @@ public function choice(string $description, $options, $default = null, $allowExi
      * @param bool   $default
      *
      * @return bool
-     * @see Interact::confirm()
      */
     public function confirm(string $question, bool $default = true): bool
     {
@@ -77,7 +77,6 @@ public function confirm(string $question, bool $default = true): bool
      * @param Closure|null $validator
      *
      * @return string|null
-     * @see Interact::question()
      */
     public function ask(string $question, string $default = '', Closure $validator = null): ?string
     {

src/Util/Interact.php

@@ -165,6 +165,19 @@ public static function confirm(string $question, bool $default = true): bool
         return Confirm::ask($question, $default);
     }
 
+    /**
+     * Send a message request confirmation
+     *
+     * @param string $question The question message
+     * @param bool   $default  Default value
+     *
+     * @return bool
+     */
+    public static function unConfirm(string $question, bool $default = true): bool
+    {
+        return false === Confirm::ask($question, $default);
+    }
+
     /**
      * Usage:
      *