Skip to content

Commit b7d8e4d

Browse files
greg0iregreg0ire
authored
Merge pull request #2181 from greg0ire/3.2.x
Merge 2.19.x and 3.1.x up into 3.2.x
2 parents c7a2d00 + cfaf99d commit b7d8e4d

18 files changed

Lines changed: 152 additions & 138 deletions

‎.doctrine-project.json‎

Lines changed: 8 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,22 @@
1010
"slug": "latest",
1111
"upcoming": true
1212
},
13+
{
14+
"name": "3.2",
15+
"branchName": "3.2.x",
16+
"slug": "3.2",
17+
"upcoming": true
18+
},
1319
{
1420
"name": "3.1",
1521
"branchName": "3.1.x",
1622
"slug": "3.1",
17-
"upcoming": true
23+
"current": true
1824
},
1925
{
2026
"name": "3.0",
21-
"branchName": "3.0.x",
2227
"slug": "3.0",
23-
"current": true
28+
"maintained": false
2429
},
2530
{
2631
"name": "2.19",
@@ -34,12 +39,6 @@
3439
"slug": "2.18",
3540
"maintained": true
3641
},
37-
{
38-
"name": "2.17",
39-
"branchName": "2.17.x",
40-
"slug": "2.17",
41-
"maintained": false
42-
},
4342
{
4443
"name": "2.16",
4544
"slug": "2.16",
@@ -75,16 +74,6 @@
7574
"slug": "2.10",
7675
"maintained": false
7776
},
78-
{
79-
"name": "2.9",
80-
"slug": "2.9",
81-
"maintained": false
82-
},
83-
{
84-
"name": "2.8",
85-
"slug": "2.8",
86-
"maintained": false
87-
},
8877
{
8978
"name": "2.7",
9079
"slug": "2.7",
@@ -95,31 +84,6 @@
9584
"slug": "2.6",
9685
"maintained": false
9786
},
98-
{
99-
"name": "2.5",
100-
"slug": "2.5",
101-
"maintained": false
102-
},
103-
{
104-
"name": "2.4",
105-
"slug": "2.4",
106-
"maintained": false
107-
},
108-
{
109-
"name": "2.3",
110-
"slug": "2.3",
111-
"maintained": false
112-
},
113-
{
114-
"name": "2.2",
115-
"slug": "2.2",
116-
"maintained": false
117-
},
118-
{
119-
"name": "2.1",
120-
"slug": "2.1",
121-
"maintained": false
122-
},
12387
{
12488
"name": "2.0",
12589
"slug": "2.0",
@@ -129,61 +93,6 @@
12993
"name": "1.12",
13094
"slug": "1.12",
13195
"maintained": false
132-
},
133-
{
134-
"name": "1.11",
135-
"slug": "1.11",
136-
"maintained": false
137-
},
138-
{
139-
"name": "1.10",
140-
"slug": "1.10",
141-
"maintained": false
142-
},
143-
{
144-
"name": "1.9",
145-
"slug": "1.9",
146-
"maintained": false
147-
},
148-
{
149-
"name": "1.8",
150-
"slug": "1.8",
151-
"maintained": false
152-
},
153-
{
154-
"name": "1.7",
155-
"slug": "1.7",
156-
"maintained": false
157-
},
158-
{
159-
"name": "1.6",
160-
"slug": "1.6",
161-
"maintained": false
162-
},
163-
{
164-
"name": "1.5",
165-
"slug": "1.5",
166-
"maintained": false
167-
},
168-
{
169-
"name": "1.4",
170-
"slug": "1.4",
171-
"maintained": false
172-
},
173-
{
174-
"name": "1.3",
175-
"slug": "1.3",
176-
"maintained": false
177-
},
178-
{
179-
"name": "1.2",
180-
"slug": "1.2",
181-
"maintained": false
182-
},
183-
{
184-
"name": "1.1",
185-
"slug": "1.1",
186-
"maintained": false
18796
}
18897
]
18998
}

