diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index c37f59d..947958d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: true matrix: - php: [7.3, 7.4] + php: [7.3, 7.4, 8.0] laravel: [6.*, 7.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: @@ -19,6 +19,12 @@ jobs: testbench: 5.* - laravel: 6.* testbench: 4.* + exclude: + # excludes laravel 6+7 on php8 + - php: 8.0 + laravel: 6.* + - php: 8.0 + laravel: 7.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} diff --git a/composer.json b/composer.json index 00563d1..637307c 100755 --- a/composer.json +++ b/composer.json @@ -18,17 +18,16 @@ } ], "require": { - "php": "^7.3", + "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", "jaybizzle/crawler-detect": "^1.2", "spatie/laravel-referer": "^1.6", - "torann/geoip": "^1.0" + "torann/geoip": "^1.0|^3.0" }, "require-dev": { - "doctrine/dbal": "^2.5.2", - "fzaninotto/faker": "^1.6", + "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.3", + "mockery/mockery": "^1.4", "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0 || ^6.0", "phpunit/phpunit": "^9.3", "predis/predis": "^1.1"