mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 03:44:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not list private constructors as inherited

Browse Source
This commit is contained in:
Máté Kocsis 2022-12-28 15:34:50 +01:00
parent 38e138798d
commit 7b08fe9f2d
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/gen_stub.php
View File

@ -2901,7 +2901,7 @@ class ClassInfo {
$parentsWithInheritedProperties[$parentName] = $parent;
}
if (!$hasConstructor && $parentInfo->hasConstructor()) {
if (!$hasConstructor && $parentInfo->hasNonPrivateConstructor()) {
$parentsWithInheritedMethods[$parentName]["name"] = $parent;
$parentsWithInheritedMethods[$parentName]["types"][] = "constructorsynopsis";
}
@ -2959,22 +2959,10 @@ class ClassInfo {
return false;
}
/**
* @param array<string, ClassInfo> $classMap
*/
private function hasParentConstructor(array $classMap): bool
private function hasNonPrivateConstructor(): bool
{
foreach ($this->extends as $parentName) {
$parent = $classMap[$parentName->toString()] ?? null;
if ($parent === null) {
throw new Exception("Missing parent class " . $parent->toString());
}
if ($parent->hasConstructor()) {
return true;
}
if ($parent->hasParentConstructor($classMap)) {
foreach ($this->funcInfos as $funcInfo) {
if ($funcInfo->name->isConstructor() && !($funcInfo->flags & Class_::MODIFIER_PRIVATE)) {
return true;
}
}