‎.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@v12.2.0"
29+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.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@v12.2.0"
20+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@13.1.0"

‎.github/workflows/continuous-integration.yml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
name: "Continuous Integration"
1+
name: "CI: PHPUnit"
32

43
on:
54
pull_request:
@@ -27,7 +26,15 @@ on:
2726

2827
jobs:
2928
phpunit:
30-
name: "PHPUnit"
29+
name: >
30+
${{ format('PHP {0} - Sf {1} - deps {2} - stab. {3}',
31+
matrix.php-version || 'Ø',
32+
matrix.symfony-require || 'Ø',
33+
matrix.dependencies || 'Ø',
34+
matrix.stability || 'Ø'
35+
) }}
36+
${{ matrix.remove-orm && ' - remove ORM' }}
37+
${{ matrix.remove-doctrine-messenger && ' - remove Messenger' }}
3138
runs-on: "ubuntu-latest"
3239
env:
3340
SYMFONY_REQUIRE: ${{matrix.symfony-require}}
@@ -88,7 +95,7 @@ jobs:
8895

8996
steps:
9097
- name: "Checkout"
91-
uses: "actions/checkout@v5"
98+
uses: "actions/checkout@v6"
9299
with:
93100
fetch-depth: 2
94101

@@ -123,7 +130,7 @@ jobs:
123130
run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
124131

125132
- name: "Upload coverage file"
126-
uses: "actions/upload-artifact@v5"
133+
uses: "actions/upload-artifact@v6"
127134
with:
128135
name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}.coverage"
129136
path: "coverage.xml"
@@ -138,12 +145,12 @@ jobs:
138145

139146
steps:
140147
- name: "Checkout"
141-
uses: "actions/checkout@v5"
148+
uses: "actions/checkout@v6"
142149
with:
143150
fetch-depth: 2
144151

145152
- name: "Download coverage files"
146-
uses: "actions/download-artifact@v6"
153+
uses: "actions/download-artifact@v7"
147154
with:
148155
path: "reports"
149156

‎.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@v12.2.0"
20+
uses: "doctrine/.github/.github/workflows/documentation.yml@13.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@v12.2.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@13.1.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
@@ -27,7 +27,7 @@ jobs:
2727

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

‎.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@v12.2.0"
21+
uses: "doctrine/.github/.github/workflows/website-schema.yml@13.1.0"

‎.symfony.bundle.yaml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
branches:
2-
- "2.5.x"
32
- "2.6.x"
43
- "2.7.x"
5-
- "2.8.x"
6-
- "2.9.x"
74
- "2.10.x"
85
- "2.11.x"
96
- "2.12.x"
107
- "2.13.x"
118
- "2.14.x"
129
- "2.15.x"
1310
- "2.16.x"
14-
- "2.17.x"
1511
- "2.18.x"
1612
- "2.19.x"
1713
- "3.0.x"
1814
- "3.1.x"
15+
- "3.2.x"
1916
- "4.0.x"
2017
maintained_branches:
2118
- "2.18.x"
2219
- "2.19.x"
23-
- "3.0.x"
2420
- "3.1.x"
21+
- "3.2.x"
2522
- "4.0.x"
2623
doc_dir: "docs/en/"
27-
current_branch: "3.0.x"
28-
dev_branch: "3.1.x"
24+
current_branch: "3.1.x"
25+
dev_branch: "3.2.x"

‎UPGRADE-2.19.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
UPGRADE FROM 2.18 to 2.19
2+
=========================
3+
4+
Configuration
5+
-------------
6+
7+
### Proxy-related configuration settings are conditionally deprecated
8+
9+
When using PHP 8.4 or higher in combination with Doctrine ORM 3.4 or
10+
higher, the following configuration settings are deprecated:
11+
12+
- `auto_generate_proxy_classes`
13+
- `proxy_namespace`
14+
- `proxy_dir`
15+
16+
Instead, they should be unset, and `enable_native_lazy_objects` should
17+
be set to `true`.

0 commit comments

Comments
 (0)