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.

Sign up for GitHub

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

feat: add support for psalm 5 #133

Merged
merged 9 commits into from
Dec 1, 2022
Merged

feat: add support for psalm 5 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
52212f0
feat: add support for psalm 5
nesl247 Nov 30, 2022
69dba00
Update the test for Psalm 5
weirdan Nov 30, 2022
b33a102
Allow plugin
weirdan Nov 30, 2022
756a918
Fix wrong assertion
weirdan Nov 30, 2022
a019b7c
Update Collections tests for Psalm 5
weirdan Nov 30, 2022
ff203bc
Align table markers
weirdan Nov 30, 2022
fe3859b
Use type_params instead of `getChildNodes()`
weirdan Nov 30, 2022
feadcb2
Fixed typo in the version guard
weirdan Dec 1, 2022
c8e301e
Ignore irrelevant CS issues
weirdan Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"require": {
"php": "^7.2 || ^8",
"composer/semver": "^1.4 || ^2.0 || ^3.0",
"vimeo/psalm": "^4.28"
"vimeo/psalm": "^4.28|^5.0"
},
"conflict": {
"doctrine/collections": "<1.8",
Expand All @@ -48,7 +48,8 @@
"config": {
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
"dealerdirect/phpcodesniffer-composer-installer": true,
"composer/package-versions-deprecated": true
}
},
"extra": {
Expand Down
3 changes: 3 additions & 0 deletions phpcs.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<file>stubs</file>
<file>tests</file>
<exclude-pattern>*/tests/_run/*</exclude-pattern>
<exclude-pattern>*/tests/_support/_generated/*</exclude-pattern>

<!-- Include full Doctrine Coding Standard -->
<rule ref="Doctrine">
Expand All @@ -30,6 +31,8 @@
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint" />
<exclude name="SlevomatCodingStandard.Namespaces.UseSpacing.IncorrectLinesCountBetweenDifferentTypeOfUse" />
<exclude name="Squiz.NamingConventions.ValidVariableName.PublicHasUnderscore" />
<!-- Psalm uses snake case for properties -->
<exclude name="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps" />

<!-- conflicts with other rules -->
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing" /> <!-- [> PSR12.Functions.ReturnTypeDeclaration <] -->
Expand Down
2 changes: 1 addition & 1 deletion src/Provider/ReturnTypeProvider/CollectionFirstAndLast.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public static function getMethodReturnType(MethodReturnTypeProviderEvent $event)
return null;
}

$childNode = $type->getChildNodes();
$childNode = $type->type_params;
if (! isset($childNode[1]) || ! $childNode[1] instanceof Type\Union) {
return null;
}
Expand Down
Loading