Accept both ClassMetadata and ClassMetadataInfo objects from the ORM
#2716
Conversation
This file contains 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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2716 +/- ##
=======================================
Coverage 79.36% 79.36%
=======================================
Files 162 162
Lines 8457 8457
=======================================
Hits 6712 6712
Misses 1745 1745
☔ View full report in Codecov by Sentry. |
franmomu
approved these changes
Oct 30, 2023
phansys
reviewed
Nov 5, 2023
| @@ -229,7 +230,7 @@ final public function setCacheItemPool(CacheItemPoolInterface $cacheItemPool): v | |||
| */ | |||
| public function loadMetadataForObjectClass(ObjectManager $objectManager, $metadata) | |||
| { | |||
| assert($metadata instanceof DocumentClassMetadata || $metadata instanceof EntityClassMetadata); | |||
| assert($metadata instanceof DocumentClassMetadata || $metadata instanceof EntityClassMetadata || $metadata instanceof LegacyEntityClassMetadata); | |||
There was a problem hiding this comment.
Maybe we could add the dockblock @phpstan-assert ClassMetadata&(DocumentClassMetadata|EntityClassMetadata|LegacyEntityClassMetadata) $meta.
There was a problem hiding this comment.
I tried it, that assertion didn't change anything on its own. Removing the assert() runtime call added errors, or trying @param ClassMetadata&(DocumentClassMetadata|EntityClassMetadata|LegacyEntityClassMetadata) $metadata like is done elsewhere added more errors.
|
thanks @mbabker! |
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.
Ref: #2708
The
Doctrine\ORM\Mapping\ClassMetadataInfoclass is deprecated in ORM 2.x and removed entirely in 3.0, withDoctrine\ORM\Mapping\ClassMetadatabeing the replacement.Doctrine\ORM\Mapping\ClassMetadataexists in 2.x as a subclass ofDoctrine\ORM\Mapping\ClassMetadataInfo, so no version conditional behaviors are really needed here, therefore, this PR just adds both ORM classes to some existing doc block types and assertions (I'm aware there are other places using the deprecatedClassMetadataInfoclass but the changes here just unblocked being able to run a number of tests locally on ORM 3.0 for now).