diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 30c8a49..0bc378d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,4 +9,4 @@ updates: schedule: interval: "weekly" labels: - - "dependencies" \ No newline at end of file + - "dependencies" diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index ca2197d..d4c0b65 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -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" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1487878..c6bce74 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/README.md b/README.md index 98d2d46..93fea52 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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. * diff --git a/composer.json b/composer.json index 1b23a6c..249bff8 100644 --- a/composer.json +++ b/composer.json @@ -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": { diff --git a/config/favicon.php b/config/favicon.php index 0eb0d79..3c45c7e 100644 --- a/config/favicon.php +++ b/config/favicon.php @@ -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. *