Merge pull request #8 from laravel-shift/l11-compatibility

Laravel 11.x Compatibility

Author: aarondfrancis

.github/workflows/tests.yml

@@ -4,42 +4,43 @@ on:
   push:
     branches:
       - main
-
   pull_request:
-    types: [ opened, synchronize, reopened ]
+    types:
+      - opened
+      - synchronize
+      - reopened
 
 jobs:
   test:
     runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
       matrix:
-        php: [  8.0, 8.1, 8.2 ]
-        laravel: [ 8.*, 9.*, 10.* ]
-        dependency-version: [ prefer-lowest, prefer-stable ]
+        php: [8.0, 8.1, 8.2]
+        laravel: ['8.*', '9.*', '10.*', '11.*']
+        dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 8.*
             testbench: 6.*
-
           - laravel: 9.*
             testbench: 7.*
-
           - laravel: 10.*
             testbench: 8.*
-
+          - laravel: 11.*
+            testbench: 9.*
         exclude:
-          # Laravel 8 lowest isn't compatible with newer PHP versions
           - laravel: 8.*
             dependency-version: prefer-lowest
-
-            # PHP 8.2 requires Laravel 9.33 at least, so skip lowest
           - laravel: 9.*
             php: 8.2
             dependency-version: prefer-lowest
-
-            # Laravel 10 requires PHP 8.1
           - laravel: 10.*
             php: 8.0
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} / L${{ matrix.laravel }} / ${{ matrix.dependency-version }}
 

composer.json

@@ -11,14 +11,14 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10",
-        "illuminate/cache": "^8.0|^9.0|^10",
-        "illuminate/console": "^8.0|^9.0|^10"
+        "illuminate/support": "^8.0|^9.0|^10|^11.0",
+        "illuminate/cache": "^8.0|^9.0|^10|^11.0",
+        "illuminate/console": "^8.0|^9.0|^10|^11.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.3",
         "phpunit/phpunit": ">=8.5.23|^9",
-        "orchestra/testbench": "^6.0|^7.0|^8.0"
+        "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0"
     },
     "autoload": {
         "psr-4": {

src/Flaky.php

@@ -64,7 +64,7 @@ public function run(callable $callable)
         return new Result($value, $exception);
     }
 
-    public function handle(Throwable $exception = null)
+    public function handle(?Throwable $exception = null)
     {
         return $this->run(function () use ($exception) {
             if (!is_null($exception)) {
@@ -215,7 +215,7 @@ protected function normalizeRetryWhen($when = null)
         return $when;
     }
 
-    protected function shouldThrowImmediately(Throwable $exception = null)
+    protected function shouldThrowImmediately(?Throwable $exception = null)
     {
         if (is_null($exception)) {
             return false;
@@ -224,7 +224,7 @@ protected function shouldThrowImmediately(Throwable $exception = null)
         return $this->protectionsBypassed() || !$this->exceptionIsFlaky($exception);
     }
 
-    protected function exceptionIsFlaky(Throwable $exception = null)
+    protected function exceptionIsFlaky(?Throwable $exception = null)
     {
         return is_null($this->flakyExceptions) || in_array(get_class($exception), $this->flakyExceptions, true);
     }