up: update php run-unit command logic

inhere · Dec 28, 2021 · 0e4cf18 · 0e4cf18
1 parent 1078b95
commit 0e4cf18
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/app/Console/Controller/GitLabController.php b/app/Console/Controller/GitLabController.php
@@ -613,9 +613,10 @@ public function resolveCommand(FlagsParser $fs, Output $output): void
      *
      * @example
      *   {binWithCmd}                       Will generate PR link for fork 'HEAD_BRANCH' to main 'HEAD_BRANCH'
-     *   {binWithCmd} -s 4_16 -t qa         Will generate PR link for main 'PREFIX_4_16' to main 'qa'
+     *   {binWithCmd} -o @                  Will open PR link for fork 'HEAD_BRANCH' to main 'HEAD_BRANCH' on browser
+     *   {binWithCmd} -o qa                 Will open PR link for main 'HEAD_BRANCH' to main 'qa' on browser
      *   {binWithCmd} -t qa                 Will generate PR link for main 'HEAD_BRANCH' to main 'qa'
-     *   {binWithCmd} -t qa  --direct       Will generate PR link for fork 'HEAD_BRANCH' to main 'qa'
+     *   {binWithCmd} -t qa --direct       Will generate PR link for fork 'HEAD_BRANCH' to main 'qa'
      */
     public function pullRequestCommand(FlagsParser $fs, Output $output): void
     {

diff --git a/app/Console/Controller/PhpController.php b/app/Console/Controller/PhpController.php
@@ -172,6 +172,10 @@ public function sql2arrCommand(FlagsParser $fs, Output $output): void
      *      --php-bin     manual set the php bin  file path.
      *      --phpunit     manual set the phpunit(.phar)  file path.
      *
+     * @example
+     * Use special php and phpunit:
+     * {binWithCmd} --php-bin php7 --phpunit /Users/inhere/.composer/vendor/phpunit/phpunit/phpunit -f KEYWORDS ./test
+     *
      * @param FlagsParser $fs
      * @param Output $output
      */
@@ -189,16 +193,26 @@ public function runUnitCommand(FlagsParser $fs, Output $output): void
 
         $output->info('found the phpunit config dir: ' . $runDir);
 
+        $phpBin = $fs->getOpt('php-bin');
+        if ($phpBin) {
+            $phpunit = $fs->getMustOpt('phpunit');
+
+            $cmd = Cmd::new($phpBin)->add($phpunit);
+        } else {
+            $phpunit = $fs->getOpt('phpunit', 'phpunit');
+
+            $cmd = Cmd::new($phpunit);
+        }
+
         // phpunit --debug --filter KEYWORDS
-        $cmd = Cmd::new('phpunit')->setWorkDir($runDir);
+        $cmd->setWorkDir($runDir);
         $cmd->addIf('--debug', !$fs->getOpt('no-debug'));
 
         if ($filter = $fs->getOpt('filter')) {
             $cmd->addArgs('--filter', $filter);
         }
 
         $cmd->runAndPrint();
-
         $output->success('Complete');
     }