Handle property, class constant, and method name collisions

Author: kocsismate

build/gen_stub.php

@@ -4135,12 +4135,12 @@ static function (FuncInfo $funcInfo) use ($allConstInfos) {
             }
 
             foreach ($funcInfo->attributes as $attribute) {
-                $code .= $attribute->generateCode("zend_add_function_attribute(zend_hash_str_find_ptr($functionTable, \"" . $funcInfo->name->getNameForAttributes() . "\", sizeof(\"" . $funcInfo->name->getNameForAttributes() . "\") - 1)", $funcInfo->name->getMethodSynopsisFilename(), $allConstInfos);
+                $code .= $attribute->generateCode("zend_add_function_attribute(zend_hash_str_find_ptr($functionTable, \"" . $funcInfo->name->getNameForAttributes() . "\", sizeof(\"" . $funcInfo->name->getNameForAttributes() . "\") - 1)", "func_" . $funcInfo->name->getNameForAttributes(), $allConstInfos);
             }
 
             foreach ($funcInfo->args as $index => $arg) {
                 foreach ($arg->attributes as $attribute) {
-                    $code .= $attribute->generateCode("zend_add_parameter_attribute(zend_hash_str_find_ptr($functionTable, \"" . $funcInfo->name->getNameForAttributes() . "\", sizeof(\"" . $funcInfo->name->getNameForAttributes() . "\") - 1), $index", "{$funcInfo->name->getMethodSynopsisFilename()}_arg{$index}", $allConstInfos);
+                    $code .= $attribute->generateCode("zend_add_parameter_attribute(zend_hash_str_find_ptr($functionTable, \"" . $funcInfo->name->getNameForAttributes() . "\", sizeof(\"" . $funcInfo->name->getNameForAttributes() . "\") - 1), $index", "func_{$funcInfo->name->getNameForAttributes()}_arg{$index}", $allConstInfos);
                 }
             }
 
@@ -4161,7 +4161,7 @@ static function (ConstInfo $constInfo) use ($allConstInfos) {
             $code = null;
 
             foreach ($constInfo->attributes as $attribute) {
-                $code .= $attribute->generateCode("zend_add_class_constant_attribute(class_entry, const_" . $constInfo->name->getDeclarationName(), $constInfo->name->getDeclarationName(), $allConstInfos);
+                $code .= $attribute->generateCode("zend_add_class_constant_attribute(class_entry, const_" . $constInfo->name->getDeclarationName(), "const_" . $constInfo->name->getDeclarationName(), $allConstInfos);
             }
 
             return $code;
@@ -4177,7 +4177,7 @@ function generatePropertyAttributeInitialization(iterable $propertyInfos, iterab
     $code = "";
     foreach ($propertyInfos as $propertyInfo) {
         foreach ($propertyInfo->attributes as $attribute) {
-            $code .= $attribute->generateCode("zend_add_property_attribute(class_entry, property_" . $propertyInfo->name->getDeclarationName(), $propertyInfo->name->getDeclarationName(), $allConstInfos);
+            $code .= $attribute->generateCode("zend_add_property_attribute(class_entry, property_" . $propertyInfo->name->getDeclarationName(), "property_" . $propertyInfo->name->getDeclarationName(), $allConstInfos);
         }
     }