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

Phpstan lvl 7 #180

Merged
merged 3 commits into from
May 16, 2021
Merged

Phpstan lvl 7 #180

merged 3 commits into from
May 16, 2021

Conversation

greg0ire
Copy link
Member

No description provided.

greg0ire added 3 commits May 16, 2021 14:10
There is only one directory for which this will work.
We have found that there were lots of conflicts during the last merge up
to 3.0. Reaching level 7 on lower branches reduces differences between
them and thus the amount of conflits for future merges. It should also
ensure that no new PHPStan error are discovered when merging up because
they are detected at level 7 and not at level 5.
@greg0ire
Copy link
Member Author

Let's wait for https://www.githubstatus.com/incidents/zbpwygxwb3gw to be resolved before merging this.

Copy link
Member

@alcaeus alcaeus left a comment

Choose a reason for hiding this comment

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

Can't comment on the impact of the psalm changes, but in general LGTM.

@@ -0,0 +1,11 @@
# Circular dependency

This package has a development dependency on `doctrine/common`, which has a
Copy link
Member

Choose a reason for hiding this comment

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

Thanks for documenting this. Is there anything we can do to fix this? Should we prepare doctrine/common to work with persistence 3?

Copy link
Member Author

Choose a reason for hiding this comment

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

We could use ^2.0 || ^3.0, but IMO that's a bit "risky" if we do not test that 2.0 actually work with 3, and the benefit is small: that would only fix one weird thing out of the 2 we have to do, namely:

  • using COMPOSER_ROOT_VERSION
  • using 2.0 as a value for it when developing on 3.x

@greg0ire greg0ire merged commit 93bb1cb into doctrine:2.2.x May 16, 2021
@greg0ire greg0ire deleted the phpstan-lvl-7 branch May 16, 2021 16:31
@greg0ire greg0ire added this to the 2.2.1 milestone May 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants