From 156f49fa823fbdec4c26691cb83844c9283f14dc Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Tue, 7 Feb 2023 13:14:12 -0500 Subject: [PATCH] feat: support Laravel 10.x (#265) --- .github/workflows/tests.yml | 5 ++++- composer.json | 15 ++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cce8fb5..21f3888 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,10 @@ jobs: fail-fast: false matrix: php-version: ['8.0', '8.1', '8.2'] - laravel_version: [8.*, 9.*] + laravel_version: [8.*, 9.*, 10.*] + exclude: + - laravel_version: 10.* + php-version: 8.0 name: PHP ${{ matrix.php-version }} | Illuminate ${{ matrix.laravel_version }} steps: diff --git a/composer.json b/composer.json index 116b5a3..0ec19ce 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,12 @@ { "name": "monicahq/laravel-cloudflare", "description": "Add Cloudflare ip addresses to trusted proxies for Laravel.", - "keywords": ["laravel", "php", "cloudflare", "proxies"], + "keywords": [ + "laravel", + "php", + "cloudflare", + "proxies" + ], "type": "library", "license": "MIT", "support": { @@ -16,20 +21,20 @@ ], "require": { "php": "^7.4 || ^8.0", - "illuminate/support": "^8.0 || ^9.0" + "illuminate/support": "^8.0 || ^9.0 || ^10.0" }, "require-dev": { "guzzlehttp/guzzle": "^6.3 || ^7.0", "mockery/mockery": "^1.4", - "nunomaduro/larastan": "^1.0", + "nunomaduro/larastan": "^1.0 || ^2.4", "ocramius/package-versions": "^1.5 || ^2.1", - "orchestra/testbench": "^6.0 || ^7.0", + "orchestra/testbench": "^6.0 || ^7.0 || ^8.0", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^8.0 || ^9.0", "thecodingmachine/phpstan-safe-rule": "^1.0", - "vimeo/psalm": "^4.0" + "vimeo/psalm": "^4.0 || ^5.6" }, "autoload": { "psr-4": {