Fix executable args for phpdbg (#572)

* Fix executable args for phpdbg * Refactor php executable args * Fix arguments search in WrapperWorker as well
paratestphp · Dec 15, 2020 · 235db99 · 235db99
1 parent 30e8d22
commit 235db99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Runners/PHPUnit/Worker/RunnerWorker.php b/src/Runners/PHPUnit/Worker/RunnerWorker.php
@@ -31,7 +31,10 @@ public function __construct(ExecutableTest $executableTest, Options $options, in
     {
         $this->executableTest = $executableTest;
 
-        $args = [(new PhpExecutableFinder())->find()];
+        $phpFinder = new PhpExecutableFinder();
+        $args      = [$phpFinder->find(false)];
+        $args      = array_merge($args, $phpFinder->findArguments());
+
         if (($passthruPhp = $options->passthruPhp()) !== null) {
             $args = array_merge($args, $passthruPhp);
         }

diff --git a/src/Runners/PHPUnit/Worker/WrapperWorker.php b/src/Runners/PHPUnit/Worker/WrapperWorker.php
@@ -77,7 +77,10 @@ public function __construct(OutputInterface $output, Options $options, int $toke
         );
         touch($this->writeToPathname);
 
-        $parameters = [(new PhpExecutableFinder())->find()];
+        $phpFinder  = new PhpExecutableFinder();
+        $parameters = [$phpFinder->find(false)];
+        $parameters = array_merge($parameters, $phpFinder->findArguments());
+
         if (($passthruPhp = $options->passthruPhp()) !== null) {
             $parameters = array_merge($parameters, $passthruPhp);
         }