Skip to content

Commit eaeb59d

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.8
# Conflicts: # deptrac.yaml # system/Commands/Server/Serve.php
2 parents 0be3665 + b186ed4 commit eaeb59d

54 files changed

Lines changed: 992 additions & 332 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ utils/ export-ignore
2222
.php-cs-fixer.no-header.php export-ignore
2323
.php-cs-fixer.tests.php export-ignore
2424
.php-cs-fixer.user-guide.php export-ignore
25-
deptrac.yaml export-ignore
25+
structarmed.php export-ignore
2626
phpmetrics.json export-ignore
2727
phpstan-baseline.php export-ignore
2828
phpstan-bootstrap.php export-ignore

.github/scripts/random-tests-config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ AutoReview
1313
Autoloader
1414
# Cache
1515
CLI
16-
# Commands
16+
Commands
1717
Config
1818
Cookie
1919
# DataCaster

.github/workflows/deploy-apidocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
persist-credentials: false
4545

4646
- name: Setup PHP
47-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
47+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
4848
with:
4949
php-version: '8.2'
5050
tools: phive

.github/workflows/deploy-userguide-latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
persist-credentials: false
3131

3232
- name: Setup PHP
33-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
33+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
3434
with:
3535
php-version: '8.2'
3636
coverage: none

.github/workflows/reusable-coveralls.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,13 @@ jobs:
1616
runs-on: ubuntu-24.04
1717

1818
steps:
19-
- name: Checkout base branch for PR
20-
if: github.event_name == 'pull_request'
21-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
22-
with:
23-
ref: ${{ github.base_ref }}
24-
persist-credentials: false
25-
2619
- name: Checkout
2720
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2821
with:
2922
persist-credentials: false
3023

3124
- name: Setup PHP
32-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
25+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
3326
with:
3427
php-version: ${{ inputs.php-version }}
3528
tools: composer

.github/workflows/reusable-phpunit-test.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,20 +207,13 @@ jobs:
207207
/tmp/imagemagick-debs/*.deb
208208
echo "::endgroup::"
209209
210-
- name: Checkout base branch for PR
211-
if: github.event_name == 'pull_request'
212-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
213-
with:
214-
ref: ${{ github.base_ref }}
215-
persist-credentials: false
216-
217210
- name: Checkout
218211
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
219212
with:
220213
persist-credentials: false
221214

222215
- name: Setup PHP
223-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
216+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
224217
with:
225218
php-version: ${{ inputs.php-version }}
226219
tools: composer

.github/workflows/reusable-serviceless-phpunit-test.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,14 @@ jobs:
6565
sudo apt-get update
6666
sudo apt-get install -y imagemagick libmagickwand-dev ghostscript poppler-data libjbig2dec0:amd64 libopenjp2-7:amd64
6767
68-
- name: Checkout base branch for PR
69-
if: github.event_name == 'pull_request'
70-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
71-
with:
72-
ref: ${{ github.base_ref }}
73-
persist-credentials: false
74-
7568
- name: Checkout
7669
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7770
with:
7871
persist-credentials: false
7972
fetch-depth: 0
8073

8174
- name: Setup PHP
82-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
75+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
8376
with:
8477
php-version: ${{ inputs.php-version }}
8578
tools: composer

.github/workflows/test-autoreview.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,11 @@ jobs:
3535
name: Check normalized composer.json
3636
runs-on: ubuntu-24.04
3737
steps:
38-
- name: Checkout base branch for PR
39-
if: github.event_name == 'pull_request'
40-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
41-
with:
42-
ref: ${{ github.base_ref }}
43-
4438
- name: Checkout
4539
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4640

4741
- name: Setup PHP
48-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
42+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
4943
with:
5044
php-version: '8.2'
5145

.github/workflows/test-coding-standards.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,11 @@ jobs:
3434
composer-option: '--ignore-platform-req=php'
3535

3636
steps:
37-
- name: Checkout base branch for PR
38-
if: github.event_name == 'pull_request'
39-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
40-
with:
41-
ref: ${{ github.base_ref }}
42-
4337
- name: Checkout
4438
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4539

4640
- name: Setup PHP
47-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
41+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
4842
with:
4943
php-version: ${{ matrix.php-version }}
5044
extensions: tokenizer

.github/workflows/test-phpstan.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,11 @@ jobs:
4545
strategy:
4646
fail-fast: false
4747
steps:
48-
- name: Checkout base branch for PR
49-
if: github.event_name == 'pull_request'
50-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
51-
with:
52-
ref: ${{ github.base_ref }}
53-
5448
- name: Checkout
5549
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5650

5751
- name: Setup PHP
58-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
52+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
5953
with:
6054
php-version: '8.2'
6155
extensions: intl

0 commit comments

Comments
 (0)