Skip to content

Commit f698418

Browse files
datamwebdatamweb
authored
Merge branch '4.7' into feat/namespaced-view-overrides
2 parents 12167db + ff20d81 commit f698418

File tree

89 files changed

+1613
-1223
lines changed

Some content is hidden

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

89 files changed

+1613
-1223
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
5858
# Create an artifact of the html output
5959
- name: Upload artifact
60-
uses: actions/upload-artifact@v5
60+
uses: actions/upload-artifact@v6
6161
with:
6262
name: HTML Documentation
6363
path: user_guide_src/build/html/

‎.github/workflows/reusable-coveralls.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
coverage: xdebug
3131

3232
- name: Download coverage files
33-
uses: actions/download-artifact@v6
33+
uses: actions/download-artifact@v7
3434
with:
3535
path: build/cov
3636

@@ -43,7 +43,7 @@ jobs:
4343
echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
4444
4545
- name: Cache dependencies
46-
uses: actions/cache@v4
46+
uses: actions/cache@v5
4747
with:
4848
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
4949
key: ${{ github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
@@ -52,7 +52,7 @@ jobs:
5252
${{ github.job }}-
5353
5454
- name: Cache PHPUnit's static analysis cache
55-
uses: actions/cache@v4
55+
uses: actions/cache@v5
5656
with:
5757
path: build/.phpunit.cache/code-coverage
5858
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}${{ inputs.mysql-version || '' }}" >> $GITHUB_ENV
174174
175175
- name: Cache dependencies
176-
uses: actions/cache@v4
176+
uses: actions/cache@v5
177177
with:
178178
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
179179
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-${{ hashFiles('**/composer.*') }}
@@ -184,7 +184,7 @@ jobs:
184184
185185
- name: Cache PHPUnit's static analysis cache
186186
if: ${{ inputs.enable-artifact-upload }}
187-
uses: actions/cache@v4
187+
uses: actions/cache@v5
188188
with:
189189
path: build/.phpunit.cache/code-coverage
190190
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}
@@ -213,7 +213,7 @@ jobs:
213213

214214
- name: Upload coverage results as artifact
215215
if: ${{ inputs.enable-artifact-upload }}
216-
uses: actions/upload-artifact@v5
216+
uses: actions/upload-artifact@v6
217217
with:
218218
name: ${{ env.ARTIFACT_NAME }}
219219
path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}" >> $GITHUB_ENV
8686
8787
- name: Cache Composer dependencies
88-
uses: actions/cache@v4
88+
uses: actions/cache@v5
8989
with:
9090
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
9191
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
@@ -95,7 +95,7 @@ jobs:
9595
9696
- name: Cache PHPUnit's static analysis cache
9797
if: ${{ inputs.enable-artifact-upload }}
98-
uses: actions/cache@v4
98+
uses: actions/cache@v5
9999
with:
100100
path: build/.phpunit.cache/code-coverage
101101
key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}
@@ -122,7 +122,7 @@ jobs:
122122

123123
- name: Upload coverage results as artifact
124124
if: ${{ inputs.enable-artifact-upload }}
125-
uses: actions/upload-artifact@v5
125+
uses: actions/upload-artifact@v6
126126
with:
127127
name: ${{ env.ARTIFACT_NAME }}
128128
path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
5555

5656
- name: Cache dependencies
57-
uses: actions/cache@v4
57+
uses: actions/cache@v5
5858
with:
5959
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
6060
key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}

‎.github/workflows/test-deptrac.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
6060

6161
- name: Cache dependencies
62-
uses: actions/cache@v4
62+
uses: actions/cache@v5
6363
with:
6464
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
6565
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -69,7 +69,7 @@ jobs:
6969
run: mkdir -p build/
7070

7171
- name: Cache Deptrac results
72-
uses: actions/cache@v4
72+
uses: actions/cache@v5
7373
with:
7474
path: build
7575
key: ${{ runner.os }}-deptrac-${{ github.sha }}

‎.github/workflows/test-phpstan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
7272

7373
- name: Cache dependencies
74-
uses: actions/cache@v4
74+
uses: actions/cache@v5
7575
with:
7676
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
7777
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -81,7 +81,7 @@ jobs:
8181
run: mkdir -p build/phpstan
8282

8383
- name: Cache PHPStan result cache directory
84-
uses: actions/cache@v4
84+
uses: actions/cache@v5
8585
with:
8686
path: build/phpstan
8787
key: ${{ runner.os }}-phpstan-${{ github.sha }}

‎.github/workflows/test-psalm.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
5555

5656
- name: Cache composer dependencies
57-
uses: actions/cache@v4
57+
uses: actions/cache@v5
5858
with:
5959
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
6060
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
@@ -64,7 +64,7 @@ jobs:
6464
run: mkdir -p build/psalm
6565

6666
- name: Cache Psalm results
67-
uses: actions/cache@v4
67+
uses: actions/cache@v5
6868
with:
6969
path: build/psalm
7070
key: ${{ runner.os }}-psalm-${{ github.sha }}

‎.github/workflows/test-rector.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
7878

7979
- name: Cache dependencies
80-
uses: actions/cache@v4
80+
uses: actions/cache@v5
8181
with:
8282
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
8383
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -87,7 +87,7 @@ jobs:
8787
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
8888

8989
- name: Rector Cache
90-
uses: actions/cache@v4
90+
uses: actions/cache@v5
9191
with:
9292
path: /tmp/rector
9393
key: ${{ runner.os }}-rector-${{ github.run_id }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ PHP version 8.2 or higher is required, with the following extensions installed:
9696
> - The end of life date for PHP 7.4 was November 28, 2022.
9797
> - The end of life date for PHP 8.0 was November 26, 2023.
9898
> - The end of life date for PHP 8.1 was December 31, 2025.
99-
> - If you are still using below PHP 8.2, you should upgrade immediately.
99+
> - If you are still using a PHP version below 8.2, you should upgrade immediately.
100100
> - The end of life date for PHP 8.2 will be December 31, 2026.
101101
102102
Additionally, make sure that the following extensions are enabled in your PHP:

0 commit comments

Comments
 (0)