[DoctrineBridge] Fix automapping #44987
Merged
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.
This should fix the broken automapping configuration for bundles that use annotations and attributes, see #44355 for additional details.
When using the newer bundle directory structure conventions, especially with the
Bundle::getPath()
method overridden to point the bundle root path to the Bundle class' parent directory, the issue comes up because the bundle filesystem root path does not match the root path for the actual bundle code (effectively the PSR-4 root path).To fix automapping, the
AbstractDoctrineExtension::detectMetadataDriver()
method will be called a second time with the Bundle classpath if the first call (which is effectively the same asBundle::getPath()
) can't resolve the appropriate mapping type. This will also update setting$bundleConfig['dir']
for drivers that are based on PHP classes so that the root path is based on the bundle classpath (AKA the PSR-4 root path) instead of the bundle path.The bulk of this patch is mainly from adding test fixture bundles to be able to test the
AbstractDoctrineExtension::getMappingDriverBundleConfigDefaults()
method in this repo and ensuring that the metadata driver detection works right for all of the supported drivers.