Laravel 11 support final touches

qruto · Mar 20, 2024 · 054efe9 · 054efe9
1 parent 166d07b
commit 054efe9
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 26 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,37 +2,31 @@ name: tests
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest]
-        php: [8.2, 8.1, 8.0]
-        laravel: [9, 10, 11]
-        stability: [prefer-lowest, prefer-stable]
+        os: [ ubuntu-latest ]
+        php: [ 8.3, 8.2, 8.1 ]
+        laravel: [ 10, 11 ]
+        stability: [ prefer-lowest, prefer-stable ]
         exclude:
-          - php: 8.0
-            laravel: 11
           - php: 8.1
             laravel: 11
-          - php: 8.0
-            laravel: 10.*
-          - php: 8.3
-            laravel: 9
 
     services:
       redis:
         image: redis
         ports:
           - 6379:6379
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
@@ -52,11 +46,11 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
+          composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: List Installed Dependencies
         run: composer show -D
 
       - name: Execute tests
-        run: vendor/bin/pest
+        run: composer test:unit
diff --git a/composer.json b/composer.json
@@ -27,12 +27,12 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/broadcasting": "^10.0|^11.0",
-        "illuminate/console": "^10.0|^11.0",
-        "illuminate/contracts": "^10.0|^11.0",
-        "illuminate/http": "^10.0|^11.0",
-        "illuminate/queue": "^10.0|^11.0",
-        "illuminate/routing": "^10.0|^11.0",
+        "illuminate/broadcasting": "^10.0|^11.0.6",
+        "illuminate/console": "^10.0|^11.0.6",
+        "illuminate/contracts": "^10.0|^11.0.6",
+        "illuminate/http": "^10.0|^11.0.6",
+        "illuminate/queue": "^10.0|^11.0.6",
+        "illuminate/routing": "^10.0|^11.0.6",
         "laravel/prompts": "^0.1.16",
         "spatie/laravel-package-tools": "^1.14.1"
     },
@@ -54,7 +54,10 @@
     "autoload": {
         "psr-4": {
             "Qruto\\Wave\\": "src"
-        }
+        },
+        "files": [
+            "src/helpers.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
@@ -91,7 +94,7 @@
     "extra": {
         "laravel": {
             "providers": [
-              "Qruto\\Wave\\WaveServiceProvider"
+                "Qruto\\Wave\\WaveServiceProvider"
             ]
         }
     },

diff --git a/src/WaveServiceProvider.php b/src/WaveServiceProvider.php
@@ -31,9 +31,13 @@ public function configurePackage(Package $package): void
             ->hasConfigFile()
             ->hasRoute('routes')
             ->hasCommand(SsePingCommand::class)
-            ->hasCommand(ConfigPublishCommand::class)
-            ->hasCommand(BroadcastingInstallCommand::class)
             ->hasCommand(ServeCommand::class);
+
+        if (laravel11OrHigher()) {
+            $package
+                ->hasCommand(ConfigPublishCommand::class)
+                ->hasCommand(BroadcastingInstallCommand::class);
+        }
     }
 
     public function registeringPackage()

diff --git a/src/helpers.php b/src/helpers.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Qruto\Wave;
+
+use Illuminate\Foundation\Application;
+
+if (! function_exists('laravel11OrHigher')) {
+    function laravel11OrHigher(): bool
+    {
+        return explode('.', Application::VERSION)[0] >= 11;
+    }
+}
diff --git a/tests/Feature/BroadcastingInstallCommandTest.php b/tests/Feature/BroadcastingInstallCommandTest.php
@@ -3,6 +3,8 @@
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Process;
 
+use function Qruto\Wave\laravel11OrHigher;
+
 it('completely installs all required assets for broadcasting in default scenario', function () {
     File::shouldReceive('copy')
         ->once()
@@ -40,4 +42,4 @@
 
     $this->assertFileExists($this->app->configPath('broadcasting.php'));
     unlink($this->app->configPath('broadcasting.php'));
-});
+})->skip(! laravel11OrHigher(), '`install:broadcasting` command is only available for Laravel 11 or higher.');