Merge branch 'patch-1'

Author: taylorotwell

src/Commands/Concerns/InstallsRoadRunnerDependencies.php

@@ -7,6 +7,7 @@
 use Spiral\RoadRunner\Http\PSR7Worker;
 use Symfony\Component\Process\Exception\ProcessSignaledException;
 use Symfony\Component\Process\ExecutableFinder;
+use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
 
 trait InstallsRoadRunnerDependencies
@@ -62,11 +63,13 @@ protected function findComposer()
     {
         $composerPath = getcwd().'/composer.phar';
 
-        if (file_exists($composerPath)) {
-            return '"'.PHP_BINARY.'" '.$composerPath;
+        $phpPath = (new PhpExecutableFinder)->find();
+
+        if (! file_exists($composerPath)) {
+            $composerPath = (new ExecutableFinder())->find('composer');
         }
 
-        return 'composer';
+        return '"'.$phpPath.'" '.$composerPath;
     }
 
     /**
@@ -88,6 +91,7 @@ protected function ensureRoadRunnerBinaryIsInstalled(): string
 
         if ($this->confirm('Unable to locate RoadRunner binary. Should Octane download the binary for your operating system?', true)) {
             tap(new Process(array_filter([
+                (new PhpExecutableFinder)->find(),
                 './vendor/bin/rr',
                 'get-binary',
                 '-n',

src/Commands/StartRoadRunnerCommand.php

@@ -6,6 +6,7 @@
 use Laravel\Octane\RoadRunner\ServerProcessInspector;
 use Laravel\Octane\RoadRunner\ServerStateFile;
 use Symfony\Component\Console\Command\SignalableCommandInterface;
+use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
 
 class StartRoadRunnerCommand extends Command implements SignalableCommandInterface
@@ -66,7 +67,7 @@ public function handle(ServerProcessInspector $inspector, ServerStateFile $serve
         $server = tap(new Process(array_filter([
             $roadRunnerBinary,
             '-o', 'http.address='.$this->option('host').':'.$this->option('port'),
-            '-o', 'server.command=php ./vendor/bin/roadrunner-worker',
+            '-o', 'server.command='.(new PhpExecutableFinder)->find().' ./vendor/bin/roadrunner-worker',
             '-o', 'http.pool.num_workers='.$this->workerCount(),
             '-o', 'http.pool.max_jobs='.$this->option('max-requests'),
             '-o', 'http.pool.supervisor.exec_ttl='.$this->maxExecutionTime(),