Skip to content

Commit 9898f36

Browse files
committed
Merge remote-tracking branch 'origin/2.18.x' into 3.2.x
# Conflicts: # .github/workflows/static-analysis.yml # tests/RegistryTest.php # tests/Repository/ServiceEntityRepositoryTest.php
2 parents c821933 + 79dd830 commit 9898f36

7 files changed

Lines changed: 10 additions & 10 deletions

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ on:
2626
jobs:
2727
coding-standards:
2828
name: "Coding Standards"
29-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.1.0"
29+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@15.0.0"
3030
with:
3131
composer-options: "--prefer-dist --prefer-stable"

.github/workflows/composer-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ on:
1717
jobs:
1818
composer-lint:
1919
name: "Composer Lint"
20-
uses: "doctrine/.github/.github/workflows/composer-lint.yml@13.1.0"
20+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@15.0.0"

.github/workflows/continuous-integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
if: "${{ matrix.remove-doctrine-messenger }}"
122122

123123
- name: "Install dependencies with Composer"
124-
uses: "ramsey/composer-install@v3"
124+
uses: "ramsey/composer-install@v4"
125125
with:
126126
dependency-versions: "${{ matrix.dependencies }}"
127127
composer-options: "--prefer-dist"
@@ -130,7 +130,7 @@ jobs:
130130
run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
131131

132132
- name: "Upload coverage file"
133-
uses: "actions/upload-artifact@v6"
133+
uses: "actions/upload-artifact@v7"
134134
with:
135135
name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}.coverage"
136136
path: "coverage.xml"
@@ -150,12 +150,12 @@ jobs:
150150
fetch-depth: 2
151151

152152
- name: "Download coverage files"
153-
uses: "actions/download-artifact@v7"
153+
uses: "actions/download-artifact@v8"
154154
with:
155155
path: "reports"
156156

157157
- name: "Upload to Codecov"
158-
uses: "codecov/codecov-action@v5"
158+
uses: "codecov/codecov-action@v6"
159159
with:
160160
directory: reports
161161
env:

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ on:
1717
jobs:
1818
documentation:
1919
name: "Documentation"
20-
uses: "doctrine/.github/.github/workflows/documentation.yml@13.1.0"
20+
uses: "doctrine/.github/.github/workflows/documentation.yml@15.0.0"

.github/workflows/release-on-milestone-closed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
release:
1010
name: "Git tag, release & create merge-up PR"
11-
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@13.1.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@15.0.0"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/test-dev-stability.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
tools: "flex"
4141

4242
- name: "Install dependencies with Composer"
43-
uses: "ramsey/composer-install@v3"
43+
uses: "ramsey/composer-install@v4"
4444
with:
4545
dependency-versions: "${{ matrix.dependencies }}"
4646
composer-options: "--prefer-dist"

.github/workflows/website-schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ on:
1818
jobs:
1919
json-validate:
2020
name: "Validate JSON schema"
21-
uses: "doctrine/.github/.github/workflows/website-schema.yml@13.1.0"
21+
uses: "doctrine/.github/.github/workflows/website-schema.yml@15.0.0"

0 commit comments

Comments
 (0)