Skip to content
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

Sort headers, fix overflowing, copy curl #112

Merged
merged 9 commits into from
Jun 25, 2024
Merged

Sort headers, fix overflowing, copy curl #112

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3d897f3
Sort headers, fix overflowing, copy curl
xepozz Jun 22, 2024
55f6420
Apply fixes from StyleCI
StyleCIBot Jun 22, 2024
cd7794e
Merge branch 'master' into mix
xepozz Jun 22, 2024
32f7352
Apply code review changes
xepozz Jun 23, 2024
e8c2395
Revert changes
xepozz Jun 23, 2024
0492a13
Add changelog
xepozz Jun 23, 2024
aec6ff8
Fix test
xepozz Jun 23, 2024
e3d109a
Fix html
xepozz Jun 23, 2024
f48be8c
Update CHANGELOG.md
xepozz Jun 24, 2024
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
14 changes: 8 additions & 6 deletions src/Renderer/HtmlRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,17 +347,19 @@
{
$output = $request->getMethod() . ' ' . $request->getUri() . "\n";

foreach ($request->getHeaders() as $name => $values) {
if ($name === 'Host') {
continue;
}
$headers = $request->getHeaders();
unset($headers['Host']);
ksort($headers);

foreach ($headers as $name => $values) {
foreach ($values as $value) {
$output .= "$name: $value\n";
}
}

$output .= "\n" . $request->getBody() . "\n\n";
if (!empty($request->getBody())) {

Check failure on line 360 in src/Renderer/HtmlRenderer.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.1-ubuntu-latest

RedundantCondition 

src/Renderer/HtmlRenderer.php:360:13: RedundantCondition: Operand of type true is always truthy (see https://psalm.dev/122)

Check failure on line 360 in src/Renderer/HtmlRenderer.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.2-ubuntu-latest

RedundantCondition 

src/Renderer/HtmlRenderer.php:360:13: RedundantCondition: Operand of type true is always truthy (see https://psalm.dev/122)

Check failure on line 360 in src/Renderer/HtmlRenderer.php

View workflow job for this annotation

GitHub Actions / psalm / PHP 8.3-ubuntu-latest

RedundantCondition 

src/Renderer/HtmlRenderer.php:360:13: RedundantCondition: Operand of type true is always truthy (see https://psalm.dev/122)
vjik marked this conversation as resolved.
Show resolved Hide resolved
$output .= "\n" . $request->getBody() . "\n\n";
}

return '<pre class="codeBlock language-text">' . $this->htmlEncode(rtrim($output, "\n")) . '</pre>';
}
Expand All @@ -377,7 +379,7 @@
return $this->htmlEncode('Error generating curl command: ' . $e->getMessage());
vjik marked this conversation as resolved.
Show resolved Hide resolved
}

return '<div class="codeBlock language-sh">' . $this->htmlEncode($output) . '</div>';
return $output;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion templates/_call-stack-item.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<li class="<?= (!empty($lines) && ($index === 1 || !$isVendorFile)) ? 'application ' : '' ?>call-stack-item"
data-line="<?= (int) ($line - $begin) ?>">
<div class="element-wrap">
<div class="flex-1">
<div class="flex-1 mw-100">
<?php if ($file !== null): ?>
<span class="file-name">
<?= "{$index}. in {$this->htmlEncode($file)}" ?>
Expand Down
22 changes: 13 additions & 9 deletions templates/development.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ html,
body,
div,
span,
h1,
h2,
h3,
h4,
h5,
h6,
p,
pre,
a,
Expand Down Expand Up @@ -344,13 +338,13 @@ header .previous h3 {
height: 150px;
}

#copy-stacktrace {
.copy-clipboard {
position: absolute;
right: 40px;
top: 44px;
}

#copy-stacktrace:hover svg path {
.copy-clipboard:hover svg path {
fill: var(--icon-hover-color);
}

Expand Down Expand Up @@ -387,6 +381,10 @@ main {
flex: 1;
}

.mw-100 {
max-width: 100%;
}

/* call stack */
.call-stack ul li,
.request {
Expand Down Expand Up @@ -460,6 +458,9 @@ main {

.call-stack ul li .element-wrap .function-info {
display: inline-block;
line-break: normal;
overflow-wrap: break-word;
word-break: break-word;
}

.call-stack ul li.application .element-wrap {
Expand Down Expand Up @@ -557,12 +558,15 @@ main {

/* request */
.request {
padding: 20px 30px;
position: relative;
font-size: 14px;
line-height: 18px;
overflow-x: auto;
font-family: JetBrains Mono, Consolas, monospace;
}
.request .body {
overflow: auto;
}
/* end request */

/* footer */
Expand Down
41 changes: 31 additions & 10 deletions templates/development.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<textarea id="clipboard"><?= $this->htmlEncode($throwable) ?></textarea>
<span id="copied">Copied!</span>

<a href="#" id="copy-stacktrace" title="Copy the stacktrace for use in a bug report or pastebin">
<a href="#" class="copy-clipboard" title="Copy the stacktrace for use in a bug report or pastebin">
<svg width="26" height="30" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M17.9998.333344H3.33317C1.8665.333344.666504 1.53334.666504 3.00001V20.3333c0 .7334.599996 1.3334 1.333336 1.3334.73333 0 1.33333-.6 1.33333-1.3334V4.33334c0-.73333.6-1.33333 1.33333-1.33333h13.3333c.7334 0 1.3334-.6 1.3334-1.33333 0-.733337-.6-1.333336-1.3334-1.333336zm5.3334 5.333336H8.6665c-1.46666 0-2.66666 1.2-2.66666 2.66666V27c0 1.4667 1.2 2.6667 2.66666 2.6667h14.6667c1.4666 0 2.6666-1.2 2.6666-2.6667V8.33334c0-1.46666-1.2-2.66666-2.6666-2.66666zM21.9998 27H9.99984c-.73333 0-1.33334-.6-1.33334-1.3333V9.66668c0-.73334.60001-1.33334 1.33334-1.33334H21.9998c.7334 0 1.3334.6 1.3334 1.33334V25.6667c0 .7333-.6 1.3333-1.3334 1.3333z" fill="#787878"/>
</svg>
Expand All @@ -107,12 +107,25 @@
</div>
<?php if ($request && ($requestInfo = $this->renderRequest($request)) !== ''): ?>
<div class="request">
<?= $requestInfo ?>
<h2>Request info</h2>
<div class="body">
<?= $requestInfo ?>
</div>
</div>
<?php endif ?>
<?php if ($request && ($curlInfo = $this->renderCurl($request)) !== 'curl'): ?>
<div class="request">
<?= $curlInfo ?>
<textarea id="clipboard"><?= $curlInfo ?></textarea>
vjik marked this conversation as resolved.
Show resolved Hide resolved
<span id="copied" style="top: 10px">Copied!</span>
<h2>cURL</h2>
<a href="#" class="copy-clipboard" title="Copy the cURL" style="right: 10px; top: 5px">
<svg width="26" height="30" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M17.9998.333344H3.33317C1.8665.333344.666504 1.53334.666504 3.00001V20.3333c0 .7334.599996 1.3334 1.333336 1.3334.73333 0 1.33333-.6 1.33333-1.3334V4.33334c0-.73333.6-1.33333 1.33333-1.33333h13.3333c.7334 0 1.3334-.6 1.3334-1.33333 0-.733337-.6-1.333336-1.3334-1.333336zm5.3334 5.333336H8.6665c-1.46666 0-2.66666 1.2-2.66666 2.66666V27c0 1.4667 1.2 2.6667 2.66666 2.6667h14.6667c1.4666 0 2.6666-1.2 2.6666-2.6667V8.33334c0-1.46666-1.2-2.66666-2.6666-2.66666zM21.9998 27H9.99984c-.73333 0-1.33334-.6-1.33334-1.3333V9.66668c0-.73334.60001-1.33334 1.33334-1.33334H21.9998c.7334 0 1.3334.6 1.3334 1.33334V25.6667c0 .7333-.6 1.3333-1.3334 1.3333z" fill="#787878"/>
</svg>
</a>
<div class="body">
<div class="codeBlock language-sh"><?= $this->htmlEncode($curlInfo) ?></div>
</div>
</div>
<?php endif ?>
<div class="footer">
Expand Down Expand Up @@ -254,29 +267,37 @@
}

// handle copy stacktrace action on clipboard button
document.getElementById('copy-stacktrace').onclick = function(e) {
const copyIntoClipboard = function(e) {
e.preventDefault();
var textarea = document.getElementById('clipboard');
const parentContainer = e.currentTarget.parentElement;
console.log('parentContainer',parentContainer)
const textarea = parentContainer.querySelector('#clipboard');
textarea.focus();
textarea.select();

var succeeded;
let succeeded;
try {
succeeded = document.execCommand('copy');
} catch (err) {
succeeded = false;
}
if (succeeded) {
var hint = document.getElementById('copied');
const hint = parentContainer.querySelector('#copied');
if (!hint) {
return
}
hint.style.display = 'block';
setTimeout(function () {
hint.style.display = 'none';
}, 2000);
setTimeout(() => hint.style.display = 'none', 2000);
} else {
// fallback: show textarea if browser does not support copying directly
textarea.style.top = 0;
}
}
const elements = document.querySelectorAll('.copy-clipboard')
for (let element of elements) {
element.onclick = copyIntoClipboard;
}


// handle theme change
document.getElementById('dark-mode').onclick = function(e) {
Expand Down
Loading