Merge remote-tracking branch 'origin/1.x' into 1-to-2

dbu · dbu · commit 9ddc2b41c987 · 2024-09-04T08:19:28.000+02:00
diff --git a/src/Resources/views/stack.html.twig b/src/Resources/views/stack.html.twig
@@ -7,16 +7,14 @@
         {% endif %}
         <span class="label httplug-method httplug-method-{{ stack.requestMethod|lower }}">{{ stack.requestMethod }}</span>
     </div>
-    {% apply spaceless %}
-        <div class="label httplug-stack-header-target">
-            <span class="httplug-scheme">{{ stack.requestScheme }}://</span>
-            <span class="httplug-host">{{ stack.requestHost }}</span>
-            {% if stack.requestPort not in [null, 80, 443] %}
-                <span class="httplug-port">:{{ stack.requestPort }}</span>
-            {% endif %}
-            <span class="httplug-target">{{ (stack.requestTarget|default('/') starts with '/' ? '' : '/')  ~ stack.requestTarget }}</span>
-        </div>
-    {% endapply %}
+    <div class="label httplug-stack-header-target">
+        <span class="httplug-scheme">{{ stack.requestScheme }}://</span>
+        <span class="httplug-host">{{ stack.requestHost }}</span>
+        {% if stack.requestPort not in [null, 80, 443] %}
+            <span class="httplug-port">:{{ stack.requestPort }}</span>
+        {% endif %}
+        <span class="httplug-target">{{ (stack.requestTarget|default('/') starts with '/' ? '' : '/')  ~ stack.requestTarget }}</span>
+    </div>
     <div>
         <span class="label httplug-duration">{{ stack.duration|number_format }} ms</span>
         {% if stack.responseCode >= 400 and stack.responseCode <= 599 %}
diff --git a/tests/Functional/ProfilerTest.php b/tests/Functional/ProfilerTest.php
@@ -28,7 +28,7 @@ public function testShowProfiler(): void
         $client->request('GET', '/_profiler/latest?panel=httplug');
         $content = $client->getResponse()->getContent();
         $this->assertStringContainsString(<<<HTML
-            <div class="label httplug-stack-header-target"><span class="httplug-scheme">https://</span><span class="httplug-host">jsonplaceholder.typicode.com</span><span class="httplug-target">/posts/1</span></div>
+        <span class="httplug-host">jsonplaceholder.typicode.com</span>
         HTML, $content);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function testShowProfiler(): void`
`28`	`28`	`$client->request('GET', '/_profiler/latest?panel=httplug');`
`29`	`29`	`$content = $client->getResponse()->getContent();`
`30`	`30`	`$this->assertStringContainsString(<<<HTML`
`31`		`- <div class="label httplug-stack-header-target"><span class="httplug-scheme">https://</span><span class="httplug-host">jsonplaceholder.typicode.com</span><span class="httplug-target">/posts/1</span></div>`
	`31`	`+ <span class="httplug-host">jsonplaceholder.typicode.com</span>`
`32`	`32`	`HTML, $content);`
`33`	`33`	`}`
`34`	`34`	`}`