Skip to content

Commit

Permalink
Merge branch 'master' into release-2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dsbilling committed May 21, 2024
2 parents bd11998 + 757c292 commit a8e92b7
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ updates:
schedule:
interval: "weekly"
labels:
- "dependencies"
- "dependencies"
8 changes: 4 additions & 4 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:

- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.6.0
uses: dependabot/fetch-metadata@v2
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Auto-merge Dependabot PRs for semver-minor updates
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

- name: Auto-merge Dependabot PRs for semver-patch updates
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
run: gh pr merge --auto --merge "$PR_URL"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
release-notes: ${{ github.event.release.body }}

- name: Commit updated CHANGELOG
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
branch: main
commit_message: Update CHANGELOG
Expand Down
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@ The service provider for this package will be automatically registered for you.

### Compatibility

| | 1.0 | 1.1 | 1.2 | 1.3 | 1.4 | 1.5 | 2.0 |
| | 1.0 | 1.1 | 1.2 | 1.3 | 1.4 | 1.5 | 1.6 |
|-------|-----|-----|-----|-----|-----|-----|-----|
| 5.6.x ||||||| |
| 5.7.x ||||||| |
| 5.8.x ||||||| |
| 6.x ||||||| |
| 7.x ||||||| |
| 8.x ||||||| |
| 5.6.x ||||||| |
| 5.7.x ||||||| |
| 5.8.x ||||||| |
| 6.x ||||||| |
| 7.x ||||||| |
| 8.x ||||||| |
| 9.x ||||||||
| 10.x ||||||||
| 11.x ||||||||

## Usage

Expand Down Expand Up @@ -100,7 +101,7 @@ return [
/*
* Intervention Image supports "GD Library" and "Imagick" to process images
* internally. You may choose one of them according to your PHP
* configuration. By default PHP's "GD Library" implementation is used.
* configuration. By default, PHP's "GD Library" implementation is used.
*
* If you want to convert ICO files, you need to use imagick.
*
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
}
],
"require": {
"php": "^8.1|^8.2",
"illuminate/http": "^9.0|^10.0",
"illuminate/support": "^9.0|^10.0",
"php": "^8.1|^8.2|^8.3",
"illuminate/http": "^9.0|^10.0|^11.0",
"illuminate/support": "^9.0|^10.0|^11.0",
"intervention/image": "^2.6"
},
"require-dev": {
"nunomaduro/collision": "^7.0",
"nunomaduro/larastan": "^2.0.1",
"orchestra/testbench": "^8.0",
"orchestra/testbench": "^8.0|^9.0",
"pestphp/pest": "^2.2",
"pestphp/pest-plugin-laravel": "^2.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^10.0"
"phpunit/phpunit": "^10.0|^11.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion config/favicon.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/*
* Intervention Image supports "GD Library" and "Imagick" to process images
* internally. You may choose one of them according to your PHP
* configuration. By default PHP's "GD Library" implementation is used.
* configuration. By default, PHP's "GD Library" implementation is used.
*
* If you want to convert ICO files, you need to use imagick.
*
Expand Down

0 comments on commit a8e92b7

Please sign in to comment.