Merge branch 'laravel-shift-l11-compatibility'

spatie · Mar 13, 2024 · db1d3b3 · db1d3b3
2 parents 0a1649b + b10c632
commit db1d3b3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -2,25 +2,33 @@ name: run-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]
-        laravel: [10.*, 9.*]
+        laravel: ['9.*', '10.*', '11.*']
         stability: [prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
           - laravel: 9.*
             testbench: 7.*
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -17,21 +17,21 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/contracts": "^9.19|^10.0",
+        "illuminate/contracts": "^9.19|^10.0|^11.0",
         "paragonie/ciphersweet": "^4.0.1",
         "spatie/laravel-package-tools": "^1.12.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.8",
-        "nunomaduro/collision": "^6.0",
+        "nunomaduro/collision": "^6.0|^8.0",
         "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^7.0|^8.0",
-        "pestphp/pest": "^1.21",
-        "pestphp/pest-plugin-laravel": "^1.1",
+        "orchestra/testbench": "^7.0|^8.0|^9.0",
+        "pestphp/pest": "^1.21|^2.34",
+        "pestphp/pest-plugin-laravel": "^1.1|^2.3",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.5|^10.5",
         "spatie/laravel-ray": "^1.26"
     },
     "autoload": {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -20,8 +20,15 @@ public function getEnvironmentSetUp($app)
         config()->set('database.default', 'testing');
         config()->set('ciphersweet.providers.string.key', Hex::encode(random_bytes(32)));
 
-        $migration = include __DIR__.'/../vendor/orchestra/testbench-core/laravel/migrations/2014_10_12_000000_testbench_create_users_table.php';
-        $migration->up();
+        if (file_exists(__DIR__.'/../vendor/orchestra/testbench-core/laravel/migrations/2014_10_12_000000_testbench_create_users_table.php')) {
+            $migration = include __DIR__.'/../vendor/orchestra/testbench-core/laravel/migrations/2014_10_12_000000_testbench_create_users_table.php';
+            $migration->up();
+        }
+
+        if (file_exists(__DIR__.'/../vendor/orchestra/testbench-core/laravel/migrations/0001_01_01_000000_testbench_create_users_table.php')) {
+            $migration = include __DIR__.'/../vendor/orchestra/testbench-core/laravel/migrations/0001_01_01_000000_testbench_create_users_table.php';
+            $migration->up();
+        }
 
         $migration = include __DIR__.'/../database/migrations/create_blind_indexes_table.php';
         $migration->up();