Fix #339 - when a class is also in the callmap, use the user-defined behaviour

src/Psalm/Codebase/Methods.php

@@ -113,7 +113,9 @@ class Methods
             $old_method_id = $fq_class_name . '::' . $old_constructor_name;
         }
 
-        if (CallMap::inCallMap($method_id) || ($old_method_id && CallMap::inCallMap($method_id))) {
+        if (!$class_storage->user_defined
+            && (CallMap::inCallMap($method_id) || ($old_method_id && CallMap::inCallMap($method_id)))
+        ) {
             return true;
         }
 

tests/MethodSignatureTest.php

@@ -263,6 +263,17 @@ class MethodSignatureTest extends TestCase
                         }
                     }',
             ],
+            'clashWithCallMapClass' => [
+                '<?php
+                    class Event {}
+                    class AClass
+                    {
+                        public function get(): Event
+                        {
+                            return new Event;
+                        }
+                    }',
+            ],
         ];
     }