Skip to content

Conflict with doctrine/common pre-2.9#7

Merged
Ocramius merged 1 commit intodoctrine:masterfrom
Majkl578:common-conflict
Jun 9, 2018
Merged

Conflict with doctrine/common pre-2.9#7
Ocramius merged 1 commit intodoctrine:masterfrom
Majkl578:common-conflict

Conversation

@Majkl578
Copy link
Copy Markdown
Contributor

@Majkl578 Majkl578 commented Jun 8, 2018

Without conflict to 2.8 and lower, there may be dragons when both are installed in parallel.
I.e. composer's optimized autoload:

Warning: Ambiguous class resolution, "Doctrine\Common\EventArgs" was found in both "vendor/doctrine/common/lib/Doctrine/Common/EventArgs.php" and "vendor/doctrine/event-manager/lib/Doctrine/Common/EventArgs.php", the first will be used.
Warning: Ambiguous class resolution, "Doctrine\Common\EventSubscriber" was found in both "vendor/doctrine/common/lib/Doctrine/Common/EventSubscriber.php" and "vendor/doctrine/event-manager/lib/Doctrine/Common/EventSubscriber.php", the first will be used.
Warning: Ambiguous class resolution, "Doctrine\Common\EventManager" was found in both "vendor/doctrine/common/lib/Doctrine/Common/EventManager.php" and "vendor/doctrine/event-manager/lib/Doctrine/Common/EventManager.php", the first will be used.

We can either ignore them (as the functionality is unaffected) or add a conflict. Conflict might make migration to standalone components a bit harder though.

@Majkl578 Majkl578 added the Improvement Not a new feature or BC break but an improvement to the quality of the code base. label Jun 8, 2018
@Majkl578 Majkl578 added this to the 1.0.0 milestone Jun 8, 2018
@Majkl578 Majkl578 requested review from Ocramius, alcaeus and jwage June 8, 2018 22:17
@Ocramius Ocramius merged commit aaa2c2c into doctrine:master Jun 9, 2018
@Ocramius
Copy link
Copy Markdown
Member

Ocramius commented Jun 9, 2018

🚢

@Majkl578 Majkl578 deleted the common-conflict branch June 9, 2018 06:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alcaeus alcaeus alcaeus approved these changes

@jwage jwage Awaiting requested review from jwage

@Ocramius Ocramius Awaiting requested review from Ocramius

Assignees

No one assigned

Labels

Improvement Not a new feature or BC break but an improvement to the quality of the code base.

Projects

None yet

Milestone

1.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@Majkl578 @Ocramius @alcaeus