Skip to content

Commit 61ad331

Browse files
committed
Merge branch 'master' into feature/support-avif-format
2 parents 526668f + 9f2d696 commit 61ad331

File tree

5 files changed

+702
-470
lines changed

5 files changed

+702
-470
lines changed

.github/dependabot.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: weekly
7+
groups:
8+
actions-deps:
9+
patterns:
10+
- "*" # Include all GitHub Actions
11+
12+
- package-ecosystem: composer
13+
directory: /
14+
schedule:
15+
interval: weekly
16+
groups:
17+
production-dependencies:
18+
dependency-type: "production"
19+
development-dependencies:
20+
dependency-type: "development"

.github/workflows/php.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
2020
steps:
2121
- name: Cancel Previous Runs
22-
uses: styfle/[email protected]
22+
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
2323
with:
2424
access_token: ${{ github.token }}
2525

@@ -35,7 +35,7 @@ jobs:
3535
php-version: "latest"
3636

3737
- name: "Checkout code"
38-
uses: "actions/[email protected]"
38+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3939

4040
- name: "Install dependencies"
4141
uses: ramsey/composer-install@a2636af0004d1c0499ffca16ac0b4cc94df70565 # 3.1.0
@@ -55,7 +55,7 @@ jobs:
5555
php-version: "latest"
5656

5757
- name: "Checkout code"
58-
uses: "actions/[email protected]"
58+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5959

6060
- name: "Install dependencies"
6161
uses: ramsey/composer-install@a2636af0004d1c0499ffca16ac0b4cc94df70565 # 3.1.0
@@ -94,8 +94,8 @@ jobs:
9494
fail-fast: false
9595
matrix:
9696
php-version:
97-
- "8.3"
9897
- "8.4"
98+
- "8.5"
9999
env:
100100
extensions: curl, dom, imagick, json, libxml, mbstring
101101

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"Imagick"
3434
],
3535
"require": {
36-
"php": "^8.3",
36+
"php": "^8.4",
3737
"ext-fileinfo": "*",
3838
"fylax/forceutf8": "^3.0.3",
3939
"php-ffmpeg/php-ffmpeg": "^1.2",
@@ -42,7 +42,7 @@
4242
"require-dev": {
4343
"friendsofphp/php-cs-fixer": "^3.51",
4444
"infection/infection": "^0.29.14",
45-
"lychee-org/phpstan-lychee": "^2.0.0",
45+
"lychee-org/phpstan-lychee": "^2.0.1",
4646
"php-parallel-lint/php-parallel-lint": "^1.3.2",
4747
"phpmd/phpmd": "^2.15",
4848
"phpunit/phpunit": "^9.5.10",
@@ -81,7 +81,7 @@
8181
},
8282
"config": {
8383
"platform": {
84-
"php": "8.3"
84+
"php": "8.4"
8585
},
8686
"preferred-install": "dist",
8787
"sort-packages": true,

0 commit comments

Comments
 (0)