Skip to content

AJAX request should not render the initialization code. #40

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.

Sign up for GitHub

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

Open
mostafasy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

AJAX request should not render the initialization code. #40

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5affbfe
AJAX request should not render the initialization code.
mostafasy Aug 7, 2023
b1614a5
Update composer.json downgrad maximebf/debugbar
mostafasy Sep 11, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
AJAX request should not render the initialization code. 
handler Ajax Request.
  • Loading branch information
@mostafasy
mostafasy authored Aug 7, 2023
commit 5affbfea88e81ab961191083438b103b6cbe08e0
16 changes: 9 additions & 7 deletions src/PhpDebugBarMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,17 @@ public function process(ServerRequest $request, RequestHandler $handler): Respon

$response = $handler->handle($request);

if ($this->shouldReturnResponse($request, $response)) {
$isAjax = strtolower($request->getHeaderLine('X-Requested-With')) === 'xmlhttprequest';

if ($this->shouldReturnResponse($request, $response) && ! $isAjax) {
return $response;
}

if ($this->isHtmlResponse($response)) {
return $this->attachDebugBarToHtmlResponse($response);
return $this->attachDebugBarToHtmlResponse($response,$isAjax);
}

return $this->prepareHtmlResponseWithDebugBar($response);
return $this->prepareHtmlResponseWithDebugBar($response,$isAjax);
}

public function __invoke(ServerRequest $request, Response $response, callable $next): Response
Expand Down Expand Up @@ -106,10 +108,10 @@ private function shouldReturnResponse(ServerRequest $request, Response $response
return $isForceDisable || (!$isForceEnable && ($this->isRedirect($response) || !$this->isHtmlAccepted($request)));
}

private function prepareHtmlResponseWithDebugBar(Response $response): Response
private function prepareHtmlResponseWithDebugBar(Response $response,bool $isAjax): Response
{
$head = $this->debugBarRenderer->renderHead();
$body = $this->debugBarRenderer->render();
$body = $this->debugBarRenderer->render(!$isAjax);
$outResponseBody = $this->serializeResponse($response);
$template = '<html><head>%s</head><body><h1>DebugBar</h1><p>Response:</p><pre>%s</pre>%s</body></html>';
$escapedOutResponseBody = htmlspecialchars($outResponseBody);
Expand All @@ -122,10 +124,10 @@ private function prepareHtmlResponseWithDebugBar(Response $response): Response
->withAddedHeader('Content-type', 'text/html');
}

private function attachDebugBarToHtmlResponse(Response $response): Response
private function attachDebugBarToHtmlResponse(Response $response,bool $isAjax): Response
{
$head = $this->debugBarRenderer->renderHead();
$body = $this->debugBarRenderer->render();
$body = $this->debugBarRenderer->render(!$isAjax);
$responseBody = $response->getBody();

if (! $responseBody->eof() && $responseBody->isSeekable()) {
Expand Down