From 9ceb914816e667fbf3ac68c685467f3879a50a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Lo=CC=88sken?= Date: Thu, 17 Feb 2022 12:08:56 +0100 Subject: [PATCH 1/3] Support Laravel 9 --- .github/workflows/tests.yml | 6 ++++-- composer.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 99e6834..f638a46 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,10 +5,12 @@ jobs: runs-on: ubuntu-latest strategy: 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-stable] include: + - laravel: 9.* + testbench: 7.* - laravel: 8.* testbench: 6.* - laravel: 7.* diff --git a/composer.json b/composer.json index 6b9de21..b7c5c58 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ }, "require": { "php": ">=7.3 || ^8.0", - "illuminate/support": "^6.0 || ^7.0 || ^8.0" + "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0" }, "require-dev": { "orchestra/testbench": "^6.24.1", From 80f9b63f41843292d77c0c9cb59a811a3fcc2874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Lo=CC=88sken?= Date: Thu, 17 Feb 2022 13:06:24 +0100 Subject: [PATCH 2/3] Laravel Versions --- .github/workflows/tests.yml | 14 ++++++++++---- composer.json | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f638a46..095948a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,8 +5,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['7.3', '7.4', '8.0', '8.1'] - laravel: [6.*, 7.*, 8.*, 9.*] + php: ['7.4', '8.0', '8.1'] + laravel: [7.*, 8.*, 9.*] dependency-version: [prefer-stable] include: - laravel: 9.* @@ -15,8 +15,14 @@ jobs: testbench: 6.* - laravel: 7.* testbench: 5.* - - laravel: 6.* - testbench: 4.* + exclude: + - laravel: 9.* + php: 7.4 + - laravel: 7.* + php: 8.0 + - laravel: 7.* + php: 8.1 + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} steps: - name: Checkout code diff --git a/composer.json b/composer.json index b7c5c58..2a0675e 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ "source": "https://github.com/codedge/laravel-fpdf" }, "require": { - "php": ">=7.3 || ^8.0", - "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0" + "php": "^7.4 || ^8.0 || ^8.1", + "illuminate/support": "^7.0 || ^8.0 || ^9.0" }, "require-dev": { "orchestra/testbench": "^6.24.1", From eb5e3042cc9c5ba3c5bdc37289941acd1315e613 Mon Sep 17 00:00:00 2001 From: codedge Date: Thu, 17 Feb 2022 12:06:47 +0000 Subject: [PATCH 3/3] normalize composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2a0675e..0c698f7 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "source": "https://github.com/codedge/laravel-fpdf" }, "require": { - "php": "^7.4 || ^8.0 || ^8.1", + "php": "^7.4 || ^8.0 || ^8.1", "illuminate/support": "^7.0 || ^8.0 || ^9.0" }, "require-dev": {