Skip to content

Commit b01db2a

Browse files
gharlangharlan
authored
Merge branch '5.x' into fix/rex-list-sort-null-offset-php85
2 parents 0f4ae98 + a7b5baf commit b01db2a

13 files changed

Lines changed: 355 additions & 85 deletions

File tree

‎.github/workflows/code-style.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,24 @@ jobs:
3737
body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
3838

3939
- name: Checkout
40-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
40+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4141
if: env.writable == 1 && github.event_name != 'repository_dispatch'
4242
with:
4343
ref: ${{ github.head_ref }}
4444
token: ${{ secrets.BOT_TOKEN }}
4545
- name: Checkout fork
46-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
46+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4747
if: env.writable == 0
4848
- name: Checkout on chat command
49-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
49+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5050
if: github.event_name == 'repository_dispatch'
5151
with:
5252
token: ${{ secrets.BOT_TOKEN }}
5353
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
5454
ref: ${{ github.event.client_payload.pull_request.head.ref }}
5555

5656
- name: Setup PHP
57-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
57+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
5858
with:
5959
php-version: '8.3'
6060
coverage: none # disable xdebug, pcov
@@ -68,7 +68,7 @@ jobs:
6868
run: vendor/bin/php-cs-fixer list-files --config=.php-cs-fixer.dist.php | xargs -n 250 -P 3 vendor/bin/php-cs-fixer fix --diff --config=.php-cs-fixer.dist.php
6969

7070
- name: Commit changed files
71-
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
71+
uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
7272
if: env.writable == 1
7373
with:
7474
commit_message: 'style: apply php-cs-fixer changes'
@@ -89,17 +89,17 @@ jobs:
8989

9090
steps:
9191
- name: Checkout
92-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
92+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9393
if: env.writable == 1
9494
with:
9595
ref: ${{ github.head_ref }}
9696
token: ${{ secrets.BOT_TOKEN }}
9797
- name: Checkout fork
98-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
98+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9999
if: env.writable == 0
100100

101101
- name: Setup PHP
102-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
102+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
103103
with:
104104
php-version: '8.3'
105105
coverage: none # disable xdebug, pcov
@@ -112,7 +112,7 @@ jobs:
112112
run: vendor/bin/rector process --no-progress-bar
113113

114114
- name: Commit changed files
115-
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
115+
uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
116116
if: env.writable == 1
117117
with:
118118
commit_message: 'refactor: apply rector changes'

‎.github/workflows/static-analysis.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,24 @@ jobs:
4040
https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
4141
4242
- name: Checkout
43-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
43+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4444
if: env.writable == 1 && github.event_name != 'repository_dispatch'
4545
with:
4646
ref: ${{ github.head_ref }}
4747
token: ${{ secrets.BOT_TOKEN }}
4848
- name: Checkout fork
49-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
49+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5050
if: env.writable == 0
5151
- name: Checkout on chat command
52-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
52+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5353
if: github.event_name == 'repository_dispatch'
5454
with:
5555
token: ${{ secrets.BOT_TOKEN }}
5656
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
5757
ref: ${{ github.event.client_payload.pull_request.head.ref }}
5858

5959
- name: Setup PHP
60-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
60+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
6161
with:
6262
php-version: '8.5'
6363
extensions: gd, intl, imagick
@@ -81,7 +81,7 @@ jobs:
8181
run: git pull --ff-only --no-tags --depth=1
8282

8383
- name: Commit changed files
84-
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
84+
uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
8585
if: failure() && steps.baseline.conclusion != 'skipped' && env.writable == 1
8686
with:
8787
commit_message: 'chore: update psalm baseline'
@@ -110,24 +110,24 @@ jobs:
110110
https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
111111
112112
- name: Checkout
113-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
113+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
114114
if: env.writable == 1 && github.event_name != 'repository_dispatch'
115115
with:
116116
ref: ${{ github.head_ref }}
117117
token: ${{ secrets.BOT_TOKEN }}
118118
- name: Checkout fork
119-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
119+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
120120
if: env.writable == 0
121121
- name: Checkout on chat command
122-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
122+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
123123
if: github.event_name == 'repository_dispatch'
124124
with:
125125
token: ${{ secrets.BOT_TOKEN }}
126126
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
127127
ref: ${{ github.event.client_payload.pull_request.head.ref }}
128128

129129
- name: Setup PHP
130-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
130+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
131131
with:
132132
php-version: '8.5'
133133
extensions: gd, intl, imagick
@@ -151,7 +151,7 @@ jobs:
151151
run: git pull --ff-only --no-tags --depth=1
152152

153153
- name: Commit changed files
154-
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
154+
uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
155155
if: failure() && steps.baseline.conclusion != 'skipped' && env.writable == 1
156156
with:
157157
commit_message: 'chore: update psalm taint baseline'
@@ -180,18 +180,18 @@ jobs:
180180
https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
181181
182182
- name: Checkout
183-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
183+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
184184
if: github.event_name != 'repository_dispatch'
185185
- name: Checkout on chat command
186-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
186+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
187187
if: github.event_name == 'repository_dispatch'
188188
with:
189189
token: ${{ secrets.BOT_TOKEN }}
190190
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
191191
ref: ${{ github.event.client_payload.pull_request.head.ref }}
192192

193193
- name: Setup PHP
194-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
194+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
195195
with:
196196
php-version: '8.5'
197197
extensions: gd, intl, imagick, pdo_mysql
@@ -224,7 +224,7 @@ jobs:
224224
run: git pull --ff-only --no-tags --depth=1
225225

226226
- name: Commit changed files
227-
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
227+
uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
228228
if: failure() && steps.baseline.conclusion != 'skipped' && env.writable == 1
229229
with:
230230
commit_message: 'chore: update phpstan baseline'

