Skip to content

Commit 426993f

Browse files
committed
Improvements for composer normalizing
Move into one workflow Normalized Adjust description Allow plugin Allow ergbnis/composer-normalize plugin
1 parent 597537d commit 426993f

File tree

4 files changed

+13
-66
lines changed

4 files changed

+13
-66
lines changed

.github/workflows/auto-merge.yml

-31
This file was deleted.

.github/workflows/composer-normalize.yml

-26
This file was deleted.

.github/workflows/tests.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ jobs:
66
strategy:
77
matrix:
88
php: ['8.0', '8.1']
9-
laravel: [8.*, 9.*, 10.*]
9+
laravel: [9.*, 10.*]
1010
dependency-version: [prefer-stable]
1111
include:
1212
- laravel: 10.*
1313
testbench: 8.*
1414
- laravel: 9.*
1515
testbench: 7.*
16-
- laravel: 8.*
17-
testbench: 6.*
1816
exclude:
1917
- laravel: 10.*
2018
php: 8.0
@@ -49,6 +47,9 @@ jobs:
4947
env:
5048
APP_ENV: testing
5149

50+
- name: Normalize composer.json
51+
run: composer normalize --indent-style=space --indent-size=4 --no-check-lock --no-update-lock --no-interaction --ansi
52+
5253
- name: Run tests
5354
run: composer run test
5455
env:

composer.json

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codedge/laravel-fpdf",
3-
"description": "Laravel package to include Fpdf. It ships with Fpdf 1.84.",
3+
"description": "Laravel package to include Fpdf. It ships with Fpdf 1.85.",
44
"license": "MIT",
55
"keywords": [
66
"fpdf",
@@ -18,12 +18,13 @@
1818
"source": "https://github.com/codedge/laravel-fpdf"
1919
},
2020
"require": {
21-
"php": "^8.0 || ^8.1",
22-
"illuminate/support": "^8.0 || ^9.0|^10.0"
21+
"php": "~8.0 || ~8.1",
22+
"illuminate/support": "^9.0 || ^10.0"
2323
},
2424
"require-dev": {
25-
"orchestra/testbench": "^6.25.1|^8.0",
26-
"phpunit/phpunit": "^9.6.0|^9.5.10"
25+
"ergebnis/composer-normalize": "^2.29",
26+
"orchestra/testbench": "^6.25.1 || ^8.0",
27+
"phpunit/phpunit": "^9.6.0"
2728
},
2829
"minimum-stability": "dev",
2930
"prefer-stable": true,
@@ -38,7 +39,9 @@
3839
}
3940
},
4041
"config": {
41-
"allow-plugins": [],
42+
"allow-plugins": {
43+
"ergebnis/composer-normalize": true
44+
},
4245
"sort-packages": true
4346
},
4447
"extra": {

0 commit comments

Comments
 (0)