up: use new flags replace the input object

Author: inhere

src/BuiltIn/DevServerCommand.php

@@ -9,7 +9,7 @@
 namespace Inhere\Console\BuiltIn;
 
 use Exception;
-use Inhere\Console\Attr\CmdOption;
+use Inhere\Console\Annotate\Attr\CmdOption;
 use Inhere\Console\Command;
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\Output;
@@ -45,8 +45,9 @@ public static function aliases(): array
      *  -H,--host           The server host address(<comment>127.0.0.1</comment>)
      *  -p,--port           The server port number(<comment>8552</comment>)
      *  -b,--php-bin        The php binary file(<comment>php</comment>)
+     *
      * @arguments
-     *  file=STRING         The entry file for server. e.g web/index.php
+     *  file         The entry file for server. e.g web/index.php
      *
      * @param Input  $input
      * @param Output $output
@@ -59,23 +60,22 @@ public static function aliases(): array
     #[CmdOption('dev-serve', 'start a php built-in http server for developmentd')]
     public function execute(Input $input, Output $output)
     {
-        $serveAddr = $input->getSameStringOpt('s,S,addr');
+        $serveAddr = $this->flags->getOpt('addr');
         if (!$serveAddr) {
-            $serveAddr = $input->getSameStringOpt(['H', 'host']);
+            $serveAddr = $this->flags->getOpt('host');
         }
 
-        $port = $input->getSameStringOpt(['p', 'port']);
+        $port = $this->flags->getOpt('port');
         if ($port && strpos($serveAddr, ':') === false) {
             $serveAddr .= ':' . $port;
         }
 
-        $docRoot = $input->getSameStringOpt('t,doc-root');
-        $hceFile = $input->getStringOpt('hce-file');
-        $hceEnv  = $input->getStringOpt('hce-env');
-        $phpBin  = $input->getStringOpt('php-bin');
+        $docRoot = $this->flags->getOpt('doc-root');
+        $hceFile = $this->flags->getOpt('hce-file');
+        $hceEnv  = $this->flags->getOpt('hce-env');
+        $phpBin  = $this->flags->getOpt('php-bin');
 
-        $input->bindArgument('file', 0);
-        $entryFile = $input->getStringArg('file');
+        $entryFile = $this->flags->getArg('file');
 
         $pds = PhpDevServe::new($serveAddr, $docRoot, $entryFile);
         $pds->setPhpBin($phpBin);

src/BuiltIn/PharController.php

@@ -17,6 +17,7 @@
 use Inhere\Console\Util\Helper;
 use Inhere\Console\Util\Show;
 use RuntimeException;
+use Toolkit\PFlag\FlagsParser;
 use Toolkit\Stdlib\Str;
 use function basename;
 use function file_exists;
@@ -77,8 +78,9 @@ protected function packConfigure(Input $input): void
      *      --files         Only pack the list files to the exist phar, multi use ',' split
      *      --no-progress   bool;Disable output progress on the runtime
      *
-     * @param Input  $input
+     * @param Input $input
      * @param Output $output
+     * @param FlagsParser $fs
      *
      * @return int
      * @throws Exception
@@ -92,16 +94,16 @@ protected function packConfigure(Input $input): void
      * only update the input files:
      *   php -d phar.readonly=0 {binFile} phar:pack -o=mycli.phar --debug --files app/Command/ServeCommand.php
      */
-    public function packCommand(Input $input, Output $output): int
+    public function packCommand(Input $input, Output $output, FlagsParser $fs): int
     {
         $startAt = microtime(true);
         $workDir = $input->getPwd();
 
-        $dir = $input->getOpt('dir') ?: $workDir;
+        $dir = $fs->getOpt('dir') ?: $workDir;
         $cpr = $this->configCompiler($dir);
 
-        $refresh  = $input->boolOpt('refresh');
-        $outFile  = $input->getSameStringOpt(['o', 'output'], $this->defPkgName);
+        $refresh  = $fs->getOpt('refresh');
+        $outFile  = $fs->getOpt('output', $this->defPkgName);
         $pharFile = $workDir . '/' . $outFile;
 
         Show::aList([
@@ -111,13 +113,13 @@ public function packCommand(Input $input, Output $output): int
         ], 'Building Information');
 
         // use fast build
-        if ($this->input->boolOpt('fast')) {
+        if ($fs->getOpt('fast')) {
             $cpr->setModifies($cpr->findChangedByGit());
             $this->output->liteNote('Use fast build, will only pack changed or new files(from git status)');
         }
 
         // Manual append some files
-        if ($files = $input->getStringOpt('files')) {
+        if ($files = $fs->getOpt('files')) {
             $cpr->setModifies(Str::explode($files));
             $output->liteInfo("will only pack input files to the exists phar: $outFile");
         }
@@ -130,7 +132,10 @@ public function packCommand(Input $input, Output $output): int
         });
 
         $output->colored('Collect Pack files', 'comment');
-        $this->outputProgress($cpr, $input);
+
+        if (!$fs->getOpt('no-progress')) {
+            $this->outputProgress($cpr);
+        }
 
         // packing ...
         $cpr->pack($pharFile, $refresh);
@@ -178,17 +183,12 @@ protected function configCompiler(string $dir): PharCompiler
 
     /**
      * @param PharCompiler $cpr
-     * @param Input        $input
      *
      * @return void
      */
-    private function outputProgress(PharCompiler $cpr,Input $input): void
+    private function outputProgress(PharCompiler $cpr): void
     {
-        if ($input->getBoolOpt('no-progress')) {
-            return;
-        }
-
-        if ($input->getOpt('debug')) {
+        if ($this->isDebug()) {
             // $output->info('Pack file to Phar ... ...');
             $cpr->onAdd(function (string $path) {
                 $this->writeln(" <info>+</info> $path");
@@ -228,15 +228,16 @@ public function setCompilerConfiger(Closure $compilerConfiger): void
      *  -y, --yes       bool;Whether display goon tips message.
      *  --overwrite     bool;Whether overwrite exists files on extract phar
      *
-     * @param Input  $in
+     * @param Input $in
      * @param Output $out
+     * @param FlagsParser $fs
      *
      * @return int
      * @example {fullCommand} -f myapp.phar -d var/www/app
      */
-    public function unpackCommand($in, $out): int
+    public function unpackCommand(Input $in, Output $out, FlagsParser $fs): int
     {
-        if (!$path = $in->getSameOpt(['f', 'file'])) {
+        if (!$path = $fs->getOpt('file')) {
             return $out->error("Please input the phar file path by option '-f|--file'");
         }
 
@@ -247,8 +248,8 @@ public function unpackCommand($in, $out): int
             return $out->error("The phar file not exists. File: $file");
         }
 
-        $dir       = $in->getSameOpt(['d', 'dir']) ?: $basePath;
-        $overwrite = $in->getBoolOpt('overwrite');
+        $dir       = $fs->getOpt('dir') ?: $basePath;
+        $overwrite = $fs->getOpt('overwrite');
 
         if (!is_dir($dir)) {
             Helper::mkdir($dir);

src/Concern/AttachApplicationTrait.php

@@ -6,6 +6,7 @@
 use Inhere\Console\Application;
 use Inhere\Console\Console;
 use Inhere\Console\GlobalOption;
+use Toolkit\Stdlib\OS;
 
 /**
  * Trait AttachApplicationTrait
@@ -101,6 +102,26 @@ public function getVerbLevel(): int
         return (int)$this->input->getLongOpt('debug', Console::VERB_ERROR);
     }
 
+    /**
+     * @param int $level
+     *
+     * @return bool
+     */
+    public function isDebug(int $level = Console::VERB_DEBUG): bool
+    {
+        if ($this->app) {
+            return $this->app->isDebug();
+        }
+
+        $setVal = Console::VERB_ERROR;
+        $envVal = OS::getEnvStrVal(Console::DEBUG_ENV_KEY);
+        if ($envVal !== '') {
+            $setVal = (int)$envVal;
+        }
+
+        return $level <= $setVal;
+    }
+
     /**
      * @param string $format
      * @param mixed  ...$args