Skip to content

Commit 55e7709

Browse files
committed
Fix most of test failures
There were some truncated prefixes that needed to be applied.
1 parent 4f343e8 commit 55e7709

File tree

3 files changed

+43
-8
lines changed

3 files changed

+43
-8
lines changed

sphinxcontrib/phpdomain.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,14 +241,7 @@ def handle_signature(self, sig, signode):
241241
fullname = name
242242
else:
243243
add_module = True
244-
# name_prefix and a non-static method, means the classname was
245-
# repeated. Trim off the <class>::
246-
if name_prefix and self.objtype != 'staticmethod':
247-
if name_prefix.startswith(classname):
248-
name_prefix = name_prefix[len(classname):].rstrip('::')
249-
classname = classname.rstrip('::')
250-
fullname = name_prefix + classname + separator + name
251-
elif name_prefix:
244+
if name_prefix:
252245
classname = classname.rstrip('::')
253246
fullname = name_prefix + name
254247

test/unit/index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ <h1>Welcome to sphinxcontrib-phpdomain-acceptancetest&#x2019;s documentation!<a
107107
<li class="toctree-l2">
108108
<a class="reference internal" href="test_doc2.html#re-used-namespace">Re-used namespace</a>
109109
</li>
110+
<li class="toctree-l2">
111+
<a class="reference internal" href="test_doc2.html#test-link-generation">Test link generation</a>
112+
</li>
110113
</ul>
111114
</li>
112115
<li class="toctree-l1">

test/unit/test_doc2.html

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,45 @@ <h2>Re-used namespace<a class="headerlink" href="#re-used-namespace" title="Link
9494
<p>Another class in a reused namespace</p>
9595
</dd>
9696
</dl>
97+
<dl class="php class">
98+
<dt class="sig sig-object php" id="LibraryName\Foo\Data\Thing">
99+
<em class="property">
100+
<span class="pre">class</span>
101+
</em>
102+
<span class="sig-name descname">
103+
<span class="pre">Foo\Data\Thing</span>
104+
</span>
105+
<a class="headerlink" href="#LibraryName\Foo\Data\Thing" title="Link to this definition">&#xB6;</a>
106+
</dt>
107+
<dd>
108+
<p>A class is with an absolute namespace.</p>
109+
</dd>
110+
</dl>
111+
</section>
112+
<section id="test-link-generation">
113+
<h2>Test link generation<a class="headerlink" href="#test-link-generation" title="Link to this heading">&#xB6;</a></h2>
114+
<p>
115+
<a class="reference internal" href="#Imagine\Draw\DrawerInterface" title="Imagine\Draw\DrawerInterface">
116+
<code class="xref php php-class docutils literal notranslate">
117+
<span class="pre">Imagine\Draw\DrawerInterface</span>
118+
</code>
119+
</a>
120+
<a class="reference internal" href="#LibraryName\OtherClass" title="LibraryName\OtherClass">
121+
<code class="xref php php-class docutils literal notranslate">
122+
<span class="pre">LibraryName\OtherClass</span>
123+
</code>
124+
</a>
125+
<a class="reference internal" href="#LibraryName\ThirdClass" title="LibraryName\ThirdClass">
126+
<code class="xref php php-class docutils literal notranslate">
127+
<span class="pre">LibraryName\ThirdClass</span>
128+
</code>
129+
</a>
130+
<a class="reference internal" href="#LibraryName\Foo\Data\Thing" title="LibraryName\Foo\Data\Thing">
131+
<code class="xref php php-class docutils literal notranslate">
132+
<span class="pre">Foo\Data\Thing</span>
133+
</code>
134+
</a>
135+
</p>
97136
</section>
98137
</section>
99138
<div class="clearer"/>

0 commit comments

Comments
 (0)