Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove last references to ClassMetadataInfo #9713

Merged
merged 2 commits into from
May 2, 2022

Conversation

greg0ire
Copy link
Member

@greg0ire greg0ire commented May 1, 2022

It has been deprecated for a long, long time.

ClassMetadataInfo itself is left to avoid conflict. It shall be removed right before releasing 3.0.0

@greg0ire greg0ire force-pushed the remove-cmi branch 3 times, most recently from 05c897c to ef84d64 Compare May 1, 2022 21:08
@greg0ire greg0ire marked this pull request as ready for review May 1, 2022 21:17
SenseException
SenseException previously approved these changes May 1, 2022
* @param string $entityName The name of the entity class the new instance is used for.
* @psalm-param class-string<T> $entityName
* @var string
* @todo Not really needed. Usage could be localized.
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure what "Usage could be localized" means.

Copy link
Member Author

Choose a reason for hiding this comment

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

🤔 me neither

@derrabus
Copy link
Member

derrabus commented May 2, 2022

This change will be a PITA for future merge-ups. 😓

@greg0ire
Copy link
Member Author

greg0ire commented May 2, 2022

@derrabus you mean when touching CMI? Git detected it as a rename, so it should be transparent.

@derrabus
Copy link
Member

derrabus commented May 2, 2022

Are you sure? Unless GitHub has a very strage way to display a file rename, it looks like a big code chunk has been moved from one class to another.

@greg0ire
Copy link
Member Author

greg0ire commented May 2, 2022

It's a bit confusing: git show --summary does not show the rename, yet when I amend the commit, I get this:

[remove-cmi 952ccd103] Remove ClassMetadataInfo
 Author: Grégoire Paris <[email protected]>
 Date: Sun May 1 23:06:22 2022 +0200
 11 files changed, 28 insertions(+), 65 deletions(-)
 rename lib/Doctrine/ORM/Mapping/{ClassMetadataInfo.php => ClassMetadata.php} (99%)

Let me try doing a local merge up.

@greg0ire
Copy link
Member Author

greg0ire commented May 2, 2022

When trying a local merge up, there is indeed a conflict, where none of the choices are good (I get a choice between deleted file and modified file, but CM is not modified when I pick "deleted file")

@greg0ire
Copy link
Member Author

greg0ire commented May 2, 2022

I tried removing ClassMetadata, it helps with git show --summary but not with the merge up or with Github

@greg0ire greg0ire force-pushed the remove-cmi branch 2 times, most recently from 28012e9 to f420d0c Compare May 2, 2022 17:08
It is unused apart from a tests where it is easily replaced.
@greg0ire greg0ire changed the title Remove ClassMetadataInfo Remove last references to ClassMetadataInfo May 2, 2022
It has been deprecated for a long, long time.
@greg0ire greg0ire marked this pull request as ready for review May 2, 2022 17:27
@greg0ire
Copy link
Member Author

greg0ire commented May 2, 2022

@derrabus I've postponed the removal of CMI itself, the rest can go now IMO.

@derrabus derrabus added this to the 3.0.0 milestone May 2, 2022
@derrabus derrabus merged commit 4c2950a into doctrine:3.0.x May 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants