Skip to content

Merge 3.7.x up into 3.8.x - #12764

Merged
greg0ire merged 28 commits into
doctrine:3.8.xfrom
greg0ire:3.8.x
Nov 6, 2026
Merged

greg0ire merged 28 commits into
doctrine:3.8.xfrom
greg0ire:3.8.x

Conversation

@greg0ire

@greg0ire greg0ire commented Nov 6, 2026

Copy link
Copy Markdown
Member

No description provided.

mpdude and others added 28 commits November 4, 2026 09:01
These fixtures were introduced in 78fc129
for an EntityGenerator test. That test (and the whole code generator) was
removed in doctrine#9226, but the fixtures were left behind.

Found by an AI coding agent (Claude Code) while working in this codebase.
A handful of fixtures under tests/Tests/Models were only used by tests
removed in earlier cleanups (doctrine#9226, doctrine#9488, doctrine#9533, doctrine#9665, and the
annotation driver removal) and have since gone unused, including two
cascades where the only remaining user of a fixture was itself already
dead (DDC1872's trait/entity and Reflection's ParentClass). Also drops
the now-stale phpcs.xml.dist exclude-patterns for these files.

tests/Tests/Models/Global/GlobalNamespaceModel.php and the other two
PersistentObject fixtures are still used and were kept.

Found by an AI coding agent (Claude Code).
…st-fixtures

Remove orphaned test fixtures
It is less likely to change.
Switch git attributes to an include list
Keying by head_ref was not a great idea because 2 distrinct contributors
can use the same branch name. Let us use the pull request number
instead.
The class already enforces integer boundaries at runtime, but it
was not declaring them to static analysis tools.
Key concurrency groups by pull request number
The 2.21.x branch is gone as we don't intend releasing such version.
The 2.20.x branch is marked as being on life support rather than
maintained.
…used-test-classes

Remove eleven unused test fixtures and mocks
…-fixtures

Remove orphaned DDC2372 test fixtures
Add more precise types for the Window class
DDC3785Asset::$id is persisted through a custom DBAL type
(DDC3785AssetIdType), which handles the PHP<->DB conversion and SQL
declaration entirely on its own. Doctrine's embeddable mapping is never
actually used for DDC3785AssetId: it is never embedded via #[Embedded]
anywhere, and the only reason it carried #[Embeddable] plus a
#[Column(type: 'guid')] was to keep the superfluous
DDC3785AssetId::class argument in setUp()'s createSchemaForModels()
call from throwing a MappingException.

Dropping that argument along with the now-pointless #[Embeddable] and
#[Column] declarations leaves the test passing identically.

Found by an AI coding agent (Claude Code).
tests/Tests/ORM/Mapping/php/ holds plain scripts that mutate a
pre-bound $metadata variable, the convention of the old
Doctrine\ORM\Mapping\Driver\PhpDriver, removed in doctrine#9308.
StaticPHPMappingDriverTest now constructs
Doctrine\Persistence\Mapping\Driver\StaticPHPDriver against the same
directory, but that driver calls a static loadMetadata() method on
actual entity classes instead, so it never reads these files'
contents. No mapped class relies on them, and the full test suite
passes identically with them removed. Also drops the now-empty
phpcs.xml.dist exclude-pattern for this directory.
…er-fixtures

Remove orphaned PhpDriver-style mapping fixtures
…eddable-mapping

Remove dead Embeddable mapping from DDC3785Test fixture
Remove redundant jobs from the CI matrix
A recent bugfix in symfony/console that made lines longer than before
broke our test suite. It should not. What we want to ensure is the
contents of the final string, but not how it is wrapped.

As a nice side effect, we no longer need to specify the width of the
terminal, or to break a single assertion in several, and can remove
another local attempt at doing something similar in another test.

See symfony/symfony#67897
Assert console output independently from the wrapping
@greptile-apps

greptile-apps Bot commented Nov 6, 2026 •

Copy link
Copy Markdown

Greptile reviews are for Doctrine maintainers as a first filter, do not start fixing all the issues immediately unless you think they make sense. A Doctrine contributor will give you a green light on this PR for further development or rejection.

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] The PR appears safe to merge; no actionable issues were found.

Summary

Merges 3.7.x changes into 3.8.x.

  • CI checks the ORM with a more focused set of PHP and database combinations.
  • Pull requests get a label check when their target branch or labels change.
  • Console command tests check output text without relying on terminal formatting.
  • Pagination classes describe the valid ranges of their page values.
  • The test suite drops old mapping examples and fixture models.
  • Release listings and source archives reflect the current project layout.

No actionable issues were found. Tests were not run.

Reviews (1) · Last reviewed commit: "Merge remote-tracking branch 'origin/3.7..." · Reviewed by Greptile

@greg0ire
greg0ire merged commit a3816c8 into doctrine:3.8.x Nov 6, 2026
39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants