@@ -1495,27 +1495,28 @@ public function getMethodSynopsisDocument(array $funcMap, array $aliasMap): ?str
1495
1495
$ refentry = $ doc ->createElement ('refentry ' );
1496
1496
$ doc ->appendChild ($ refentry );
1497
1497
1498
+ $ id = $ doc ->createAttribute ("xml:id " );
1498
1499
if ($ this ->isMethod ()) {
1499
1500
assert ($ this ->name instanceof MethodName);
1500
- $ id = $ doc ->createAttribute ("xml:id " );
1501
- $ id ->value = addslashes (strtolower ($ this ->name ->className ->__toString ())) . '. ' . strtolower ($ this ->name ->methodName );
1502
- $ refentry ->appendChild ($ id );
1501
+ /* Namespaces are seperated by '-', '_' must be converted to '-' too.
1502
+ * Trim away the __ for magic methods */
1503
+ $ id ->value = strtolower (
1504
+ str_replace ('\\' , '- ' , $ this ->name ->className ->__toString ())
1505
+ . '. '
1506
+ . str_replace ('_ ' , '- ' , ltrim ($ this ->name ->methodName , '_ ' ))
1507
+ );
1503
1508
} else {
1504
- // TODO Functions
1509
+ $ id -> value = ' function. ' . strtolower ( str_replace ( ' _ ' , ' - ' , $ this -> name -> __toString ()));
1505
1510
}
1511
+ $ refentry ->appendChild ($ id );
1506
1512
$ refentry ->setAttribute ("xmlns " , "http://docbook.org/ns/docbook " );
1507
1513
$ refentry ->appendChild (new DOMText ("\n " ));
1508
1514
1509
1515
/* Creation of <refnamediv> */
1510
1516
$ refnamediv = $ doc ->createElement ('refnamediv ' );
1511
1517
$ refnamediv ->appendChild (new DOMText ("\n " ));
1512
- if ($ this ->isMethod ()) {
1513
- assert ($ this ->name instanceof MethodName);
1514
- $ refname = $ doc ->createElement ('refname ' , $ this ->name ->__toString ());
1515
- $ refnamediv ->appendChild ($ refname );
1516
- } else {
1517
- // TODO Functions
1518
- }
1518
+ $ refname = $ doc ->createElement ('refname ' , $ this ->name ->__toString ());
1519
+ $ refnamediv ->appendChild ($ refname );
1519
1520
$ refnamediv ->appendChild (new DOMText ("\n " ));
1520
1521
$ refpurpose = $ doc ->createElement ('refpurpose ' , 'Description ' );
1521
1522
$ refnamediv ->appendChild ($ refpurpose );
@@ -1555,9 +1556,11 @@ public function getMethodSynopsisDocument(array $funcMap, array $aliasMap): ?str
1555
1556
$ refentry ->appendChild (new DOMText ("\n\n " ));
1556
1557
1557
1558
/* Creation of <refsect1 role="returnvalues"> */
1558
- $ returnRefSec = $ this ->getReturnValueSection ($ doc );
1559
- $ refentry ->appendChild ($ returnRefSec );
1560
- $ refentry ->appendChild (new DOMText ("\n\n " ));
1559
+ if (!$ this ->name ->isConstructor () && !$ this ->name ->isDestructor ()) {
1560
+ $ returnRefSec = $ this ->getReturnValueSection ($ doc );
1561
+ $ refentry ->appendChild ($ returnRefSec );
1562
+ $ refentry ->appendChild (new DOMText ("\n\n " ));
1563
+ }
1561
1564
1562
1565
/* Creation of <refsect1 role="errors"> */
1563
1566
$ errorsRefSec = $ doc ->createElement ('refsect1 ' );
0 commit comments