-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Manually merge 3.0.x into master #3931
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tructor Ensure the constructor arguments are passed to custom classes
1. Removed no longer existing entries 2. Added new entries 3. Sorted using `sort` (ignores case and the leading dot, same as `ls`)
Removed performance tests
Actualize the content of the .gitattributes file
Allowing us to use more advanced checks and have full generic support. This also adds a baseline file, since we have new violations being reported but don't want to address them right now.
By either defining their types or renaming to match parent class (or interface).
Additionally, set the new value and get the old one in one ini_set() call.
Upgrade to PHPStan v0.12
greg0ire
approved these changes
Apr 2, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This was quite an adventure because
2.10.x
andmaster
have some differences in static analysis configuration:master
branch runs PHPStan against thetests/
directory while2.10.x
doesn't.master
requires language-level type declarations where possible while2.10.x
doesn't.So the newly found issues had to be fixed right before or withing the merge:
MasterSlaveConnection::connect()
was changed from($connection = null)
to(?string $connection = null)
. The reason is that Upgrade to PHPStan v0.12 #3799 removed the{@inheritDoc}
annotation from the method which made PHP_CodeSniffer spot the missing type declaration that should have been added in Enforced parameter and return value types in Connection classes #3568.