(5.4) add compatibility layer for doctrine/annotations v1 and v2 #48912
Conversation
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
|
Wouldn't it be enough to change this line… to use |
|
Wow, it works! 😮 I was confused by |
nicolas-grekas
added a commit
that referenced
this pull request
Jan 9, 2023
…exislefebvre) This PR was merged into the 5.4 branch. Discussion ---------- [FrameworkBundle] restore call to addGlobalIgnoredName | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #48792 and replace #48912 | License | MIT | Doc PR | no The service `annotations.dummy_registry` is unregistered with `doctrine/annotations` v2. This had the unexpected effect to break the call to `addGlobalIgnoredName` with `doctrine/annotations` v2 : #48792 (comment) By using `nullOnInvalid` instead of `ignoreOnInvalid`, the call to `addGlobalIgnoredName` is restored. These changes can be tested with this reproducer: https://github.com/alexislefebvre/symfony_bug_app_48792 Downgrading and upgrading `doctrine/annotations` become possible: ```bash composer require doctrine/annotations:^1.13.0 --with-all-dependencies composer require doctrine/annotations:^2.0 --with-all-dependencies ``` Thanks to `@derrabus`: #48912 (comment) Commits ------- e058874 [FrameworkBundle] restore call to addGlobalIgnoredName
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The previous code always registered
annotations.dummy_registryand unregistered it withdoctrine/annotationsv1.This has the unexpected effect to break the call to
addGlobalIgnoredNamewithdoctrine/annotationsv2 : #48792 (comment)I propose a novel approach with a workaround that:
annotations.dummy_registryonly withdoctrine/annotationsv1, which avoid registering and unregistering a dummy serviceregisterLoader, because a conflict block the installation ofdoctrine/annotationswithoutregisterUniqueLoader: https://github.com/symfony/symfony/blob/5.4/src/Symfony/Bundle/FrameworkBundle/composer.json#L72 andregisterUniqueLoaderis available in 1.13.1 and later releases: https://github.com/doctrine/annotations/blob/1.13.x/lib/Doctrine/Common/Annotations/AnnotationRegistry.php#L124, so a test onregisterUniqueLoaderis enough to identifydoctrine/annotationsv1These changes can be tested with this reproducer: https://github.com/alexislefebvre/symfony_bug_app_48792
Downgrading and upgrading become possible:
composer require doctrine/annotations:~1.13.0 --with-all-dependencies composer require doctrine/annotations:^1.13.0 --with-all-dependencies composer require doctrine/annotations:^2.0 --with-all-dependenciesIt looks like services declaration was meant to be as simple as possible, and logic went into
FrameworkExtension, I think it made things more complicated in this case, with the serviceannotations.dummy_registrybeing declared and unregistered just after. So I took a simpler approach.