Skip to content

[develop] Adds Laravel 11 support #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 7, 2023
Merged

[develop] Adds Laravel 11 support #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e03882
Adds Laravel 11 support
nunomaduro Dec 7, 2023
2bb4515
Fix code styling
nunomaduro Dec 7, 2023
b724cbe
Exclude Laravel 10 on PHP 8.1
nunomaduro Dec 7, 2023
5fae7ea
Bumps roadrunner
nunomaduro Dec 7, 2023
686b47f
Excludes L11 on PHP 8.1
nunomaduro Dec 7, 2023
0038a5d
Bumps roadrunner dependencies
nunomaduro Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ jobs:
fail-fast: true
matrix:
php: [8.1, 8.2, 8.3]
laravel: [10]
laravel: [10, 11]
driver: [swoole, openswoole]
exclude:
- php: 8.1
laravel: 11

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.driver }}

Expand Down
28 changes: 14 additions & 14 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,34 @@
],
"require": {
"php": "^8.1.0",
"laravel/framework": "^10.10.1",
"laravel/framework": "^10.10.1|^11.0",
"laminas/laminas-diactoros": "^3.0",
"laravel/serializable-closure": "^1.3.0",
"nesbot/carbon": "^2.66.0",
"symfony/psr-http-message-bridge": "^2.2.0"
"symfony/psr-http-message-bridge": "^2.2.0|^6.4|^7.0"
},
"require-dev": {
"guzzlehttp/guzzle": "^7.6.1",
"inertiajs/inertia-laravel": "^0.6.9",
"laravel/scout": "^10.2.1",
"laravel/socialite": "^5.6.1",
"livewire/livewire": "^2.12.3",
"inertiajs/inertia-laravel": "^0.6.9|^1.0",
"laravel/scout": "^10.2.1|dev-develop",
"laravel/socialite": "^5.6.1|dev-develop",
"livewire/livewire": "^2.12.3|^3.0|dev-feat/l11",
"mockery/mockery": "^1.5.1",
"nunomaduro/collision": "^6.4.0|^7.5.2",
"orchestra/testbench": "^8.5.2",
"nunomaduro/collision": "^6.4.0|^7.5.2|^8.0",
"orchestra/testbench": "^8.5.2|^9.0",
"phpstan/phpstan": "^1.10.15",
"phpunit/phpunit": "^10.1.3",
"spiral/roadrunner-http": "^3.0.1",
"spiral/roadrunner-cli": "^2.5.0"
"phpunit/phpunit": "^10.4",
"spiral/roadrunner-http": "^3.3.0",
"spiral/roadrunner-cli": "^2.6.0"
},
"bin": [
"bin/roadrunner-worker",
"bin/swoole-server"
],
"conflict": {
"spiral/roadrunner": "<2023.1.0",
"spiral/roadrunner-cli": "<2.5.0",
"spiral/roadrunner-http": "<3.0.1"
"spiral/roadrunner-cli": "<2.6.0",
"spiral/roadrunner-http": "<3.3.0"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -75,6 +75,6 @@
"config": {
"sort-packages": true
},
"minimum-stability": "stable",
"minimum-stability": "dev",
"prefer-stable": true
}
4 changes: 2 additions & 2 deletions src/Commands/Concerns/InstallsRoadRunnerDependencies.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ protected function ensureRoadRunnerPackageIsInstalled()
return true;
}

if (! $this->confirm('Octane requires "spiral/roadrunner-http:^3.0.1" and "spiral/roadrunner-cli:^2.5.0". Do you wish to install them as a dependencies?')) {
if (! $this->confirm('Octane requires "spiral/roadrunner-http:^3.3.0" and "spiral/roadrunner-cli:^2.6.0". Do you wish to install them as a dependencies?')) {
$this->error('Octane requires "spiral/roadrunner-http" and "spiral/roadrunner-cli".');

return false;
}

$command = $this->findComposer().' require spiral/roadrunner-http:^3.0.1 spiral/roadrunner-cli:^2.5.0 --with-all-dependencies';
$command = $this->findComposer().' require spiral/roadrunner-http:^3.3.0 spiral/roadrunner-cli:^2.6.0 --with-all-dependencies';

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

Expand Down
2 changes: 1 addition & 1 deletion src/Commands/Concerns/InteractsWithServers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public function getSubscribedSignals(): array
/**
* The method will be called when the application is signaled.
*/
public function handleSignal(int $signal): void
public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
{
$this->stopServer();

Expand Down
2 changes: 1 addition & 1 deletion src/SymfonyProcessFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class SymfonyProcessFactory
* @param mixed|null $input
* @return \Symfony\Component\Process\Process
*/
public function createProcess(array $command, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60)
public function createProcess(array $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60)
{
return new Process($command, $cwd, $env, $input, $timeout);
}
Expand Down