Skip to content

gen_stub: various simplifications and clean up (5) #18665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

gen_stub: various simplifications and clean up (5) #18665

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0a15f76
gen_stub: add maximum option to `generateVersionDependentFlagCode()`
DanielEScherzer May 14, 2025
2f8e7cc
gen_stub: create `VersionFlags` class
DanielEScherzer May 14, 2025
efa6823
gen_stub: move `generateClassEntryCode()` into `FileInfo`
DanielEScherzer May 14, 2025
859c4c1
gen_stub: move `getFileDocComments()` into `FileInfo`
DanielEScherzer May 14, 2025
88fb45b
gen_stub: simplify `generateFunctionEntries()`
DanielEScherzer May 14, 2025
65a9d9f
gen_stub: remove unused `AbstractConstName::equals()`
DanielEScherzer May 14, 2025
4ce64c5
gen_stub: replace `AbstractConstName::isClassConst()` with `instanceof`
DanielEScherzer May 14, 2025
9847938
gen_stub: add `SimpleType::toTypeInfo()`
DanielEScherzer May 15, 2025
9adf821
gen_stub: simplify `FuncInfo::getFunctionEntry()`
DanielEScherzer May 15, 2025
6714fe2
gen_stub: simplify `FuncInfo::getFramelessDeclaration()`
DanielEScherzer May 15, 2025
80a70f8
gen_stub: replace `FunctionOrMethodName::isMethod()` with `instanceof`
DanielEScherzer May 15, 2025
a9891c2
gen_stub: make some `FuncInfo` methods private
DanielEScherzer May 15, 2025
175f71d
gen_stub: inline `computeStubHash()`
DanielEScherzer May 15, 2025
9a3ed8d
gen_stub: avoid unneeded regex match
DanielEScherzer May 15, 2025
c562b69
gen_stub: add `ConstInfo::getPredefinedConstantElement()`
DanielEScherzer May 15, 2025
48ae55a
gen_stub: simplify `ClassInfo::getRegistration()`
DanielEScherzer May 15, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
gen_stub: add ConstInfo::getPredefinedConstantElement() 
Simplifies the implementation of `::getPredefinedConstantTerm()` and
`::getPredefinedConstantEntry()`, which only differ in the name of the tag
used.
  • Loading branch information
@DanielEScherzer
DanielEScherzer committed May 29, 2025
commit c562b69fc2e79d3ca242aad8f71f3fbbb18529c6
40 changes: 17 additions & 23 deletions build/gen_stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2658,41 +2658,35 @@ protected function getFieldSynopsisValueString(array $allConstInfos): ?string
return $this->valueString;
}

public function getPredefinedConstantTerm(DOMDocument $doc, int $indentationLevel): DOMElement {
private function getPredefinedConstantElement(
DOMDocument $doc,
int $indentationLevel,
string $name
): DOMElement {
$indentation = str_repeat(" ", $indentationLevel);

$termElement = $doc->createElement("term");
$element = $doc->createElement($name);

$constantElement = $doc->createElement("constant");
$constantElement->textContent = $this->name->__toString();

$typeElement = ($this->phpDocType ?? $this->type)->getTypeForDoc($doc);

$termElement->appendChild(new DOMText("\n$indentation "));
$termElement->appendChild($constantElement);
$termElement->appendChild(new DOMText("\n$indentation ("));
$termElement->appendChild($typeElement);
$termElement->appendChild(new DOMText(")\n$indentation"));
$element->appendChild(new DOMText("\n$indentation "));
$element->appendChild($constantElement);
$element->appendChild(new DOMText("\n$indentation ("));
$element->appendChild($typeElement);
$element->appendChild(new DOMText(")\n$indentation"));

return $termElement;
return $element;
}

public function getPredefinedConstantEntry(DOMDocument $doc, int $indentationLevel): DOMElement {
$indentation = str_repeat(" ", $indentationLevel);

$entryElement = $doc->createElement("entry");

$constantElement = $doc->createElement("constant");
$constantElement->textContent = $this->name->__toString();
$typeElement = ($this->phpDocType ?? $this->type)->getTypeForDoc($doc);

$entryElement->appendChild(new DOMText("\n$indentation "));
$entryElement->appendChild($constantElement);
$entryElement->appendChild(new DOMText("\n$indentation ("));
$entryElement->appendChild($typeElement);
$entryElement->appendChild(new DOMText(")\n$indentation"));
public function getPredefinedConstantTerm(DOMDocument $doc, int $indentationLevel): DOMElement {
return $this->getPredefinedConstantElement($doc, $indentationLevel, "term");
}

return $entryElement;
public function getPredefinedConstantEntry(DOMDocument $doc, int $indentationLevel): DOMElement {
return $this->getPredefinedConstantElement($doc, $indentationLevel, "entry");
}

public function discardInfoForOldPhpVersions(?int $phpVersionIdMinimumCompatibility): void {
Expand Down