Merge branch 'main' into task/split-anchor-link-resolver

phpDocumentor · Nov 25, 2023 · f28ba0e · f28ba0e
2 parents 3e9bc22 + d5065f3
commit f28ba0e
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 46 deletions.
diff --git a/packages/guides/resources/template/html/inline/doc.html.twig b/packages/guides/resources/template/html/inline/doc.html.twig
@@ -1 +1 @@
-{{ include('inline/link.html.twig') }}
+{% apply spaceless %}{{ include('inline/link.html.twig') }}{% endapply %}
diff --git a/packages/guides/resources/template/html/inline/ref.html.twig b/packages/guides/resources/template/html/inline/ref.html.twig
@@ -1 +1 @@
-{{ include('inline/link.html.twig') }}
+{% apply spaceless %}{{ include('inline/link.html.twig') }}{% endapply %}
diff --git a/tests/Integration/tests/confval/expected/index.html b/tests/Integration/tests/confval/expected/index.html
@@ -17,8 +17,7 @@ <h1>Confval directive</h1>
         </div>
     </dd>
 </dl>
-            <p>See option <a href="/index.html#demo">demo</a>
-.</p>
+            <p>See option <a href="/index.html#demo">demo</a>.</p>
     </div>
 
 <!-- content end -->
diff --git a/tests/Integration/tests/navigation/reference-with-angle-bracket/expected/index.html b/tests/Integration/tests/navigation/reference-with-angle-bracket/expected/index.html
@@ -3,8 +3,7 @@
     <h1>Overview</h1>
 
             <p>The uid must be given as a positive integer.
-For new records, use the <a href="/page.html#typo3-backend-link-newrecord">&lt;be:link.newRecordViewHelper&gt;</a>
-.</p>
+For new records, use the <a href="/page.html#typo3-backend-link-newrecord">&lt;be:link.newRecordViewHelper&gt;</a>.</p>
             <div class="toc">
     <ul class="menu-level">
     <li class="toc-item"><a href="/page.html#link-newrecord">link.newRecord</a></li>

diff --git a/tests/Integration/tests/navigation/references/expected/index.html b/tests/Integration/tests/navigation/references/expected/index.html
@@ -14,7 +14,6 @@ <h1>Overview</h1>
             <p>This is a link to the RST Overview: <a href="/index.html#RST Overview">alternative</a></p>
             <p>This is a link to the Other Overview: <a href="/index.html#Other Overview">Overview</a></p>
             <p>This is a link to <a href="/page.html">Page 1</a>
-
 This is a link to with alternative text <a href="/page.html">alternative</a></p>
     </div>
 

diff --git a/tests/Integration/tests/option/expected/index.html b/tests/Integration/tests/option/expected/index.html
@@ -18,9 +18,7 @@ <h1>Some Title</h1>
     </dd>
 </dl>
 
-            <p>See option <a href="/index.html#dest-dir">dest_dir</a>
- and <a href="/index.html#m">-m &lt;module&gt;, --module &lt;module&gt;</a>
-.</p>
+            <p>See option <a href="/index.html#dest-dir">dest_dir</a> and <a href="/index.html#m">-m &lt;module&gt;, --module &lt;module&gt;</a>.</p>
     </div>
 
 <!-- content end -->
diff --git a/tests/Integration/tests/references/reference-level-3-relative/expected/index.html b/tests/Integration/tests/references/reference-level-3-relative/expected/index.html
@@ -6,14 +6,11 @@ <h1>Document Title</h1>
 
 
 <ul>
-    <li><a href="page1.html#page_1">Page 1, same level</a>
-</li>
+    <li><a href="page1.html#page_1">Page 1, same level</a></li>
 
-    <li><a href="level-1-1/level-2-1/subpage1.html#level-2-1-subpage1">Subpage 1, Level 2-1</a>
-</li>
+    <li><a href="level-1-1/level-2-1/subpage1.html#level-2-1-subpage1">Subpage 1, Level 2-1</a></li>
 
-    <li><a href="level-1-2/subpage2.html#level-1-2-subpage2">Subpage 2, Level 1-2</a>
-</li>
+    <li><a href="level-1-2/subpage2.html#level-1-2-subpage2">Subpage 2, Level 1-2</a></li>
 
 </ul>
 

diff --git a/...on/tests/references/reference-level-3-relative/expected/level-1-1/level-2-1/subpage1.html b/...on/tests/references/reference-level-3-relative/expected/level-1-1/level-2-1/subpage1.html
@@ -7,14 +7,11 @@ <h1>Subpage 1, Level 2-1</h1>
 
 
 <ul>
-    <li><a href="../../page1.html#page_1">Page 1, two level up</a>
-</li>
+    <li><a href="../../page1.html#page_1">Page 1, two level up</a></li>
 
