Skip to content

Commit e00e2be

Browse files
committed
Merge branch '3.3.x' into 4.0.x
* 3.3.x: (49 commits) Revert EventDispatcher downgrade (doctrine#2256) Fix dark theme time bar colors in the profiler Add ValueResolverInterface check for EntityValueResolver (doctrine#2254) Display whether a query ran on a primary or replica in the profiler Add missing dependency Wire the Console EntityValueResolver as a service Fix doctrine:database:create failing without server_version for some connections Fix doctrine:database:create failing without server_version for some connections Add functional regression test for EntityValueResolver on primary-key routes (doctrine#2230) Bump actions/checkout from 6 to 7 Bump the doctrine group with 6 updates Add missing dependency Apply latest coding standards Downgrade event-dispatcher Avoid reporting error from unrelated call Bump codecov/codecov-action from 6 to 7 Add SECURITY.md to link to reporting policy and email. Fix coding standard: use aliased class name in RequiresMethod attribute Remove empty registerCommands override remove form related services if the Form component is not installed ...
2 parents d143453 + eb3ea68 commit e00e2be

54 files changed

Lines changed: 997 additions & 175 deletions

Some content is hidden

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

.doctrine-project.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,22 @@
1010
"slug": "latest",
1111
"upcoming": true
1212
},
13+
{
14+
"name": "3.3",
15+
"branchName": "3.3.x",
16+
"slug": "3.3",
17+
"upcoming": true
18+
},
1319
{
1420
"name": "3.2",
1521
"branchName": "3.2.x",
1622
"slug": "3.2",
17-
"upcoming": true
23+
"current": true
1824
},
1925
{
2026
"name": "3.1",
21-
"branchName": "3.1.x",
2227
"slug": "3.1",
23-
"current": true
28+
"maintained": false
2429
},
2530
{
2631
"name": "3.0",

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ updates:
77
labels:
88
- "CI"
99
target-branch: "2.18.x"
10+
groups:
11+
doctrine:
12+
patterns:
13+
- "doctrine/*"

.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.1.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.1.0"

.github/workflows/continuous-integration.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595

9696
steps:
9797
- name: "Checkout"
98-
uses: "actions/checkout@v6"
98+
uses: "actions/checkout@v7"
9999
with:
100100
fetch-depth: 2
101101

@@ -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"
@@ -145,17 +145,17 @@ jobs:
145145

146146
steps:
147147
- name: "Checkout"
148-
uses: "actions/checkout@v6"
148+
uses: "actions/checkout@v7"
149149
with:
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@v7"
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.1.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.1.0"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
- tests/**
2525

2626
jobs:
27-
phpstan:
27+
static-analysis:
2828
name: "PHPStan"
2929
runs-on: "ubuntu-latest"
3030

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: "Checkout"
30-
uses: "actions/checkout@v6"
30+
uses: "actions/checkout@v7"
3131
with:
3232
fetch-depth: 2
3333

@@ -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.1.0"

0 commit comments

Comments
 (0)