Skip to content

Commit 757c292

Browse files
dsbillingdsbilling
authored
Merge pull request #21 from dsbilling/release-1.6.0
2 parents 6cae6dc + 20d3131 commit 757c292

File tree

9 files changed

+121
-18
lines changed

9 files changed

+121
-18
lines changed

‎.editorconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
; This file is for unifying the coding style for different editors and IDEs.
2-
; More information at http://editorconfig.org
3-
41
root = true
52

63
[*]
@@ -13,3 +10,6 @@ trim_trailing_whitespace = true
1310

1411
[*.md]
1512
trim_trailing_whitespace = false
13+
14+
[*.{yml,yaml}]
15+
indent_size = 2

‎.gitattributes

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
33

44
# Ignore all test and documentation with "export-ignore".
5+
/.github export-ignore
56
/.gitattributes export-ignore
67
/.gitignore export-ignore
7-
/.travis.yml export-ignore
88
/phpunit.xml.dist export-ignore
9-
/.scrutinizer.yml export-ignore
9+
/art export-ignore
10+
/docs export-ignore
1011
/tests export-ignore
1112
/.editorconfig export-ignore
13+
/.php_cs.dist.php export-ignore
14+
/psalm.xml export-ignore
15+
/psalm.xml.dist export-ignore
16+
/testbench.yaml export-ignore
17+
/UPGRADING.md export-ignore
18+
/phpstan.neon.dist export-ignore
19+
/phpstan-baseline.neon export-ignore

‎.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Please see the documentation for all configuration options:
2+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
3+
4+
version: 2
5+
updates:
6+
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"
11+
labels:
12+
- "dependencies"

‎.github/workflows/dependabot-auto-merge.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: dependabot-auto-merge
2+
on: pull_request_target
3+
4+
permissions:
5+
pull-requests: write
6+
contents: write
7+
8+
jobs:
9+
dependabot:
10+
runs-on: ubuntu-latest
11+
if: ${{ github.actor == 'dependabot[bot]' }}
12+
steps:
13+
14+
- name: Dependabot metadata
15+
id: metadata
16+
uses: dependabot/fetch-metadata@v2
17+
with:
18+
github-token: "${{ secrets.GITHUB_TOKEN }}"
19+
20+
- name: Auto-merge Dependabot PRs for semver-minor updates
21+
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
22+
run: gh pr merge --auto --merge "$PR_URL"
23+
env:
24+
PR_URL: ${{github.event.pull_request.html_url}}
25+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
26+
27+
- name: Auto-merge Dependabot PRs for semver-patch updates
28+
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
29+
run: gh pr merge --auto --merge "$PR_URL"
30+
env:
31+
PR_URL: ${{github.event.pull_request.html_url}}
32+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/release.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: "Release"
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
jobs:
8+
update:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v4
14+
with:
15+
ref: main
16+
17+
- name: Update Changelog
18+
uses: stefanzweifel/changelog-updater-action@v1
19+
with:
20+
latest-version: ${{ github.event.release.name }}
21+
release-notes: ${{ github.event.release.body }}
22+
23+
- name: Commit updated CHANGELOG
24+
uses: stefanzweifel/git-auto-commit-action@v5
25+
with:
26+
branch: main
27+
commit_message: Update CHANGELOG
28+
file_pattern: CHANGELOG.md

‎.gitignore

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1+
.idea
2+
.php_cs
3+
.php_cs.cache
4+
.phpunit.result.cache
15
build
26
composer.lock
7+
coverage
38
docs
9+
phpunit.xml
10+
phpstan.neon
11+
testbench.yaml
412
vendor
5-
coverage
13+
node_modules
14+
.php-cs-fixer.cache

‎README.md

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,20 @@ composer require beyondcode/laravel-favicon
2525

2626
The service provider for this package will be automatically registered for you.
2727

28+
### Compatibility
29+
30+
| | 1.0 | 1.1 | 1.2 | 1.3 | 1.4 | 1.5 | 1.6 |
31+
|-------|-----|-----|-----|-----|-----|-----|-----|
32+
| 5.6.x | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
33+
| 5.7.x | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
34+
| 5.8.x | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
35+
| 6.x | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
36+
| 7.x | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ |
37+
| 8.x | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ |
38+
| 9.x | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
39+
| 10.x | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
40+
| 11.x | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ |
41+
2842
## Usage
2943

3044
To make use of this package, make use of the `favicon` helper function that this package provides.
@@ -37,7 +51,7 @@ You can simply wrap the function around your favicon icon names, like this:
3751
<link rel="shortcut icon" href="{{ favicon('favicon.ico') }}" />
3852
```
3953

40-
## Customization
54+
### Customization
4155

4256
You can completely customize which environments you want to have enabled for the favicon generation, as well as the font and colors that will be used.
4357

@@ -87,7 +101,7 @@ return [
87101
/*
88102
* Intervention Image supports "GD Library" and "Imagick" to process images
89103
* internally. You may choose one of them according to your PHP
90-
* configuration. By default PHP's "GD Library" implementation is used.
104+
* configuration. By default, PHP's "GD Library" implementation is used.
91105
*
92106
* If you want to convert ICO files, you need to use imagick.
93107
*
@@ -136,23 +150,23 @@ The `shouldGenerateFavicon` method can be used to determine if a custom favicon
136150

137151
## FAQ
138152

139-
- My ICO files are not working, why?
153+
### My ICO files are not working, why?
140154

141155
In order to modify ICO files, you need the Imagick PHP library installed and enabled in your `config/favicon.php` file.
142156

143-
- Is there a performance impact when I'm using this package?
157+
### Is there a performance impact when I'm using this package?
144158

145159
No - the default generator only modifies your favicon when the specified environment is enabled. This means, that production environments only see the static assets that you already have.
146160

147-
### Changelog
161+
## Changelog
148162

149163
Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recently.
150164

151165
## Contributing
152166

153167
Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
154168

155-
### Security
169+
## Security
156170

157171
If you discover any security related issues, please email [email protected] instead of using the issue tracker.
158172

‎composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.1|^8.0|^8.1|^8.2",
20-
"illuminate/http": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|^10.0",
21-
"illuminate/support": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|^10.0",
19+
"php": "^7.1|^8.0|^8.1|^8.2|^8.3",
20+
"illuminate/http": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|^10.0|^11.0",
21+
"illuminate/support": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|^10.0|^11.0",
2222
"intervention/image": "^2.4"
2323
},
2424
"require-dev": {
25-
"phpunit/phpunit": "^7.0|^8.0|^9.0",
26-
"orchestra/testbench": "^3.7|^4.0|^5.0|^6.0|^7.0"
25+
"phpunit/phpunit": "^7.0|^8.0|^9.0|^10.0|^11.0",
26+
"orchestra/testbench": "^3.7|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0"
2727
},
2828
"autoload": {
2929
"psr-4": {

‎config/favicon.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/*
3636
* Intervention Image supports "GD Library" and "Imagick" to process images
3737
* internally. You may choose one of them according to your PHP
38-
* configuration. By default PHP's "GD Library" implementation is used.
38+
* configuration. By default, PHP's "GD Library" implementation is used.
3939
*
4040
* If you want to convert ICO files, you need to use imagick.
4141
*

0 commit comments

Comments
 (0)