diff --git a/CHANGELOG.md b/CHANGELOG.md index f1140af9..34c908bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/src/Collector/ProfileClient.php b/src/Collector/ProfileClient.php index 9ab24cfb..191b2b44 100644 --- a/src/Collector/ProfileClient.php +++ b/src/Collector/ProfileClient.php @@ -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)); } diff --git a/src/Collector/ProfilePlugin.php b/src/Collector/ProfilePlugin.php index 777e00e3..da29ffa0 100644 --- a/src/Collector/ProfilePlugin.php +++ b/src/Collector/ProfilePlugin.php @@ -117,6 +117,7 @@ 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()); } @@ -124,10 +125,13 @@ private function collectRequestInformation(RequestInterface $request, Stack $sta $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)); diff --git a/src/Collector/Stack.php b/src/Collector/Stack.php index 9ce09682..4fec0cd0 100644 --- a/src/Collector/Stack.php +++ b/src/Collector/Stack.php @@ -63,6 +63,11 @@ final class Stack */ private $requestScheme; + /** + * @var int|null + */ + private $requestPort; + /** * @var string */ @@ -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 */ diff --git a/src/Resources/views/stack.html.twig b/src/Resources/views/stack.html.twig index 5251ba7d..8ae86b58 100644 --- a/src/Resources/views/stack.html.twig +++ b/src/Resources/views/stack.html.twig @@ -11,6 +11,9 @@