Merge pull request #133 from nesl247/patch-1

feat: add support for psalm 5

Author: orklah

composer.json

@@ -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",
@@ -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": {

phpcs.xml.dist

@@ -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">
@@ -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 <] -->

src/Provider/ReturnTypeProvider/CollectionFirstAndLast.php

@@ -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;
             }