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

Support doctrine/annotations 2 #10320

Merged
merged 1 commit into from
Dec 19, 2022
Merged

Conversation

derrabus
Copy link
Member

WIP until doctrine/annotations 2 has been released.

This PR allows the installation of Annotations 2 and fixes all failing tests.

@derrabus derrabus added this to the 2.14.0 milestone Dec 19, 2022
@derrabus derrabus force-pushed the bump/annotations-2 branch 2 times, most recently from 4a71cbb to 5571569 Compare December 19, 2022 18:22
@@ -78,6 +78,9 @@ jobs:
run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
if: "${{ matrix.dbal-version != 'default' }}"

- name: "Uninstall PHPBench"
run: "composer remove --dev --no-update phpbench/phpbench"
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 looking into adding support for v2 to phpbench

Copy link
Member

Choose a reason for hiding this comment

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

phpbench/phpbench#1013

I ran the tests locally, and apart from an unrelated failure, all is well.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think, we can live with this hack in our CI until PHPBench has merged and released your PR.

@derrabus derrabus force-pushed the bump/annotations-2 branch 2 times, most recently from f3d1c55 to 7e6c592 Compare December 19, 2022 18:50
@derrabus derrabus marked this pull request as ready for review December 19, 2022 18:51
@derrabus derrabus requested a review from greg0ire December 19, 2022 21:09
@@ -182,14 +183,21 @@ public function newDefaultAnnotationDriver($paths = [], $useSimpleAnnotationRead
}

if ($useSimpleAnnotationReader) {
Copy link
Member

Choose a reason for hiding this comment

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

To be deprecated later on I suppose.

Copy link
Member Author

Choose a reason for hiding this comment

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

The whole method is deprecated already and its replacement does not have that parameter anymore.

@derrabus derrabus merged commit f82485e into doctrine:2.14.x Dec 19, 2022
@derrabus derrabus deleted the bump/annotations-2 branch December 19, 2022 21:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants