Skip to content

Commit 49c8b94

Browse files
committed
Merge branch 'master' into martinl/master-merg
# Conflicts: # CHANGELOG.md # phpstan-baseline.neon
2 parents 6e2e572 + 03b51d1 commit 49c8b94

16 files changed

Lines changed: 973 additions & 109 deletions

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v5
4545
with:
4646
fetch-depth: 2
4747

.github/workflows/publish-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
steps:
2525
- name: Get auth token
2626
id: token
27-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
27+
uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
2828
with:
2929
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
3030
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
3131

32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
3333
with:
3434
token: ${{ steps.token.outputs.token }}
3535
fetch-depth: 0

.github/workflows/static-analysis.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020

2121
- name: Setup PHP
2222
uses: shivammathur/setup-php@v2
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v5
3838

3939
- name: Setup PHP
4040
uses: shivammathur/setup-php@v2
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353
steps:
5454
- name: Checkout
55-
uses: actions/checkout@v4
55+
uses: actions/checkout@v5
5656
with:
5757
fetch-depth: 2 # needed by codecov sometimes
5858

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
'after_heredoc' => false,
3535
'elements' => ['arrays'],
3636
],
37+
'no_whitespace_before_comma_in_array' => false, // Should be dropped when we drop support for PHP 7.x
3738
])
3839
->setRiskyAllowed(true)
3940
->setFinder(

0 commit comments

Comments
 (0)