Skip to content

Commit e3bb9ba

Browse files
authored
Merge pull request #482 from laravel/fix/version-option
[1.x] Fixes missing `version` option
2 parents d1052b2 + a39a06d commit e3bb9ba

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"nunomaduro/collision": "^5.10|^6.0",
2727
"orchestra/testbench": "^6.16|^7.0",
2828
"phpunit/phpunit": "^9.3",
29-
"spiral/roadrunner": "^2.0"
29+
"spiral/roadrunner": "^2.8.2"
3030
},
3131
"bin": [
3232
"bin/roadrunner-worker",

src/Commands/Concerns/InstallsRoadRunnerDependencies.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ trait InstallsRoadRunnerDependencies
2121
*
2222
* @var string
2323
*/
24-
protected $requiredVersion = '2.6.6';
24+
protected $requiredVersion = '2.8.2';
2525

2626
/**
2727
* Determine if RoadRunner is installed.
@@ -44,13 +44,13 @@ protected function ensureRoadRunnerPackageIsInstalled()
4444
return true;
4545
}
4646

47-
if (! $this->confirm('Octane requires "spiral/roadrunner:^2.0". Do you wish to install it as a dependency?')) {
47+
if (! $this->confirm('Octane requires "spiral/roadrunner:^2.8.2". Do you wish to install it as a dependency?')) {
4848
$this->error('Octane requires "spiral/roadrunner".');
4949

5050
return false;
5151
}
5252

53-
$command = $this->findComposer().' require spiral/roadrunner:^2.0 --with-all-dependencies';
53+
$command = $this->findComposer().' require spiral/roadrunner:^2.8.2 --with-all-dependencies';
5454

5555
$process = Process::fromShellCommandline($command, null, null, null, null);
5656

src/Commands/Concerns/InteractsWithIO.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ trait InteractsWithIO
2525
'stop signal received, grace timeout is: ',
2626
'exit forced',
2727
'worker allocated',
28+
'worker is allocated',
2829
'worker constructed',
2930
'worker destructed',
3031
'[INFO] RoadRunner server started; version:',

src/Commands/StartRoadRunnerCommand.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public function handle(ServerProcessInspector $inspector, ServerStateFile $serve
7676
$server = tap(new Process(array_filter([
7777
$roadRunnerBinary,
7878
'-c', $this->configPath(),
79+
'-o', 'version=2.7',
7980
'-o', 'http.address='.$this->option('host').':'.$this->option('port'),
8081
'-o', 'server.command='.(new PhpExecutableFinder)->find().' '.base_path('vendor/bin/roadrunner-worker'),
8182
'-o', 'http.pool.num_workers='.$this->workerCount(),

0 commit comments

Comments
 (0)