Conversation
* Update .doctrine-project.json * Remove versions older than 2 years * Remove docs for v1.3
`#[MappedSuperclass]` handles custom collection name Close #2910
* Test with PHP 8.5 * Fix 'Using null as an array offset is deprecated, use an empty string instead' --------- Co-authored-by: Ion Bazan <ion.bazan@gmail.com>
Merge release 2.15.1 into 2.16.x
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Use native lazy objects in benchmarks * Use phpbench attributes instead of annotation
…ml (#2926) Bumps [doctrine/.github/.github/workflows/release-on-milestone-closed.yml](https://github.com/doctrine/.github) from 12.2.0 to 13.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](doctrine/.github@v12.2.0...13.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/release-on-milestone-closed.yml dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [doctrine/.github/.github/workflows/documentation.yml](https://github.com/doctrine/.github) from 12.2.0 to 13.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](doctrine/.github@v12.2.0...13.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/documentation.yml dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [doctrine/.github/.github/workflows/website-schema.yml](https://github.com/doctrine/.github) from 12.2.0 to 13.0.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](doctrine/.github@v12.2.0...13.0.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/website-schema.yml dependency-version: 13.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Run tests with Symfony 7.4 by default * Install Flex * Fix Symfony version constraint * Skip bug on var-exporter symfony/symfony#52797
Merge 2.15.x into 2.16.x
IonBazan
force-pushed
the
merge-3.0.x-2.16.x
branch
from
52be8bd to
cfd5f08
Compare
There was a problem hiding this comment.
Pull request overview
This PR merges changes from the 2.16.x branch into 3.0.x, resolving merge conflicts and bringing in new features and improvements.
Key changes:
- Added support for
collectionparameter onMappedSuperclassannotation/attribute (GH-2910) - Added deprecation notices for proxy directory methods when using native lazy objects
- Migrated PHPBench benchmark files from annotations to attributes
- Updated documentation to replace "Annotations" terminology with "Attributes"
- Updated various dependencies and GitHub workflow configurations
- Added PHP 8.5 support to CI workflows
Reviewed changes
Copilot reviewed 31 out of 31 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
tests/Tests/Functional/Ticket/GH2910Test.php |
Added test case for MappedSuperclass collection parameter using attributes |
tests/Tests/Functional/Ticket/GH2910XmlTest.php |
Added test case for MappedSuperclass collection parameter using XML mapping |
tests/Tests/Functional/Ticket/GH2910Xml/*.xml |
XML mapping files for GH2910 test cases |
src/Persisters/DocumentPersister.php |
Added defensive null handling for embedded metadata identifier |
src/Mapping/Annotations/MappedSuperclass.php |
Added collection parameter to MappedSuperclass annotation |
src/Configuration.php |
Added deprecation notices for proxy directory getters/setters |
src/Aggregation/Stage/VectorSearch.php |
Added defensive null handling for path field |
docs/en/tutorials/getting-started.rst |
Updated "Annotations" to "Attribute" |
docs/en/reference/migrating-schemas.rst |
Updated annotation references to attribute syntax |
docs/en/reference/basic-mapping.rst |
Fixed reference link to attributes-reference |
docs/en/reference/attributes-reference.rst |
Added documentation for MappedSuperclass collection parameter and QueryResultDocument |
docs/en/reference/annotations-reference.rst |
Fixed annotation examples to use ODM instead of ORM |
docs/en/reference/aggregation-builder.rst |
Added anchor for aggregation_builder_hydration section |
docs/en/cookbook/vector-search.rst |
Updated "annotation" to "attribute" |
docs/en/cookbook/lookup-reference.rst |
Updated "annotations" to "attributes" |
composer.json |
Updated symfony/var-exporter and phpbench/phpbench versions |
benchmark/Document/StoreDocumentBench.php |
Migrated from PHPBench annotations to attributes |
benchmark/Document/LoadDocumentBench.php |
Migrated from PHPBench annotations to attributes |
benchmark/Document/HydrateDocumentBench.php |
Migrated from PHPBench annotations to attributes |
benchmark/BaseBench.php |
Removed class-level BeforeMethods annotation, enabled native lazy objects |
UPGRADE-2.16.md |
Added upgrade notes for proxy directory deprecation |
.github/workflows/website-schema.yml |
Updated workflow version reference |
.github/workflows/static-analysis.yml |
Updated actions/checkout to v6 |
.github/workflows/release-on-milestone-closed.yml |
Updated workflow version reference |
.github/workflows/performance.yml |
Added PHP 8.5 support and unique artifact names |
.github/workflows/documentation.yml |
Updated workflow version reference |
.github/workflows/continuous-integration.yml |
Added PHP 8.5 support and flex tool |
.github/workflows/atlas-ci.yml |
Updated actions/checkout to v6, changed Symfony configuration approach |
.doctrine-project.json |
Updated version configuration for 3.0 and 2.16 releases |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
GromNaN
approved these changes
Dec 1, 2025
…ml (#2943) Bumps [doctrine/.github/.github/workflows/release-on-milestone-closed.yml](https://github.com/doctrine/.github) from 13.0.0 to 13.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](doctrine/.github@13.0.0...13.1.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/release-on-milestone-closed.yml dependency-version: 13.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [doctrine/.github/.github/workflows/documentation.yml](https://github.com/doctrine/.github) from 13.0.0 to 13.1.0. - [Release notes](https://github.com/doctrine/.github/releases) - [Commits](doctrine/.github@13.0.0...13.1.0) --- updated-dependencies: - dependency-name: doctrine/.github/.github/workflows/documentation.yml dependency-version: 13.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
IonBazan
force-pushed
the
merge-3.0.x-2.16.x
branch
from
cfd5f08 to
bd85fdd
Compare
IonBazan
force-pushed
the
merge-3.0.x-2.16.x
branch
from
1cbc988 to
4717205
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges changes from 2.16.x into 3.0.x and resolves incoming conflicts.