Skip to content

Commit d4e9276

Browse files
greg0iregreg0ire
authored
Merge pull request #12325 from doctrine/3.5.x
Merge 3.5.x up into 3.6.x
2 parents 9ae2181 + cee74fa commit d4e9276

File tree

7 files changed

+55
-19
lines changed

7 files changed

+55
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ on:
2424

2525
jobs:
2626
coding-standards:
27-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.0.0"
27+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.1.0"

‎.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.0.0"
20+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@13.1.0"

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

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "CI"
1+
name: "CI: PHPUnit"
22

33
on:
44
pull_request:
@@ -25,7 +25,14 @@ env:
2525

2626
jobs:
2727
phpunit-smoke-check:
28-
name: "PHPUnit with SQLite"
28+
name: >
29+
SQLite -
30+
${{ format('PHP {0} - DBAL {1} - ext. {2} - proxy {3}',
31+
matrix.php-version || 'Ø',
32+
matrix.dbal-version || 'Ø',
33+
matrix.extension || 'Ø',
34+
matrix.proxy || 'Ø'
35+
) }}
2936
runs-on: "ubuntu-22.04"
3037

3138
strategy:
@@ -143,7 +150,7 @@ jobs:
143150
ENABLE_NATIVE_LAZY_OBJECTS: ${{ matrix.native_lazy }}
144151

145152
- name: "Upload coverage file"
146-
uses: "actions/upload-artifact@v5"
153+
uses: "actions/upload-artifact@v6"
147154
with:
148155
name: "phpunit-${{ matrix.extension }}-${{ matrix.php-version }}-${{ matrix.dbal-version }}-${{ matrix.deps }}-${{ matrix.stability }}-${{ matrix.native_lazy }}-coverage"
149156
path: "coverage*.xml"
@@ -184,7 +191,13 @@ jobs:
184191

185192

186193
phpunit-postgres:
187-
name: "PHPUnit with PostgreSQL"
194+
name: >
195+
${{ format('PostgreSQL {0} - PHP {1} - DBAL {2} - ext. {3}',
196+
matrix.postgres-version || 'Ø',
197+
matrix.php-version || 'Ø',
198+
matrix.dbal-version || 'Ø',
199+
matrix.extension || 'Ø'
200+
) }}
188201
runs-on: "ubuntu-22.04"
189202
needs: "phpunit-smoke-check"
190203

@@ -252,14 +265,20 @@ jobs:
252265
run: "vendor/bin/phpunit -c ci/github/phpunit/pdo_pgsql.xml --coverage-clover=coverage.xml"
253266

254267
- name: "Upload coverage file"
255-
uses: "actions/upload-artifact@v5"
268+
uses: "actions/upload-artifact@v6"
256269
with:
257270
name: "${{ github.job }}-${{ matrix.postgres-version }}-${{ matrix.php-version }}-${{ matrix.dbal-version }}-${{ matrix.extension }}-coverage"
258271
path: "coverage.xml"
259272

260273

261274
phpunit-mariadb:
262-
name: "PHPUnit with MariaDB"
275+
name: >
276+
${{ format('MariaDB {0} - PHP {1} - DBAL {2} - ext. {3}',
277+
matrix.mariadb-version || 'Ø',
278+
matrix.php-version || 'Ø',
279+
matrix.dbal-version || 'Ø',
280+
matrix.extension || 'Ø'
281+
) }}
263282
runs-on: "ubuntu-22.04"
264283
needs: "phpunit-smoke-check"
265284

@@ -320,14 +339,20 @@ jobs:
320339
run: "vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml --coverage-clover=coverage.xml"
321340

322341
- name: "Upload coverage file"
323-
uses: "actions/upload-artifact@v5"
342+
uses: "actions/upload-artifact@v6"
324343
with:
325344
name: "${{ github.job }}-${{ matrix.mariadb-version }}-${{ matrix.extension }}-${{ matrix.php-version }}-${{ matrix.dbal-version }}-coverage"
326345
path: "coverage.xml"
327346

328347

329348
phpunit-mysql:
330-
name: "PHPUnit with MySQL"
349+
name: >
350+
${{ format('MySQL {0} - PHP {1} - DBAL {2} - ext. {3}',
351+
matrix.mysql-version || 'Ø',
352+
matrix.php-version || 'Ø',
353+
matrix.dbal-version || 'Ø',
354+
matrix.extension || 'Ø'
355+
) }}
331356
runs-on: "ubuntu-22.04"
332357
needs: "phpunit-smoke-check"
333358

@@ -417,7 +442,7 @@ jobs:
417442
ENABLE_SECOND_LEVEL_CACHE: 1
418443

419444
- name: "Upload coverage files"
420-
uses: "actions/upload-artifact@v5"
445+
uses: "actions/upload-artifact@v6"
421446
with:
422447
name: "${{ github.job }}-${{ matrix.mysql-version }}-${{ matrix.extension }}-${{ matrix.php-version }}-${{ matrix.dbal-version }}-coverage"
423448
path: "coverage*.xml"
@@ -440,7 +465,7 @@ jobs:
440465
fetch-depth: 2
441466

442467
- name: "Download coverage files"
443-
uses: "actions/download-artifact@v6"
468+
uses: "actions/download-artifact@v7"
444469
with:
445470
path: "reports"
446471

‎.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.0.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
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
release:
10-
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@13.0.0"
10+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@13.1.0"
1111
secrets:
1212
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1313
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

‎docs/en/reference/attributes-reference.rst‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -668,11 +668,6 @@ and in the Context of a :ref:`#[ManyToMany] <attrref_manytomany>`. If this attri
668668
are missing they will be computed considering the field's name and the current
669669
:doc:`naming strategy <namingstrategy>`.
670670

671-
The ``#[InverseJoinColumn]`` is the same as ``#[JoinColumn]`` and is used in the context
672-
of a ``#[ManyToMany]`` attribute declaration to specifiy the details of the join table's
673-
column information used for the join to the inverse entity. This is only required
674-
on PHP 8.0, where nested attributes are not yet supported.
675-
676671
Optional parameters:
677672

678673
- **name**: Column name that holds the foreign key identifier for

‎docs/en/reference/inheritance-mapping.rst‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,22 @@ Example:
208208
// ...
209209
}
210210
211+
.. code-block:: xml
212+
213+
<doctrine-mapping>
214+
<entity name="MyProject\Model\Person" inheritance-type="SINGLE_TABLE">
215+
<discriminator-column name="discr" type="string" />
216+
<discriminator-map>
217+
<discriminator-mapping value="person" class="MyProject\Model\Person"/>
218+
<discriminator-mapping value="employee" class="MyProject\Model\Employee"/>
219+
</discriminator-map>
220+
</entity>
221+
</doctrine-mapping>
222+
223+
<doctrine-mapping>
224+
<entity name="MyProject\Model\Employee">
225+
</entity>
226+
</doctrine-mapping>
211227
212228
In this example, the ``#[DiscriminatorMap]`` specifies that in the
213229
discriminator column, a value of "person" identifies a row as being of type

0 commit comments

Comments
 (0)