Skip to content

Commit

Permalink
Improvements for composer normalizing
Browse files Browse the repository at this point in the history
Move into one workflow

Normalized

Adjust description

Allow plugin

Allow ergbnis/composer-normalize plugin
  • Loading branch information
codedge committed Feb 8, 2023
1 parent 597537d commit 426993f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 66 deletions.
31 changes: 0 additions & 31 deletions .github/workflows/auto-merge.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/composer-normalize.yml

This file was deleted.

7 changes: 4 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@ jobs:
strategy:
matrix:
php: ['8.0', '8.1']
laravel: [8.*, 9.*, 10.*]
laravel: [9.*, 10.*]
dependency-version: [prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
testbench: 7.*
- laravel: 8.*
testbench: 6.*
exclude:
- laravel: 10.*
php: 8.0
Expand Down Expand Up @@ -49,6 +47,9 @@ jobs:
env:
APP_ENV: testing

- name: Normalize composer.json
run: composer normalize --indent-style=space --indent-size=4 --no-check-lock --no-update-lock --no-interaction --ansi

- name: Run tests
run: composer run test
env:
Expand Down
15 changes: 9 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codedge/laravel-fpdf",
"description": "Laravel package to include Fpdf. It ships with Fpdf 1.84.",
"description": "Laravel package to include Fpdf. It ships with Fpdf 1.85.",
"license": "MIT",
"keywords": [
"fpdf",
Expand All @@ -18,12 +18,13 @@
"source": "https://github.com/codedge/laravel-fpdf"
},
"require": {
"php": "^8.0 || ^8.1",
"illuminate/support": "^8.0 || ^9.0|^10.0"
"php": "~8.0 || ~8.1",
"illuminate/support": "^9.0 || ^10.0"
},
"require-dev": {
"orchestra/testbench": "^6.25.1|^8.0",
"phpunit/phpunit": "^9.6.0|^9.5.10"
"ergebnis/composer-normalize": "^2.29",
"orchestra/testbench": "^6.25.1 || ^8.0",
"phpunit/phpunit": "^9.6.0"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand All @@ -38,7 +39,9 @@
}
},
"config": {
"allow-plugins": [],
"allow-plugins": {
"ergebnis/composer-normalize": true
},
"sort-packages": true
},
"extra": {
Expand Down

0 comments on commit 426993f

Please sign in to comment.