Skip to content

Merge 2.18.x up into 3.2.x#2201

Merged
greg0ire merged 7 commits intodoctrine:3.2.xfrom
greg0ire:3.2.x
Feb 12, 2026
Merged

Merge 2.18.x up into 3.2.x#2201
greg0ire merged 7 commits intodoctrine:3.2.xfrom
greg0ire:3.2.x

Conversation

@greg0ire
Copy link
Member

No description provided.

Kocal and others added 6 commits January 10, 2026 10:46
Fix typo in `dbal.connections.default_dbname` configuration
Using with() on a stub is deprecated. We don't want to check that we
call this object with 'doctrine', we just want to only return
$mockDoctrine when it is called with 'doctrine' and nothing else.
Not having a version constraint for this package causes deprecations
because it expects the framework bundle to define its extension by
extending a non deprecated class, and that is not the case with v7 of
that bundle.
static function (ContainerBuilder $containerBuilder) use ($driverNamespace): void {
$containerBuilder->addCompilerPass(DoctrineOrmMappingsPass::createAttributeMappingDriver(
[$driverNamespace],
/** @phpstan-ignore argument.type */
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the line below, realpath returns false. To be clarified by @bobvandevijver

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ended up using dummy/path, since apparently it does not matter 🤷

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the path doesn't matter, but the argument is required to supply. If I recall correctly I grabbed the realpath one from another test that uses the createXmlBundleTestContainer method, but using dummy/path should be fine. The test is about the driver being registered correctly, which is validated before the path is used anyways.

@greg0ire
Copy link
Member Author

Regarding the remaining failure, see #2198 (comment)

@greg0ire greg0ire merged commit 10b9d81 into doctrine:3.2.x Feb 12, 2026
14 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.

5 participants