‎.github/workflows/styles-compile.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,24 @@ jobs:
3737
body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
3838

3939
- name: Checkout
40-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
40+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4141
if: env.writable == 1 && github.event_name != 'repository_dispatch'
4242
with:
4343
ref: ${{ github.head_ref }}
4444
token: ${{ secrets.BOT_TOKEN }}
4545
- name: Checkout fork
46-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
46+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4747
if: env.writable == 0
4848
- name: Checkout on chat command
49-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
49+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5050
if: github.event_name == 'repository_dispatch'
5151
with:
5252
token: ${{ secrets.BOT_TOKEN }}
5353
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
5454
ref: ${{ github.event.client_payload.pull_request.head.ref }}
5555

5656
- name: Setup PHP
57-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
57+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
5858
with:
5959
php-version: '8.5'
6060
extensions: pdo_mysql
@@ -73,7 +73,7 @@ jobs:
7373
run: php redaxo/bin/console be_style:compile --ansi -v
7474

7575
- name: Commit changed files
76-
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
76+
uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
7777
if: env.writable == 1
7878
with:
7979
commit_message: 'chore: compile be_style assets'

‎.github/workflows/unit-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ jobs:
5454
5555
steps:
5656
- name: Checkout
57-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
57+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5858

5959
- name: Setup PHP
60-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
60+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
6161
with:
6262
php-version: ${{ matrix.php-version }}
6363
extensions: gd, intl, pdo_mysql

‎.github/workflows/visual-tests.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ jobs:
3636
body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
3737

3838
- name: Checkout
39-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
39+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4040
if: env.writable == 1 && github.event_name != 'repository_dispatch'
4141
with:
4242
ref: ${{ github.head_ref }}
4343
token: ${{ secrets.BOT_TOKEN }}
4444
- name: Checkout fork
45-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
45+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4646
if: env.writable == 0
4747
- name: Checkout on chat command
48-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
48+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4949
if: github.event_name == 'repository_dispatch'
5050
with:
5151
token: ${{ secrets.BOT_TOKEN }}
@@ -68,7 +68,7 @@ jobs:
6868
id: playwright-version
6969
run: echo "PLAYWRIGHT_VERSION=$(node -e "process.stdout.write(require('playwright/package.json').version)")" >> $GITHUB_ENV
7070
- name: Cache Playwright browser binaries
71-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
71+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
7272
id: playwright-cache
7373
with:
7474
path: ~/.cache/ms-playwright
@@ -78,7 +78,7 @@ jobs:
7878
if: steps.playwright-cache.outputs.cache-hit != 'true'
7979

8080
- name: Setup PHP
81-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
81+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
8282
with:
8383
php-version: '8.5'
8484
ini-values: 'error_reporting=E_ALL, display_errors=On, display_startup_errors=On'
@@ -131,7 +131,7 @@ jobs:
131131
git diff --cached --exit-code --name-only .tools/visual-tests/screenshots/
132132
133133
- name: Commit changed files
134-
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
134+
uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
135135
if: failure() && env.writable == 1
136136
with:
137137
commit_message: 'test: update screenshots'

‎.tools/psalm/baseline.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4370,6 +4370,7 @@
43704370
<code><![CDATA[$columnLayout]]></code>
43714371
<code><![CDATA[$column['width'] ?? null]]></code>
43724372
<code><![CDATA[$sortColumn]]></code>
4373+
<code><![CDATA[$sortColumn]]></code>
43734374
<code><![CDATA[$this->getValue($column)]]></code>
43744375
<code><![CDATA[$this->getValue($columnName)]]></code>
43754376
</PossiblyNullArgument>

‎composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
"require-dev": {
1414
"jetbrains/phpstorm-attributes": "^1.2",
1515
"phpstan/extension-installer": "1.4.3",
16-
"phpstan/phpstan": "2.2.2",
16+
"phpstan/phpstan": "2.2.5",
1717
"phpstan/phpstan-deprecation-rules": "2.0.4",
18-
"phpstan/phpstan-phpunit": "2.0.16",
18+
"phpstan/phpstan-phpunit": "2.0.18",
1919
"phpstan/phpstan-symfony": "2.0.20",
2020
"phpunit/phpunit": "^12.5.17 || ^13.1.14",
2121
"psalm/plugin-phpunit": "0.19.7",
2222
"psalm/plugin-symfony": "v5.3.0",
23-
"rector/rector": "2.5.2",
23+
"rector/rector": "2.5.5",
2424
"redaxo/php-cs-fixer-config": "3.1.1",
25-
"redaxo/psalm-plugin": "2.2.0",
25+
"redaxo/psalm-plugin": "2.2.1",
2626
"shipmonk/phpstan-baseline-per-identifier": "2.3.0",
2727
"vimeo/psalm": "6.16.1"
2828
},
@@ -58,7 +58,7 @@
5858
"symfony/string": "v7.4.13",
5959
"symfony/var-dumper": "v7.4.14",
6060
"symfony/yaml": "v7.4.14",
61-
"voku/anti-xss": "4.1.43",
61+
"voku/anti-xss": "4.1.44",
6262
"voku/portable-ascii": "2.1.1",
6363
"voku/portable-utf8": "6.1.1"
6464
},

‎redaxo/src/core/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"symfony/http-foundation": "^7.4.14",
1515
"symfony/var-dumper": "^7.4.14",
1616
"symfony/yaml": "^7.4.14",
17-
"voku/anti-xss": "^4.1.43",
17+
"voku/anti-xss": "^4.1.44",
1818
"voku/portable-utf8": "^6.1.1"
1919
},
2020

‎redaxo/src/core/composer.lock‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)