Merge pull request #239 from dsavina/improvement/method-name-collision

Improvement - Do not use alternative method name for first occurrence

Author: moufmouf

src/Utils/BeanDescriptor.php

@@ -470,9 +470,17 @@ private function checkForDuplicate(MethodDescriptorInterface $descriptor): void
             $this->descriptorsByMethodName[$name] = [];
         }
         $this->descriptorsByMethodName[$name][] = $descriptor;
-        if (count($this->descriptorsByMethodName[$name]) > 1) {
-            foreach ($this->descriptorsByMethodName[$name] as $duplicateDescriptor) {
-                $duplicateDescriptor->useAlternativeName();
+        $descriptors = $this->descriptorsByMethodName[$name];
+        if (count($descriptors) > 1) {
+            $properties = array_filter($descriptors, function ($descriptor) {
+                return $descriptor instanceof AbstractBeanPropertyDescriptor;
+            });
+            $renameProperties = count($properties) > 1;
+
+            foreach ($descriptors as $descriptor) {
+                if ($renameProperties || !$descriptor instanceof AbstractBeanPropertyDescriptor) {
+                    $descriptor->useAlternativeName();
+                }
             }
         }
     }