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

Upgrade phpstan and psalm #4412

Merged
merged 1 commit into from Nov 16, 2020
Merged

Upgrade phpstan and psalm #4412

merged 1 commit into from Nov 16, 2020

Conversation

simPod
Copy link
Contributor

@simPod simPod commented Nov 6, 2020

Q A
Type improvement
BC Break no
Fixed issues

Summary

In order to fix issues related but not explicitly caused by #4403

@greg0ire greg0ire requested a review from morozov November 7, 2020 08:58
Copy link
Member

@morozov morozov left a comment

Choose a reason for hiding this comment

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

Please retarget against 2.12.x.

tests/Functional/Connection/FetchTest.php Outdated Show resolved Hide resolved
@simPod simPod changed the base branch from master to 2.12.x November 11, 2020 08:54
@simPod simPod force-pushed the upgrade branch 4 times, most recently from e9034c5 to 732c66c Compare November 11, 2020 09:47
composer.json Outdated Show resolved Hide resolved
phpstan.neon.dist Outdated Show resolved Hide resolved
composer.json Outdated Show resolved Hide resolved
@simPod simPod force-pushed the upgrade branch 3 times, most recently from 28900a6 to c07b200 Compare November 15, 2020 09:36
.github/workflows/static-analysis.yml Outdated Show resolved Hide resolved
composer.json Outdated
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
"vimeo/psalm": "^3.17.2"
"vimeo/psalm": "^3.18.2"
Copy link
Member

Choose a reason for hiding this comment

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

@morozov should we drop the ^ part here? that way we avoid discrepancies between local runs and CI (at the cost of a warning from Composer I think)

Choose a reason for hiding this comment

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

The ^ doesn’t block later versions so why a warning?

Copy link
Member

Choose a reason for hiding this comment

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

I checked and you are right, there is no warning. Maybe that changed, or I have faulty memory. That said, I was proposing to remove the ^, that's when I thought you would get a warning, you won't get a warning with it that's for sure.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe that changed, or I have faulty memory.

No, Composer would definitely trigger a warning in some cases if some dependency constraint was declared as a specific version.

should we drop the ^ part here?

Why now? The specific version is locked in the lock file which we still commit to Git. I believe it should be done separately from this specific upgrade.

Copy link
Member

Choose a reason for hiding this comment

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

I wasn't require we do it now, but in general. Now would be as good a time as any.

Copy link
Member

Choose a reason for hiding this comment

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

Now would be as good a time as any.

The way how we manage development dependencies is for the most part initiated by the work being done in #4386 which seems stuck. Once we decide to make a change, we'll make it for all dependencies at once.

This patch comes from an external contributor and just updates a dependency. I don't see much point in increasing the scope.

@simPod simPod requested a review from morozov November 15, 2020 09:57
@simPod simPod force-pushed the upgrade branch 4 times, most recently from 1ccd983 to 2ee4fae Compare November 16, 2020 08:41
.github/workflows/static-analysis.yml Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
morozov
morozov previously approved these changes Nov 16, 2020
composer.lock Outdated Show resolved Hide resolved
@morozov morozov merged commit 79cba0b into doctrine:2.12.x Nov 16, 2020
@morozov
Copy link
Member

morozov commented Nov 16, 2020

Thanks, @simPod.

@simPod simPod deleted the upgrade branch November 16, 2020 23:08
@simPod
Copy link
Contributor Author

simPod commented Nov 17, 2020

Thanks for patience with reviews :)

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 26, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants