Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5e2d5cc
Remove orphaned DDC2372 test fixtures
mpdude Nov 4, 2026
051bf5d
Remove more orphaned test fixtures
mpdude Nov 4, 2026
73cc00a
Remove eleven unused test fixtures and mocks
andreybolonin Nov 4, 2026
289d394
Merge pull request #12739 from mpdude/remove-more-orphaned-test-fixtures
stof Nov 4, 2026
2143f89
Switch git attributes to an include list
greg0ire Nov 4, 2026
596845c
Merge pull request #12743 from greg0ire/include-list
stof Nov 4, 2026
c0e0929
Key concurrency groups by pull request number
greg0ire Nov 4, 2026
9a50e48
Add more precise types for the Window class
stof Oct 1, 2026
acf71af
Merge pull request #12744 from greg0ire/concurrency-group-by-pr
greg0ire Nov 4, 2026
775867d
Update the website metadata (#12745)
stof Nov 4, 2026
17ff8b2
Merge pull request #12742 from andreybolonin/remove-eleven-unused-tes…
stof Nov 4, 2026
ad105e8
Merge pull request #12737 from mpdude/remove-orphaned-ddc2372-fixtures
stof Nov 4, 2026
f941976
Add target branch check workflow
paulinevos Nov 4, 2026
5db66e9
Merge pull request #12746 from doctrine/add-target-branch-check
paulinevos Nov 4, 2026
f28e289
Merge pull request #12643 from doctrine/stof-patch-1
greg0ire Nov 4, 2026
997dbe4
Remove dead Embeddable mapping from DDC3785Test fixture
mpdude Nov 4, 2026
87e0549
Remove orphaned PhpDriver-style mapping fixtures
mpdude Nov 4, 2026
15ff168
Merge pull request #12749 from mpdude/remove-orphaned-phpdriver-fixtures
stof Nov 5, 2026
d0d1f66
Merge pull request #12748 from mpdude/remove-dead-ddc3785-embeddable-…
stof Nov 5, 2026
8d15882
Run the PostgreSQL tests with the matrix driver
morozov Nov 5, 2026
d9695fe
Document the rules for building the CI matrix
morozov Nov 5, 2026
96ab524
Remove redundant jobs from the CI matrix
morozov Nov 5, 2026
0480d22
Merge pull request #12754 from morozov/ci-matrix-rules
morozov Nov 6, 2026
28254d9
Assert console output independently from the wrapping
greg0ire Nov 6, 2026
b33994b
Merge pull request #12761 from greg0ire/unwrap-display
greg0ire Nov 6, 2026
6efe73c
Merge branch '2.20.x' into 3.7.x
morozov Nov 6, 2026
a277a52
Merge pull request #12759 from morozov/3.7.x
greg0ire Nov 6, 2026
3158d9c
Merge remote-tracking branch 'origin/3.7.x' into 3.8.x
greg0ire Nov 6, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions .agents/building-ci-matrix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Building the CI build matrix

The matrix aims for high test coverage of the library with each supported dependency, while running only the jobs that test something no other job does.

## Process

1. Group the dimensions of the matrix by the code that depends on them. Two dimensions belong to the same group only if some code depends on both of them.
2. Select the values of each dimension by the rules below, and designate one of them as its baseline.
3. For each group, run every combination of the selected values of its dimensions that can run together, with each dimension outside the group at its baseline. Leave out a combination whose values within the group can't run together.
4. If a combination can't run with the baseline of a dimension outside the group, change as few such dimensions as possible. A version dimension (PHP, DBAL, server) takes the selected version closest to its baseline that the combination can run with. If only a dimension without versions would have to change, leave the combination out. Values within the group never change.
5. Run each resulting job once. All groups share the job that has every dimension at its baseline.

## Groups

1. **ORM runtime: PHP version × proxy implementation.** The ORM's own code depends on the PHP version, and its proxies depend on both. Neither depends on the database, so this group runs on SQLite with `pdo_sqlite`. Each job of this group runs the test suite twice: with and without the second-level cache.
2. **DBAL version × database.** The ORM adapts to the DBAL version, and the behavior of DBAL differs per database.
3. **Server version, per database.** The SQL that the ORM generates depends on the database and its server version, not on the driver.
4. **Driver × PHP version, per database.** Hydration depends on how the driver represents fetched values, and that depends on the driver and the PHP version, not on the server version.
5. **Composer dependencies.** The lowest dependencies run on the lowest supported PHP with `pdo_sqlite`. All other jobs use the highest dependencies.

## Values and baselines

### PHP versions

Select the lowest supported, the latest stable, nightly, and each intermediate version with a dedicated code path in the ORM, as determined by code coverage. In the driver × PHP group, select the lowest supported, the latest stable, and each version that changes how a driver represents fetched values. The baseline is the latest stable.

### Proxy implementations

Select every supported implementation. The baseline is the default.

### DBAL versions

Select the lowest supported, the highest stable, and the development branch of the highest major version. The development branch runs in addition to the highest stable version, not instead of it. The baseline is the highest stable.

### Server versions

1. The lowest supported version.
2. The highest version. A pre-release version runs in addition to the latest GA version, not instead of it.
3. Every LTS release that the vendor still supports, for vendors that designate LTS releases.
4. Intermediate versions with a dedicated code path in the ORM, as determined by code coverage. Prefer an LTS release over a non-LTS one, even if an older non-LTS release would trigger the same code path.

Code coverage doesn't reveal a server that changes behavior under unchanged ORM code. LTS releases are what most users run, so they get a job even without a dedicated code path. The baseline is the latest GA version.

SQLite has no server. Its version is the version of the SQLite library that PHP uses, which comes with the operating system of the runner. So the runner's operating system selects the SQLite version, and these rules apply to the operating system images.

### Databases

Select every supported database. The baseline is SQLite.

### Drivers

Select every driver of the database. The baseline is the PDO driver.
8 changes: 1 addition & 7 deletions .doctrine-project.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,11 @@
"slug": "3.6",
"maintained": false
},
{
"name": "2.21",
"branchName": "2.21.x",
"slug": "2.21",
"upcoming": true
},
{
"name": "2.20",
"branchName": "2.20.x",
"slug": "2.20",
"maintained": true
"lifeSupport": true
},
{
"name": "2.19",
Expand Down
29 changes: 9 additions & 20 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
/.github export-ignore
/ci export-ignore
/docs export-ignore
/tests export-ignore
/tools export-ignore
.doctrine-project.json export-ignore
.gitattributes export-ignore
.gitignore export-ignore
build.properties export-ignore
build.properties.dev export-ignore
build.xml export-ignore
CONTRIBUTING.md export-ignore
phpunit.xml.dist export-ignore
phpcs.xml.dist export-ignore
phpbench.json export-ignore
phpstan.neon export-ignore
phpstan-baseline.neon export-ignore
phpstan-dbal3.neon export-ignore
phpstan-params.neon export-ignore
phpstan-persistence2.neon export-ignore
/* export-ignore
/src -export-ignore
/src/** -export-ignore
/LICENSE -export-ignore
/README.md -export-ignore
/SECURITY.md -export-ignore
/UPGRADE.md -export-ignore
/composer.json -export-ignore
/doctrine-mapping.xsd -export-ignore
28 changes: 28 additions & 0 deletions .github/workflows/check-target-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: "Check target branch"

on:
pull_request_target:
types:
- "opened"
- "reopened"
- "labeled"
- "unlabeled"
- "edited"

concurrency:
group: "check-target-branch-${{ github.event.pull_request.number }}"
cancel-in-progress: true

# This workflow runs with a write token against pull requests from forks, so it
# must never check out or execute the pull request head.
jobs:
check:
name: "Labels match target branch"
uses: "doctrine/.github/.github/workflows/check-target-branch.yml@16.1.0"
permissions:
contents: "read"
issues: "write"
pull-requests: "write"
with:
minor-labels: "New Feature,Improvement"
fail-on-mismatch: false
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
- tests/**

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/composer-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- "composer.json"

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
Expand Down
89 changes: 37 additions & 52 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
- tests/**

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

env:
Expand All @@ -43,16 +43,12 @@ jobs:
matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
- "8.5"
- "8.6"
dbal-version:
- "default"
- "3.7"
extension:
- "sqlite3"
- "pdo_sqlite"
deps:
- "highest"
Expand All @@ -61,13 +57,23 @@ jobs:
native_lazy:
- "0"
include:
- php-version: "8.2"
dbal-version: "4@dev"
- php-version: "8.5"
dbal-version: "3.7"
extension: "pdo_sqlite"
stability: "stable"
native_lazy: "0"
- php-version: "8.2"
- php-version: "8.5"
dbal-version: "4@dev"
extension: "pdo_sqlite"
stability: "stable"
native_lazy: "0"
- php-version: "8.1"
dbal-version: "default"
extension: "sqlite3"
stability: "stable"
native_lazy: "0"
- php-version: "8.5"
dbal-version: "default"
extension: "sqlite3"
stability: "stable"
native_lazy: "0"
Expand Down Expand Up @@ -217,25 +223,24 @@ jobs:
strategy:
matrix:
php-version:
- "8.2"
- "8.3"
- "8.4"
- "8.5"
- "8.6"
dbal-version:
- "default"
- "3.7"
postgres-version:
- "17"
extension:
- pdo_pgsql
- pgsql
include:
- php-version: "8.2"
- php-version: "8.5"
dbal-version: "3.7"
postgres-version: "17"
extension: pdo_pgsql
- php-version: "8.5"
dbal-version: "4@dev"
postgres-version: "14"
extension: pdo_pgsql
- php-version: "8.2"
- php-version: "8.5"
dbal-version: "3.7"
postgres-version: "9.6"
extension: pdo_pgsql
Expand Down Expand Up @@ -276,7 +281,7 @@ jobs:
composer-options: "--ignore-platform-req=php+"

- name: "Run PHPUnit"
run: "vendor/bin/phpunit -c ci/github/phpunit/pdo_pgsql.xml --coverage-clover=coverage.xml"
run: "vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml --coverage-clover=coverage.xml"
env:
ENABLE_DBAL_EDITOR_API: ${{ matrix.dbal-version == '4@dev' }}

Expand All @@ -301,20 +306,23 @@ jobs:
strategy:
matrix:
php-version:
- "8.2"
- "8.3"
- "8.4"
- "8.5"
- "8.6"
dbal-version:
- "default"
- "3.7"
- "4@dev"
mariadb-version:
- "11.4"
extension:
- "mysqli"
- "pdo_mysql"
include:
- php-version: "8.5"
dbal-version: "3.7"
mariadb-version: "11.4"
extension: "pdo_mysql"
- php-version: "8.5"
dbal-version: "4@dev"
mariadb-version: "11.4"
extension: "pdo_mysql"

services:
mariadb:
Expand Down Expand Up @@ -378,26 +386,24 @@ jobs:
strategy:
matrix:
php-version:
- "8.2"
- "8.3"
- "8.4"
- "8.5"
- "8.6"
dbal-version:
- "default"
- "3.7"
mysql-version:
- "5.7"
- "8.0"
extension:
- "mysqli"
- "pdo_mysql"
include:
- php-version: "8.2"
dbal-version: "4@dev"
- php-version: "8.5"
dbal-version: "default"
mysql-version: "8.0"
extension: "mysqli"
- php-version: "8.2"
- php-version: "8.5"
dbal-version: "3.7"
mysql-version: "8.0"
extension: "pdo_mysql"
- php-version: "8.5"
dbal-version: "4@dev"
mysql-version: "8.0"
extension: "pdo_mysql"
Expand Down Expand Up @@ -443,27 +449,6 @@ jobs:
ENABLE_DBAL_EDITOR_API: ${{ matrix.dbal-version == '4@dev' }}
ENABLE_SECOND_LEVEL_CACHE: 0

- name: "Run PHPUnit with Second Level Cache and PHPUnit 10"
run: |
vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml \
--exclude-group=performance,non-cacheable,locking_functional \
--coverage-clover=coverage-no-cache.xml"
if: "${{ matrix.php-version == '8.1' }}"
env:
ENABLE_DBAL_EDITOR_API: ${{ matrix.dbal-version == '4@dev' }}
ENABLE_SECOND_LEVEL_CACHE: 1
- name: "Run PHPUnit with Second Level Cache and PHPUnit 11+"
run: |
vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml \
--exclude-group=performance \
--exclude-group=non-cacheable \
--exclude-group=locking_functional \
--coverage-clover=coverage-no-cache.xml
if: "${{ matrix.php-version != '8.1' }}"
env:
ENABLE_DBAL_EDITOR_API: ${{ matrix.dbal-version == '4@dev' }}
ENABLE_SECOND_LEVEL_CACHE: 1

- name: "Upload coverage files"
uses: "actions/upload-artifact@v7"
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- "docs/**"

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpbench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
- tests/**

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
- tests/StaticAnalysis/**

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 0 additions & 2 deletions ci/github/phpunit/mysqli.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
<var name="db_default_table_option_collation" value="utf8mb4_unicode_ci" />
<var name="db_default_table_option_engine" value="InnoDB" />

<!-- necessary change for some CLI/console output test assertions -->
<env name="COLUMNS" value="120"/>
<env name="DOCTRINE_DEPRECATIONS" value="trigger"/>
</php>

Expand Down
2 changes: 0 additions & 2 deletions ci/github/phpunit/pdo_mysql.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
<var name="db_default_table_option_collation" value="utf8mb4_unicode_ci" />
<var name="db_default_table_option_engine" value="InnoDB" />

<!-- necessary change for some CLI/console output test assertions -->
<env name="COLUMNS" value="120"/>
<env name="DOCTRINE_DEPRECATIONS" value="trigger"/>
</php>

Expand Down
2 changes: 0 additions & 2 deletions ci/github/phpunit/pdo_pgsql.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
<var name="db_password" value="postgres" />
<var name="db_dbname" value="doctrine_tests" />

<!-- necessary change for some CLI/console output test assertions -->
<env name="COLUMNS" value="120"/>
<env name="DOCTRINE_DEPRECATIONS" value="trigger"/>
</php>

Expand Down
2 changes: 0 additions & 2 deletions ci/github/phpunit/pdo_sqlite.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
<var name="db_driver" value="pdo_sqlite"/>
<var name="db_memory" value="true"/>

<!-- necessary change for some CLI/console output test assertions -->
<env name="COLUMNS" value="120"/>
<env name="DOCTRINE_DEPRECATIONS" value="trigger"/>
</php>

Expand Down
Loading
Loading