Fixes #287

Author: sikhlana

src/Commands/Concerns/InstallsRoadRunnerDependencies.php

@@ -5,6 +5,7 @@
 use Illuminate\Support\Str;
 use RuntimeException;
 use Spiral\RoadRunner\Http\PSR7Worker;
+use Laravel\Octane\RoadRunner\Concerns\FindsRoadRunnerBinary;
 use Symfony\Component\Process\Exception\ProcessSignaledException;
 use Symfony\Component\Process\ExecutableFinder;
 use Symfony\Component\Process\PhpExecutableFinder;
@@ -13,6 +14,8 @@
 
 trait InstallsRoadRunnerDependencies
 {
+    use FindsRoadRunnerBinary;
+
     /**
      * The minimum required version of the RoadRunner binary.
      *
@@ -97,14 +100,8 @@ protected function findComposer()
      */
     protected function ensureRoadRunnerBinaryIsInstalled(): string
     {
-        if (file_exists(base_path('rr'))) {
-            return base_path('rr');
-        }
-
-        if (! is_null($roadRunnerBinary = (new ExecutableFinder)->find('rr', null, [base_path()]))) {
-            if (! Str::contains($roadRunnerBinary, 'vendor/bin/rr')) {
-                return $roadRunnerBinary;
-            }
+        if (! is_null($roadRunnerBinary = $this->findRoadRunnerBinary())) {
+            return $roadRunnerBinary;
         }
 
         if ($this->confirm('Unable to locate RoadRunner binary. Should Octane download the binary for your operating system?', true)) {

src/RoadRunner/Concerns/FindsRoadRunnerBinary.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Laravel\Octane\RoadRunner\Concerns;
+
+use Illuminate\Support\Str;
+use Symfony\Component\Process\ExecutableFinder;
+
+trait FindsRoadRunnerBinary
+{
+    protected function findRoadRunnerBinary(): ?string
+    {
+        if (file_exists(base_path('rr'))) {
+            return base_path('rr');
+        }
+
+        if (! is_null($roadRunnerBinary = (new ExecutableFinder)->find('rr', null, [base_path()]))) {
+            if (! Str::contains($roadRunnerBinary, 'vendor/bin/rr')) {
+                return $roadRunnerBinary;
+            }
+        }
+
+        return null;
+    }
+}

src/RoadRunner/ServerProcessInspector.php

@@ -6,9 +6,12 @@
 use Laravel\Octane\SymfonyProcessFactory;
 use RuntimeException;
 use Symfony\Component\Process\Process;
+use Laravel\Octane\RoadRunner\Concerns\FindsRoadRunnerBinary;
 
 class ServerProcessInspector
 {
+    use FindsRoadRunnerBinary;
+
     public function __construct(
         protected ServerStateFile $serverStateFile,
         protected SymfonyProcessFactory $processFactory,
@@ -45,7 +48,7 @@ public function reloadServer(): void
         ] = $this->serverStateFile->read();
 
         tap($this->processFactory->createProcess([
-            './rr',
+            $this->findRoadRunnerBinary(),
             'reset',
             '-o', "rpc.listen=tcp://$host:$rpcPort",
         ], base_path()))->start()->waitUntil(function ($type, $buffer) {

tests/RoadRunnerServerProcessInspectorTest.php

@@ -7,9 +7,12 @@
 use Laravel\Octane\RoadRunner\ServerStateFile;
 use Laravel\Octane\SymfonyProcessFactory;
 use Mockery;
+use Laravel\Octane\RoadRunner\Concerns\FindsRoadRunnerBinary;
 
 class RoadRunnerServerProcessInspectorTest extends TestCase
 {
+    use FindsRoadRunnerBinary;
+
     public function test_can_determine_if_roadrunner_server_process_is_running_when_master_is_running()
     {
         $inspector = new ServerProcessInspector(
@@ -59,7 +62,7 @@ public function test_roadrunner_server_process_can_be_reloaded()
         ]);
 
         $processFactory->shouldReceive('createProcess')->with(
-            ['./rr', 'reset', '-o', 'rpc.listen=tcp://127.0.0.1:6002'],
+            [$this->findRoadRunnerBinary(), 'reset', '-o', 'rpc.listen=tcp://127.0.0.1:6002'],
             base_path(),
         )->andReturn($process = Mockery::mock('stdClass'));