Fix prefix removal on namespaced symbols

Pull in the changes made my @n-peugnet and also fix prefix removal
on namespaced class links as they were wrong too.

Fixes #44

Author: markstory

.github/workflows/ci.yml

@@ -29,6 +29,6 @@ jobs:
         pip install -r requirements.txt
         pip install .
 
-    - name: Build Test
+    - name: Build test/
       run: |
         cd test && make html SPHINXOPTS='-W'

sphinxcontrib/phpdomain.py

@@ -508,16 +508,15 @@ def process_link(self, env, refnode, has_explicit_title, title, target):
             if title.startswith("::"):
                 title = title[2:]
             target = target.lstrip('~')  # only has a meaning for the title
-            # if the first character is a tilde, don't display the module/class
-            # parts of the contents
-            if title[0:1] == '~':
-                m = re.search(r"(?:.+[:]{2}|(?:.*?\\{2})+)?(.*)\Z", title)
+
+            # If the first char is ~ don't display the leading namespace & class.
+            if title.startswith('~'):
+                m = re.search(r"(?:.+[:]{2}|(?:.*?\\{1,2})+)?(.*)\Z", title)
                 if m:
                     title = m.group(1)
 
-        if not title.startswith("$"):
-            refnode['php:namespace'] = env.temp_data.get('php:namespace')
-            refnode['php:class'] = env.temp_data.get('php:class')
+        refnode['php:namespace'] = env.temp_data.get('php:namespace')
+        refnode['php:class'] = env.temp_data.get('php:class')
 
         return title, target
 

test/test_doc.rst

@@ -166,12 +166,16 @@ Test Case - Global symbols with no namespaces
 
 :php:func:`DateTime::getLastErrors()`
 
-:php:func:`~DateTime::setDate()`
+:php:func:`DateTime::setDate()`
+
+:php:func:`~DateTime::setDate()` Should not be prefixed with a classname
 
 :php:func:`DateTime::ATOM`
 
 :php:func:`DateTime::$testattr`
 
+:php:func:`~DateTime::$testattr` Should not be prefixed with classname
+
 :php:func:`OtherClass::update`
 
 :php:attr:`OtherClass::$nonIndentedAttribute`
@@ -316,17 +320,23 @@ Test Case - not including namespace
 
 :php:class:`LibraryClass`
 
-
-:php:class:`~LibraryName\\LibraryClass`
+:php:class:`~LibraryName\\LibraryClass` Should not be be prefixed with
+classname.
 
 :php:func:`LibraryClass::instanceMethod`
 
+:php:func:`~LibraryClass::instanceMethod` Should not be prefixed with classname.
+
 :php:func:`LibraryClass::staticMethod()`
 
 :php:attr:`LibraryClass::$property`
 
+:php:attr:`~LibraryClass::$property` Should not be prefixed with classname.
+
 :php:const:`LibraryClass::TEST_CONST`
 
+:php:const:`~LibraryClass::TEST_CONST` Should not be prefixed with classname.
+
 :php:class:`LibraryName\\OtherClass`
 
 :php:class:`LibraryName\\ThirdClass`
@@ -378,6 +388,8 @@ Test Case - global access
 
 :php:attr:`LibraryName\\LibraryClass::$property`
 
+:php:attr:`~LibraryName\\LibraryClass::$property` Should not be prefixed with classname.
+
 :php:const:`LibraryName\\LibraryClass::TEST_CONST`
 
 :php:const:`LibraryName\\NS_CONST`