Merge pull request #78 from SamuelNitsche/laravel-9

Add support for Laravel 9

Author: BSN4

.github/workflows/run-tests.yml

@@ -7,19 +7,31 @@ jobs:
         runs-on: ubuntu-latest
 
         strategy:
-            fail-fast: true
+            fail-fast: false
             matrix:
-                php: [7.3, 7.4, 8.0]
-                laravel: [6.*, 7.*, 8.*]
+                php: [7.3, 7.4, 8.0, 8.1]
+                laravel: [6.*, 7.*, 8.*, 9.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    -   laravel: 9.*
+                        testbench: 7.*
                     -   laravel: 8.*
                         testbench: 6.*
                     -   laravel: 7.*
                         testbench: 5.*
                     -   laravel: 6.*
                         testbench: 4.*
                 exclude:
+                    # excludes php7.3, php7.4 for laravel 9
+                    -   php: 7.3
+                        laravel: 9.*
+                    -   php: 7.4
+                        laravel: 9.*
+                    # excludes laravel 6+7 on php8.1
+                    -   php: 8.1
+                        laravel: 6.*
+                    -   php: 8.1
+                        laravel: 7.*
                     # excludes laravel 6+7 on php8
                     -   php: 8.0
                         laravel: 6.*
@@ -30,15 +42,15 @@ jobs:
 
         steps:
             -   name: Checkout code
-                uses: actions/checkout@v1
+                uses: actions/checkout@v2
 
             -   name: Install SQLite 3
                 run: |
                     sudo apt-get update
                     sudo apt-get install sqlite3
                     sudo apt-get install redis
             -   name: Cache dependencies
-                uses: actions/cache@v1
+                uses: actions/cache@v2
                 with:
                     path: ~/.composer/cache/files
                     key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

composer.json

@@ -18,17 +18,17 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
-        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0",
+        "php": "^7.3 || ^8.0",
+        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
         "jaybizzle/crawler-detect": "^1.2",
         "spatie/laravel-referer": "^1.6",
         "torann/geoip": "^1.0|^3.0"
     },
     "require-dev": {
         "doctrine/dbal": "^2.6|^3.0",
-        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0",
-        "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0 || ^6.0",
+        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "mockery/mockery": "^1.4 || ^2.0",
+        "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
         "phpunit/phpunit": "^9.3",
         "predis/predis": "^1.1"
     },

tests/TestCase.php

@@ -32,7 +32,7 @@ public function setUp(): void
         parent::setUp();
 
         $this->app['config']->set('geoip', array_merge(require __DIR__ . '/../vendor/torann/geoip/config/geoip.php'));
-        $this->app['router']->get('/')->middleware(CaptureReferer::class, function () {
+        $this->app['router']->middleware(CaptureReferer::class)->get('/', function () {
             return response(null, 200);
         });
         $this->session = $this->app['session.store'];