Merge pull request #3 from hammerstonedev/af-support-8

Support Laravel 8

Author: aarondfrancis

.github/workflows/tests.yml

@@ -15,16 +15,23 @@ jobs:
       fail-fast: false
       matrix:
         php: [  8.0, 8.1, 8.2 ]
-        laravel: [ 9.*, 10.* ]
+        laravel: [ 8.*, 9.*, 10.* ]
         dependency-version: [ prefer-lowest, prefer-stable ]
         include:
+          - laravel: 8.*
+            testbench: 6.*
+
           - laravel: 9.*
             testbench: 7.*
 
           - laravel: 10.*
             testbench: 8.*
 
         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

composer.json

@@ -11,9 +11,9 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^9.0|^10",
-        "illuminate/cache": "^9.0|^10",
-        "illuminate/console": "^9.0|^10"
+        "illuminate/support": "^8.0|^9.0|^10",
+        "illuminate/cache": "^8.0|^9.0|^10",
+        "illuminate/console": "^8.0|^9.0|^10"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.3",

src/Arbiter.php

@@ -7,7 +7,7 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
-use Spatie\Macroable\Macroable;
+use Illuminate\Support\Traits\Macroable;
 
 class Arbiter
 {

src/FlakyCommand.php

@@ -7,7 +7,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
-use Spatie\Macroable\Macroable;
+use Illuminate\Support\Traits\Macroable;
 
 /**
  * @mixin Flaky