-    <li><a href="#level-2-1-subpage1">Subpage 1, Same level</a>
-</li>
+    <li><a href="#level-2-1-subpage1">Subpage 1, Same level</a></li>
 
-    <li><a href="../../level-1-2/subpage2.html#level-1-2-subpage2">Subpage 2, two level up, Level 1-2</a>
-</li>
+    <li><a href="../../level-1-2/subpage2.html#level-1-2-subpage2">Subpage 2, two level up, Level 1-2</a></li>
 
 </ul>
 

diff --git a/.../Integration/tests/references/reference-level-3-relative/expected/level-1-2/subpage2.html b/.../Integration/tests/references/reference-level-3-relative/expected/level-1-2/subpage2.html
@@ -7,14 +7,11 @@ <h1>Subpage 2, Level 1-2</h1>
 
 
 <ul>
-    <li><a href="../page1.html#page_1">Page 1, one level up</a>
-</li>
+    <li><a href="../page1.html#page_1">Page 1, one level up</a></li>
 
-    <li><a href="../level-1-1/level-2-1/subpage1.html#level-2-1-subpage1">Subpage 1, One level up, two down</a>
-</li>
+    <li><a href="../level-1-1/level-2-1/subpage1.html#level-2-1-subpage1">Subpage 1, One level up, two down</a></li>
 
-    <li><a href="#level-1-2-subpage2">Subpage 2, Same Page</a>
-</li>
+    <li><a href="#level-1-2-subpage2">Subpage 2, Same Page</a></li>
 
 </ul>
 

diff --git a/tests/Integration/tests/references/reference-level-3/expected/index.html b/tests/Integration/tests/references/reference-level-3/expected/index.html
@@ -6,14 +6,11 @@ <h1>Document Title</h1>
 
 
 <ul>
-    <li><a href="/page1.html#page_1">Page 1, same level</a>
-</li>
+    <li><a href="/page1.html#page_1">Page 1, same level</a></li>
 
-    <li><a href="/level-1-1/level-2-1/subpage1.html#level-2-1-subpage1">Subpage 1, Level 2-1</a>
-</li>
+    <li><a href="/level-1-1/level-2-1/subpage1.html#level-2-1-subpage1">Subpage 1, Level 2-1</a></li>
 
-    <li><a href="/level-1-2/subpage2.html#level-1-2-subpage2">Subpage 2, Level 1-2</a>
-</li>
+    <li><a href="/level-1-2/subpage2.html#level-1-2-subpage2">Subpage 2, Level 1-2</a></li>
 
 </ul>
 

diff --git a/...Integration/tests/references/reference-level-3/expected/level-1-1/level-2-1/subpage1.html b/...Integration/tests/references/reference-level-3/expected/level-1-1/level-2-1/subpage1.html
@@ -7,14 +7,11 @@ <h1>Subpage 1, Level 2-1</h1>
 
 
 <ul>
-    <li><a href="/page1.html#page_1">Page 1, two level up</a>
-</li>
+    <li><a href="/page1.html#page_1">Page 1, two level up</a></li>
 
-    <li><a href="/level-1-1/level-2-1/subpage1.html#level-2-1-subpage1">Subpage 1, Same level</a>
-</li>
+    <li><a href="/level-1-1/level-2-1/subpage1.html#level-2-1-subpage1">Subpage 1, Same level</a></li>
 
-    <li><a href="/level-1-2/subpage2.html#level-1-2-subpage2">Subpage 2, two level up, Level 1-2</a>
-</li>
+    <li><a href="/level-1-2/subpage2.html#level-1-2-subpage2">Subpage 2, two level up, Level 1-2</a></li>
 
 </ul>
 

diff --git a/tests/Integration/tests/references/reference-level-3/expected/level-1-2/subpage2.html b/tests/Integration/tests/references/reference-level-3/expected/level-1-2/subpage2.html
@@ -7,14 +7,11 @@ <h1>Subpage 2, Level 1-2</h1>
 
 
 <ul>
-    <li><a href="/page1.html#page_1">Page 1, one level up</a>
-</li>
+    <li><a href="/page1.html#page_1">Page 1, one level up</a></li>
 
-    <li><a href="/level-1-1/level-2-1/subpage1.html#level-2-1-subpage1">Subpage 1, One level up, two down</a>
-</li>
+    <li><a href="/level-1-1/level-2-1/subpage1.html#level-2-1-subpage1">Subpage 1, One level up, two down</a></li>
 
-    <li><a href="/level-1-2/subpage2.html#level-1-2-subpage2">Subpage 2, Same Page</a>
-</li>
+    <li><a href="/level-1-2/subpage2.html#level-1-2-subpage2">Subpage 2, Same Page</a></li>
 
 </ul>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{{ include('inline/link.html.twig') }}
		{% apply spaceless %}{{ include('inline/link.html.twig') }}{% endapply %}