handle --pest option

laravel · Sep 14, 2023 · 67ddb58 · 67ddb58
1 parent 506318c
commit 67ddb58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Commands/LocalCommand.php b/src/Commands/LocalCommand.php
@@ -57,7 +57,7 @@ protected function configure()
      */
     public function handle()
     {
-        $options = array_slice($_SERVER['argv'], $this->option('php') ? 3 : 2);
+        $options = array_slice($_SERVER['argv'], $this->option('php') && array_search('--php='.$this->option('php'), $_SERVER['argv']) !== false ? 3 : 2);
 
         $status = 0;
 

diff --git a/src/Commands/TestCommand.php b/src/Commands/TestCommand.php
@@ -30,6 +30,7 @@ protected function configure()
         $this
             ->setName('test')
             ->addOption('php', null, InputOption::VALUE_OPTIONAL, 'The PHP version that should be used to execute the tests')
+            ->addOption('pest', null, InputOption::VALUE_NONE, 'Run Pest tests')
             ->setDescription('Run PHPUnit or Pest inside a simulated Vapor environment');
     }
 
@@ -42,7 +43,7 @@ protected function configure()
      */
     public function handle()
     {
-        array_splice($_SERVER['argv'], 2, 0, $this->getTestRunnerBinary());
+        array_splice($_SERVER['argv'], 2, count($_SERVER['argv']), $this->getTestRunnerBinary());
 
         $this->getApplication()->find('local')->run(new ArrayInput([
             '--php' => $this->option('php'),
@@ -56,6 +57,6 @@ public function handle()
      */
     protected function getTestRunnerBinary()
     {
-        return is_executable('vendor/bin/pest') ? 'vendor/bin/pest' : 'vendor/bin/phpunit';
+        return $this->option('pest') ? 'vendor/bin/pest' : 'vendor/bin/phpunit';
     }
 }