Skip to content

Commit 7202d11

Browse files
authored
Fix parameter list generation in build/gen_stub.php (php#16764)
[ci skip] <variablelist> is not valid within <simpara>, this should not be wrapped at all in a paragraph. Regressed in 32789c0.
1 parent a087442 commit 7202d11

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

build/gen_stub.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,12 +1813,11 @@ private function getParameterSection(DOMDocument $doc): DOMElement {
18131813
$parametersRefSec->appendChild($noParamEntity);
18141814
return $parametersRefSec;
18151815
} else {
1816-
$parametersPara = $doc->createElement('simpara');
1817-
$parametersRefSec->appendChild($parametersPara);
1816+
$parametersContainer = $doc->createDocumentFragment();
18181817

1819-
$parametersPara->appendChild(new DOMText("\n "));
1818+
$parametersContainer->appendChild(new DOMText("\n "));
18201819
$parametersList = $doc->createElement('variablelist');
1821-
$parametersPara->appendChild($parametersList);
1820+
$parametersContainer->appendChild($parametersList);
18221821

18231822
/*
18241823
<varlistentry>
@@ -1837,33 +1836,34 @@ private function getParameterSection(DOMDocument $doc): DOMElement {
18371836

18381837
$listItemPara = $doc->createElement('simpara');
18391838
$listItemPara->append(
1840-
"\n ",
1841-
"Description.",
18421839
"\n ",
1840+
"Description.",
1841+
"\n ",
18431842
);
18441843

18451844
$parameterEntryListItem = $doc->createElement('listitem');
18461845
$parameterEntryListItem->append(
1847-
"\n ",
1848-
$listItemPara,
18491846
"\n ",
1847+
$listItemPara,
1848+
"\n ",
18501849
);
18511850

18521851
$parameterEntry = $doc->createElement('varlistentry');
18531852
$parameterEntry->append(
1854-
"\n ",
1853+
"\n ",
18551854
$parameterTerm,
1856-
"\n ",
1857-
$parameterEntryListItem,
18581855
"\n ",
1856+
$parameterEntryListItem,
1857+
"\n ",
18591858
);
18601859

1861-
$parametersList->appendChild(new DOMText("\n "));
1860+
$parametersList->appendChild(new DOMText("\n "));
18621861
$parametersList->appendChild($parameterEntry);
18631862
}
1864-
$parametersList->appendChild(new DOMText("\n "));
1863+
$parametersList->appendChild(new DOMText("\n "));
18651864
}
1866-
$parametersPara->appendChild(new DOMText("\n "));
1865+
$parametersContainer->appendChild(new DOMText("\n "));
1866+
$parametersRefSec->appendChild($parametersContainer);
18671867
$parametersRefSec->appendChild(new DOMText("\n "));
18681868
return $parametersRefSec;
18691869
}

0 commit comments

Comments
 (0)