Skip to content

Changed tab texts inside profiler so that it shows ports in URL in case it's non-standard #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.

# 1.23.2 - unreleased
# 1.24.0 - unreleased
- Changed stopwatch category from default to "httplug", so it's more prominent on Execution timeline view
- Changed tab texts inside profiler so that it shows ports in URL in case it's non-standard

# 1.23.1 - 2021-10-13
- Fix issue with whitespaces in URL when URL in tab was copied
- Fixed issue with whitespaces in URL when URL in tab was copied
- Fixed dark mode compatiblity, making some previously invisible elements visible

# 1.23.0 - 2021-08-30
Expand Down
6 changes: 4 additions & 2 deletions src/Collector/ProfileClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,12 @@ protected function doSendRequest(RequestInterface $request)

private function collectRequestInformations(RequestInterface $request, Stack $stack)
{
$uri = $request->getUri();
$stack->setRequestTarget($request->getRequestTarget());
$stack->setRequestMethod($request->getMethod());
$stack->setRequestScheme($request->getUri()->getScheme());
$stack->setRequestHost($request->getUri()->getHost());
$stack->setRequestScheme($uri->getScheme());
$stack->setRequestPort($uri->getPort());
$stack->setRequestHost($uri->getHost());
$stack->setClientRequest($this->formatter->formatRequest($request));
$stack->setCurlCommand($this->formatter->formatAsCurlCommand($request));
}
Expand Down
8 changes: 6 additions & 2 deletions src/Collector/ProfilePlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,21 @@ private function onOutgoingResponse(ResponseInterface $response, Profile $profil
*/
private function collectRequestInformation(RequestInterface $request, Stack $stack = null)
{
$uri = $request->getUri();
if (empty($stack->getRequestTarget())) {
$stack->setRequestTarget($request->getRequestTarget());
}
if (empty($stack->getRequestMethod())) {
$stack->setRequestMethod($request->getMethod());
}
if (empty($stack->getRequestScheme())) {
$stack->setRequestScheme($request->getUri()->getScheme());
$stack->setRequestScheme($uri->getScheme());
}
if (empty($stack->getRequestPort())) {
$stack->setRequestPort($uri->getPort());
}
if (empty($stack->getRequestHost())) {
$stack->setRequestHost($request->getUri()->getHost());
$stack->setRequestHost($uri->getHost());
}
if (empty($stack->getClientRequest())) {
$stack->setClientRequest($this->formatter->formatRequest($request));
Expand Down
15 changes: 15 additions & 0 deletions src/Collector/Stack.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ final class Stack
*/
private $requestScheme;

/**
* @var int|null
*/
private $requestPort;

/**
* @var string
*/
Expand Down Expand Up @@ -308,6 +313,16 @@ public function setRequestScheme($requestScheme)
$this->requestScheme = $requestScheme;
}

public function getRequestPort(): ?int
{
return $this->requestPort;
}

public function setRequestPort(?int $port)
{
$this->requestPort = $port;
}

/**
* @return int
*/
Expand Down
3 changes: 3 additions & 0 deletions src/Resources/views/stack.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<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 }}</span>
</div>
{% endspaceless %}
Expand Down
4 changes: 2 additions & 2 deletions src/Resources/views/style/httplug.css.twig
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@
color: green;
}

.httplug-target, .httplug-scheme {
.httplug-target, .httplug-scheme, .httplug-port {
font-weight: normal;
}

.httplug-target, .httplug-host, .httplug-scheme {
.httplug-target, .httplug-host, .httplug-scheme, .httplug-port {
font-size: 12px;
}

Expand Down