[BUGFIX] Fix displaying duplicate namespace (#46)

TYPO3-Documentation · May 17, 2024 · 5c3484d · 5c3484d
1 parent 6a7f45d
commit 5c3484d
Show file tree

Hide file tree

Showing 34 changed files with 79 additions and 79 deletions.
diff --git a/resources/template/html/body/directive/php/component.html.twig b/resources/template/html/body/directive/php/component.html.twig
@@ -1,4 +1,4 @@
-{%- if node.name.namespaceNode %}{%- set fqn = '\\' ~ node.name.namespaceNode.name ~ '\\' ~ node.name.namespaceNode.name -%}{% endif -%}
+{%- if node.name.namespaceNode %}{%- set fqn = '\\' ~ node.name.namespaceNode.name ~ '\\' ~ node.name.name -%}{% endif -%}
 <dl class="php {{ node.type }}">
     <dt class="sig sig-object php"
         {%- if not node.noindex %} id="{{ node.id }}"{% endif -%}>

diff --git a/tests/integration/class-abstract/expected/index.html b/tests/integration/class-abstract/expected/index.html
@@ -5,14 +5,14 @@ <h1>abstract class</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-abstracttest">
         <span class="sig-name modifier"><span class="pre">abstract</span></span> <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">AbstractTest</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\AbstractTest" title="\TYPO3\CMS\Core\AbstractTest">AbstractTest</span>
 </span> <a class="headerlink" href="#typo3-cms-core-abstracttest" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\AbstractTest</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>

diff --git a/tests/integration/class-duplicate/expected/index.html b/tests/integration/class-duplicate/expected/index.html
@@ -5,14 +5,14 @@ <h1>final class</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-test">
         <span class="sig-name modifier"><span class="pre">final</span></span> <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">Test</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\Test" title="\TYPO3\CMS\Core\Test">Test</span>
 </span> <a class="headerlink" href="#typo3-cms-core-test" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\Test</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>

diff --git a/tests/integration/class-final-abstract/expected/index.html b/tests/integration/class-final-abstract/expected/index.html
@@ -5,14 +5,14 @@ <h1>abstract final class causes warning</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-test">
         <span class="sig-name modifier"><span class="pre">abstract</span></span> <span class="sig-name modifier"><span class="pre">final</span></span> <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">Test</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\Test" title="\TYPO3\CMS\Core\Test">Test</span>
 </span> <a class="headerlink" href="#typo3-cms-core-test" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\Test</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>

diff --git a/tests/integration/class-final/expected/index.html b/tests/integration/class-final/expected/index.html
@@ -5,14 +5,14 @@ <h1>final class</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-test">
         <span class="sig-name modifier"><span class="pre">final</span></span> <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">Test</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\Test" title="\TYPO3\CMS\Core\Test">Test</span>
 </span> <a class="headerlink" href="#typo3-cms-core-test" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\Test</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>

diff --git a/tests/integration/class-namespace-directive/expected/index.html b/tests/integration/class-namespace-directive/expected/index.html
@@ -5,14 +5,14 @@ <h1>PHP Class with current namespace from directive</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-testclass">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">TestClass</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TestClass" title="\TYPO3\CMS\Core\TestClass">TestClass</span>
 </span> <a class="headerlink" href="#typo3-cms-core-testclass" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\TestClass</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>
@@ -23,14 +23,14 @@ <h1>PHP Class with current namespace from directive</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-anotherclass">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">AnotherClass</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\AnotherClass" title="\TYPO3\CMS\Core\AnotherClass">AnotherClass</span>
 </span> <a class="headerlink" href="#typo3-cms-core-anotherclass" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\AnotherClass</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor Another!</p>
@@ -41,14 +41,14 @@ <h1>PHP Class with current namespace from directive</h1>
     <dt class="sig sig-object php" id="myvendor-some-namespace-anotherclass">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\MyVendor\Some\Namespace\MyVendor\Some\Namespace" title="\MyVendor\Some\Namespace\MyVendor\Some\Namespace">AnotherClass</span>
+    <span class="pre fqn" data-fqn="\MyVendor\Some\Namespace\AnotherClass" title="\MyVendor\Some\Namespace\AnotherClass">AnotherClass</span>
 </span> <a class="headerlink" href="#myvendor-some-namespace-anotherclass" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\MyVendor\Some\Namespace\MyVendor\Some\Namespace</span>                    </dd>
+                        <span class="pre">\MyVendor\Some\Namespace\AnotherClass</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor Yet Another!</p>

diff --git a/tests/integration/class-twice-noindex/expected/index.html b/tests/integration/class-twice-noindex/expected/index.html
@@ -5,14 +5,14 @@ <h1>class listed twice throws warning</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-test">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">Test</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\Test" title="\TYPO3\CMS\Core\Test">Test</span>
 </span> <a class="headerlink" href="#typo3-cms-core-test" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\Test</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>

diff --git a/tests/integration/class-twice-noindex/expected/page2.html b/tests/integration/class-twice-noindex/expected/page2.html
@@ -5,13 +5,13 @@ <h1>class listed twice throws warning</h1>
     <dt class="sig sig-object php">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">Test</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\Test" title="\TYPO3\CMS\Core\Test">Test</span>
 </span>    </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\Test</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>

diff --git a/tests/integration/class-twice-warning/expected/index.html b/tests/integration/class-twice-warning/expected/index.html
@@ -5,14 +5,14 @@ <h1>class listed twice throws warning</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-test">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">Test</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\Test" title="\TYPO3\CMS\Core\Test">Test</span>
 </span> <a class="headerlink" href="#typo3-cms-core-test" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\Test</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>

diff --git a/tests/integration/class-twice-warning/expected/page2.html b/tests/integration/class-twice-warning/expected/page2.html
@@ -5,14 +5,14 @@ <h1>class listed twice throws warning</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-test">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">Test</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\Test" title="\TYPO3\CMS\Core\Test">Test</span>
 </span> <a class="headerlink" href="#typo3-cms-core-test" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\Test</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>

diff --git a/tests/integration/class-with-const-illegal-modifier-combinations/expected/index.html b/tests/integration/class-with-const-illegal-modifier-combinations/expected/index.html
@@ -5,14 +5,14 @@ <h1>PHP class with constants</h1>
     <dt class="sig sig-object php" id="chucklefactory-funclass">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\ChuckleFactory\ChuckleFactory" title="\ChuckleFactory\ChuckleFactory">FunClass</span>
+    <span class="pre fqn" data-fqn="\ChuckleFactory\FunClass" title="\ChuckleFactory\FunClass">FunClass</span>
 </span> <a class="headerlink" href="#chucklefactory-funclass" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\ChuckleFactory\ChuckleFactory</span>                    </dd>
+                        <span class="pre">\ChuckleFactory\FunClass</span>                    </dd>
                 </dl>
 
     <p>Where Fun Knows No Bounds!</p>

diff --git a/tests/integration/class-with-const-link-warning/expected/index.html b/tests/integration/class-with-const-link-warning/expected/index.html
@@ -5,14 +5,14 @@ <h1>PHP class with constants</h1>
     <dt class="sig sig-object php" id="secretsociety-enigmaticclass">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\SecretSociety\SecretSociety" title="\SecretSociety\SecretSociety">EnigmaticClass</span>
+    <span class="pre fqn" data-fqn="\SecretSociety\EnigmaticClass" title="\SecretSociety\EnigmaticClass">EnigmaticClass</span>
 </span> <a class="headerlink" href="#secretsociety-enigmaticclass" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\SecretSociety\SecretSociety</span>                    </dd>
+                        <span class="pre">\SecretSociety\EnigmaticClass</span>                    </dd>
                 </dl>
 
     <p>Unveiling the mysteries of constants!</p>

diff --git a/tests/integration/class-with-const-link/expected/index.html b/tests/integration/class-with-const-link/expected/index.html
@@ -5,14 +5,14 @@ <h1>PHP class with constants</h1>
     <dt class="sig sig-object php" id="secretsociety-enigmaticclass">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\SecretSociety\SecretSociety" title="\SecretSociety\SecretSociety">EnigmaticClass</span>
+    <span class="pre fqn" data-fqn="\SecretSociety\EnigmaticClass" title="\SecretSociety\EnigmaticClass">EnigmaticClass</span>
 </span> <a class="headerlink" href="#secretsociety-enigmaticclass" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\SecretSociety\SecretSociety</span>                    </dd>
+                        <span class="pre">\SecretSociety\EnigmaticClass</span>                    </dd>
                 </dl>
 
     <p>Unveiling the mysteries of constants!</p>

diff --git a/tests/integration/class-with-const/expected/index.html b/tests/integration/class-with-const/expected/index.html
@@ -5,14 +5,14 @@ <h1>PHP class with constants</h1>
     <dt class="sig sig-object php" id="secretsociety-enigmaticclass">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\SecretSociety\SecretSociety" title="\SecretSociety\SecretSociety">EnigmaticClass</span>
+    <span class="pre fqn" data-fqn="\SecretSociety\EnigmaticClass" title="\SecretSociety\EnigmaticClass">EnigmaticClass</span>
 </span> <a class="headerlink" href="#secretsociety-enigmaticclass" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\SecretSociety\SecretSociety</span>                    </dd>
+                        <span class="pre">\SecretSociety\EnigmaticClass</span>                    </dd>
                 </dl>
 
     <p>Unveiling the mysteries of constants!</p>

diff --git a/tests/integration/class-with-link/expected/index.html b/tests/integration/class-with-link/expected/index.html
@@ -5,14 +5,14 @@ <h1>PHP Class with explicit namespace</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-test">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">Test</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\Test" title="\TYPO3\CMS\Core\Test">Test</span>
 </span> <a class="headerlink" href="#typo3-cms-core-test" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\Test</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>

diff --git a/tests/integration/class-with-method-link-warning/expected/index.html b/tests/integration/class-with-method-link-warning/expected/index.html
@@ -5,14 +5,14 @@ <h1>PHP Class with explicit namespace</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-test">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">Test</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\Test" title="\TYPO3\CMS\Core\Test">Test</span>
 </span> <a class="headerlink" href="#typo3-cms-core-test" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\Test</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>

diff --git a/tests/integration/class-with-method-link/expected/index.html b/tests/integration/class-with-method-link/expected/index.html
@@ -5,14 +5,14 @@ <h1>PHP Class with explicit namespace</h1>
     <dt class="sig sig-object php" id="typo3-cms-core-test">
         <em class="property"><span class="pre">class</span> </em>
         <span class="sig-name descname">
-    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\TYPO3\CMS\Core" title="\TYPO3\CMS\Core\TYPO3\CMS\Core">Test</span>
+    <span class="pre fqn" data-fqn="\TYPO3\CMS\Core\Test" title="\TYPO3\CMS\Core\Test">Test</span>
 </span> <a class="headerlink" href="#typo3-cms-core-test" title="Permalink to this definition">¶</a>
     </dt>
     <dd>
                     <dl class="field-list simple">
                                     <dt class="field-even">Fully qualified name</dt>
                     <dd class="field-even">
-                        <span class="pre">\TYPO3\CMS\Core\TYPO3\CMS\Core</span>                    </dd>
+                        <span class="pre">\TYPO3\CMS\Core\Test</span>                    </dd>
                 </dl>
 
     <p>Lorem Ipsum Dolor!</p>