Add links to namespaced non-class constants (#111)

Add links to namespaced non-class constants. Add namespaced non-class constants to tests. Co-authored-by: haszi <[email protected]>
php · Mar 17, 2024 · 172da75 · 172da75
1 parent 89216bc
commit 172da75
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/phpdotnet/phd/Package/Generic/XHTML.php b/phpdotnet/phd/Package/Generic/XHTML.php
@@ -1611,19 +1611,17 @@ public function format_constant($open, $name, $attrs)
         return "</code></strong>";
     }
     public function format_constant_text($value, $tag) {
+        $tempLinkValue = str_replace(
+            array("\\", "_"),
+            array("-", "-"),
+            strtolower(trim($value, "_"))
+        );
         if (str_contains($value, '::')) {
             // class constant
-            list($extensionAndClass, $constant) = explode(
-                "::",
-                str_replace(
-                    array("\\", "_"),
-                    array("-", "-"),
-                    strtolower($value)
-                )
-            );
+            list($extensionAndClass, $constant) = explode("::", $tempLinkValue);
             $normalizedLinkFormat = $extensionAndClass . ".constants." . trim($constant, "-");
         } else {
-            $normalizedLinkFormat = 'constant.' . str_replace('_', '-', strtolower(trim($value, "_")));
+            $normalizedLinkFormat = 'constant.' . $tempLinkValue;
         }
         $link = $this->createLink($normalizedLinkFormat);
 

diff --git a/tests/package/php/constant_links_001.phpt b/tests/package/php/constant_links_001.phpt
@@ -12,7 +12,7 @@ Config::init(["xml_file" => $xml_file]);
 
 $indices = [
     [
-        "docbook_id" => "constant.definitely-exists",
+        "docbook_id" => "constant.extension-namespace-definitely-exists",
         "filename"   => "extensionname.constantspage",
     ],
     [
@@ -58,7 +58,7 @@ Content:
 
  <div class="section">
   <p class="para">%d. Existing constants</p>
-  <strong><code><a href="extensionname.constantspage.html#constant.definitely-exists">DEFINITELY_EXISTS</a></code></strong>
+  <strong><code><a href="extensionname.constantspage.html#constant.extension-namespace-definitely-exists">Extension\Namespace\DEFINITELY_EXISTS</a></code></strong>
   <p class="para">
    <strong><code><a href="extensionname2.constantspage2.html#vendor-namespace.constants.definitely-exists2">Vendor\Namespace::DEFINITELY_EXISTS2</a></code></strong>
   </p>

diff --git a/tests/package/php/data/constant_links.xml b/tests/package/php/data/constant_links.xml
@@ -3,7 +3,7 @@
 
  <section>
   <para>1. Existing constants</para>
-  <constant>DEFINITELY_EXISTS</constant>
+  <constant>Extension\Namespace\DEFINITELY_EXISTS</constant>
   <para>
    <constant>Vendor\Namespace::DEFINITELY_EXISTS2</constant>
   </para>