report error for single param too since named args can even be used then

vimeo · Mar 13, 2024 · a2307ac · a2307ac
1 parent 4ea41cb
commit a2307ac
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/src/Psalm/Internal/Analyzer/MethodComparator.php b/src/Psalm/Internal/Analyzer/MethodComparator.php
@@ -38,7 +38,6 @@
 use Psalm\Type\Union;
 
 use function array_filter;
-use function count;
 use function in_array;
 use function strpos;
 use function strtolower;
@@ -457,10 +456,8 @@ private static function compareMethodParams(
                     $implementer_param->location->file_path,
                 )
             ) {
-                if (!$guide_classlike_storage->user_defined && $i === 0 && count($guide_method_storage->params) < 2) {
-                    // if it's third party defined and a single arg, renaming is unnecessary
-                    // if we still want to psalter it, move this if and change the else below to elseif
-                } elseif ($config->allow_named_arg_calls
+                // even if it's just a single arg, it needs to be renamed in case it's called with a single named arg
+                if ($config->allow_named_arg_calls
                     || ($guide_classlike_storage->location
                         && !$config->isInProjectDirs($guide_classlike_storage->location->file_path)
                     )

diff --git a/tests/MethodCallTest.php b/tests/MethodCallTest.php
@@ -1144,9 +1144,9 @@ public static function new() : self {
 
                     class Datetime extends \DateTime
                     {
-                        public static function createFromInterface(\DateTimeInterface $datetime): static
+                        public static function createFromInterface(\DateTimeInterface $object): static
                         {
-                            return parent::createFromInterface($datetime);
+                            return parent::createFromInterface($object);
                         }
                     }',
                 'assertions' => [],

diff --git a/tests/MethodSignatureTest.php b/tests/MethodSignatureTest.php
@@ -452,13 +452,13 @@ class A implements Serializable {
                         private $id = 1;
 
                         /**
-                         * @param string $serialized
+                         * @param string $data
                          */
-                        public function unserialize($serialized) : void
+                        public function unserialize($data) : void
                         {
                             [
                                 $this->id,
-                            ] = (array) \unserialize($serialized);
+                            ] = (array) \unserialize($data);
                         }
 
                         public function serialize() : string
@@ -1060,6 +1060,21 @@ public function fooFoo(int $a, bool $c): void {
                     }',
                 'error_message' => 'ParamNameMismatch',
             ],
+            'differentArgumentName' => [
+                'code' => '<?php
+                    class A {
+                        public function fooFoo(int $a): void {
+
+                        }
+                    }
+
+                    class B extends A {
+                        public function fooFoo(int $b): void {
+
+                        }
+                    }',
+                'error_message' => 'ParamNameMismatch',
+            ],
             'nonNullableSubclassParam' => [
                 'code' => '<?php
                     class A {
@@ -1398,8 +1413,8 @@ public function foo($s) : void {}
             'preventImplementingSerializableWithWrongDocblockType' => [
                 'code' => '<?php
                     class Foo implements \Serializable {
-                        /** @param int $serialized */
-                        public function unserialize($serialized) {}
+                        /** @param int $data */
+                        public function unserialize($data) {}
                         public function serialize() {}
                     }',
                 'error_message' => 'ImplementedParamTypeMismatch',

diff --git a/tests/UnusedCodeTest.php b/tests/UnusedCodeTest.php
@@ -764,7 +764,7 @@ public function serialize() : string {
                             return "";
                         }
 
-                        public function unserialize($_serialized) : void {}
+                        public function unserialize($data) : void {}
                     }
 
                     new Foo();',