[2.x] Merges develop (#812)

* Fix code styling * [develop] Adds Laravel 11 support (#770) * Adds Laravel 11 support * Fix code styling * Exclude Laravel 10 on PHP 8.1 * Bumps roadrunner * Excludes L11 on PHP 8.1 * Bumps roadrunner dependencies --------- Co-authored-by: nunomaduro <nunomaduro@users.noreply.github.com> * Uses stable versions of socialite and livewire * Uses stable version of Scout --------- Co-authored-by: nunomaduro <nunomaduro@users.noreply.github.com>
laravel · Jan 15, 2024 · 1813d57 · 1813d57
1 parent b361587
commit 1813d57
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -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 }}
 

diff --git a/composer.json b/composer.json
@@ -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",
+        "inertiajs/inertia-laravel": "^0.6.9|^1.0",
         "laravel/scout": "^10.2.1",
         "laravel/socialite": "^5.6.1",
-        "livewire/livewire": "^2.12.3",
+        "livewire/livewire": "^2.12.3|^3.0",
         "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": {
@@ -75,6 +75,6 @@
     "config": {
         "sort-packages": true
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true
 }
diff --git a/src/Commands/Concerns/InstallsRoadRunnerDependencies.php b/src/Commands/Concerns/InstallsRoadRunnerDependencies.php
@@ -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);
 

diff --git a/src/Commands/Concerns/InteractsWithServers.php b/src/Commands/Concerns/InteractsWithServers.php
@@ -155,7 +155,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();