|
|
@ -17,8 +17,6 @@ class HTMLHandler extends Handler { |
|
|
protected ?\DOMDocument $_document = null; |
|
|
protected ?\DOMDocument $_document = null; |
|
|
/** The XPath path to the element where the errors should be inserted */ |
|
|
/** The XPath path to the element where the errors should be inserted */ |
|
|
protected string $_errorPath = '/html/body'; |
|
|
protected string $_errorPath = '/html/body'; |
|
|
/** If true the handler will output times to the output; defaults to true */ |
|
|
|
|
|
protected bool $_outputTime = true; |
|
|
|
|
|
/** The PHP-standard date format which to use for times printed to output */ |
|
|
/** The PHP-standard date format which to use for times printed to output */ |
|
|
protected string $_timeFormat = 'H:i:s'; |
|
|
protected string $_timeFormat = 'H:i:s'; |
|
|
|
|
|
|
|
|
@ -44,8 +42,8 @@ class HTMLHandler extends Handler { |
|
|
|
|
|
|
|
|
$this->xpath = new \DOMXPath($this->_document); |
|
|
$this->xpath = new \DOMXPath($this->_document); |
|
|
$location = $this->xpath->query($this->_errorPath); |
|
|
$location = $this->xpath->query($this->_errorPath); |
|
|
if (count($location) === 0 || !$location->item(0) instanceof \DOMElement) { |
|
|
if (count($location) === 0 || (!$location->item(0) instanceof \DOMElement && !$location->item(0) instanceof \DOMDocumentFragment)) { |
|
|
throw new \InvalidArgumentException('Option "errorPath" must correspond to a location that is an instance of \DOMElement'); |
|
|
throw new \InvalidArgumentException('Option "errorPath" must correspond to a location that is an instance of \DOMElement or \DOMDocumentFragment'); |
|
|
} |
|
|
} |
|
|
$this->errorLocation = $location->item(0); |
|
|
$this->errorLocation = $location->item(0); |
|
|
} |
|
|
} |
|
|
@ -53,161 +51,145 @@ class HTMLHandler extends Handler { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
protected function buildThrowable(ThrowableController $controller): \DOMDocumentFragment { |
|
|
protected function buildOutputThrowable(array $outputThrowable, bool $previous = false): \DOMDocumentFragment { |
|
|
$throwable = $controller->getThrowable(); |
|
|
|
|
|
$frag = $this->_document->createDocumentFragment(); |
|
|
$frag = $this->_document->createDocumentFragment(); |
|
|
|
|
|
$tFrag = $this->_document->createDocumentFragment(); |
|
|
|
|
|
$ip = $frag; |
|
|
|
|
|
$hasSiblings = false; |
|
|
|
|
|
|
|
|
$b = $this->_document->createElement('b'); |
|
|
if ($previous === false) { |
|
|
$type = $controller->getErrorType(); |
|
|
if (isset($outputThrowable['time'])) { |
|
|
$class = $throwable::class; |
|
|
$p = $this->_document->createElement('p'); |
|
|
$b->appendChild($this->_document->createTextNode($type ?? $class)); |
|
|
$time = $this->_document->createElement('time'); |
|
|
if ($type !== null) { |
|
|
$time->setAttribute('datetime', $outputThrowable['time']->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d\TH:i:s.vO')); |
|
|
$b->firstChild->textContent .= ' '; |
|
|
$time->appendChild($this->_document->createTextNode($outputThrowable['time']->format($this->_timeFormat))); |
|
|
$code = $this->_document->createElement('code'); |
|
|
$p->appendChild($time); |
|
|
$code->appendChild($this->_document->createTextNode("($class)")); |
|
|
$frag->appendChild($p); |
|
|
$b->appendChild($code); |
|
|
|
|
|
|
|
|
$div = $this->_document->createElement('div'); |
|
|
|
|
|
$frag->appendChild($div); |
|
|
|
|
|
$ip = $div; |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
$span = $this->_document->createElement('span'); |
|
|
|
|
|
$span->appendChild($this->_document->createTextNode('Caused by:')); |
|
|
|
|
|
$tFrag->appendChild($span); |
|
|
|
|
|
$tFrag->appendChild($this->_document->createTextNode(' ')); |
|
|
} |
|
|
} |
|
|
$frag->appendChild($b); |
|
|
|
|
|
|
|
|
|
|
|
$frag->appendChild($this->_document->createTextNode(': ')); |
|
|
$b = $this->_document->createElement('b'); |
|
|
|
|
|
$code = $this->_document->createElement('code'); |
|
|
|
|
|
$code->appendChild($this->_document->createTextNode($outputThrowable['class'])); |
|
|
|
|
|
$b->appendChild($code); |
|
|
|
|
|
if (isset($outputThrowable['errorType'])) { |
|
|
|
|
|
$b->insertBefore($this->_document->createTextNode("{$outputThrowable['errorType']} ("), $code); |
|
|
|
|
|
$b->appendChild($this->_document->createTextNode(')')); |
|
|
|
|
|
} |
|
|
|
|
|
$tFrag->appendChild($b); |
|
|
|
|
|
$tFrag->appendChild($this->_document->createTextNode(': ')); |
|
|
$i = $this->_document->createElement('i'); |
|
|
$i = $this->_document->createElement('i'); |
|
|
$i->appendChild($this->_document->createTextNode($throwable->getMessage())); |
|
|
$i->appendChild($this->_document->createTextNode($outputThrowable['message'])); |
|
|
$frag->appendChild($i); |
|
|
$tFrag->appendChild($i); |
|
|
$frag->appendChild($this->_document->createTextNode(' in file ')); |
|
|
$tFrag->appendChild($this->_document->createTextNode(' in file ')); |
|
|
$code = $this->_document->createElement('code'); |
|
|
$code = $this->_document->createElement('code'); |
|
|
$code->appendChild($this->_document->createTextNode($throwable->getFile())); |
|
|
$code->appendChild($this->_document->createTextNode($outputThrowable['file'])); |
|
|
$frag->appendChild($code); |
|
|
$tFrag->appendChild($code); |
|
|
$frag->appendChild($this->_document->createTextNode(' on line ' . $throwable->getLine())); |
|
|
$tFrag->appendChild($this->_document->createTextNode(" on line {$outputThrowable['line']}")); |
|
|
return $frag; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected function dispatchCallback(): void { |
|
|
|
|
|
$ul = $this->_document->createElement('ul'); |
|
|
|
|
|
$this->errorLocation->appendChild($ul); |
|
|
|
|
|
|
|
|
|
|
|
$allSilent = true; |
|
|
|
|
|
foreach ($this->outputBuffer as $o) { |
|
|
|
|
|
if ($o->outputCode & self::SILENT) { |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$allSilent = false; |
|
|
if (isset($outputThrowable['previous'])) { |
|
|
|
|
|
$ul = $this->_document->createElement('ul'); |
|
|
$li = $this->_document->createElement('li'); |
|
|
$li = $this->_document->createElement('li'); |
|
|
$li->appendChild($o->output); |
|
|
$li->appendChild($this->buildOutputThrowable($outputThrowable['previous'], true)); |
|
|
$ul->appendChild($li); |
|
|
$ul->appendChild($li); |
|
|
|
|
|
$ip->appendChild($ul); |
|
|
|
|
|
$hasSiblings = true; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (!$allSilent) { |
|
|
if ($previous === false && isset($outputThrowable['frames'])) { |
|
|
$this->print($this->_document->saveHTML()); |
|
|
$p = $this->_document->createElement('p'); |
|
|
} |
|
|
$p->appendChild($this->_document->createTextNode('Stack trace:')); |
|
|
} |
|
|
$ip->appendChild($p); |
|
|
|
|
|
|
|
|
|
|
|
$ol = $this->_document->createElement('ol'); |
|
|
|
|
|
$ip->appendChild($ol); |
|
|
|
|
|
foreach ($outputThrowable['frames'] as $frame) { |
|
|
|
|
|
$li = $this->_document->createElement('li'); |
|
|
|
|
|
$ol->appendChild($li); |
|
|
|
|
|
if (isset($frame['args'])) { |
|
|
|
|
|
$t = $this->_document->createElement('p'); |
|
|
|
|
|
$li->appendChild($t); |
|
|
|
|
|
} else { |
|
|
|
|
|
$t = $li; |
|
|
|
|
|
} |
|
|
|
|
|
$b = $this->_document->createElement('b'); |
|
|
|
|
|
$code = $this->_document->createElement('code'); |
|
|
|
|
|
$b->appendChild($code); |
|
|
|
|
|
$t->appendChild($b); |
|
|
|
|
|
|
|
|
|
|
|
if (isset($frame['class'])) { |
|
|
|
|
|
$code->appendChild($this->_document->createTextNode($frame['class'])); |
|
|
|
|
|
|
|
|
|
|
|
if (isset($frame['errorType'])) { |
|
|
|
|
|
$b->insertBefore($this->_document->createTextNode("{$frame['errorType']} ("), $code); |
|
|
|
|
|
$b->appendChild($this->_document->createTextNode(')')); |
|
|
|
|
|
} elseif (isset($frame['function'])) { |
|
|
|
|
|
$code->firstChild->appendData("::{$frame['function']}"); |
|
|
|
|
|
} |
|
|
|
|
|
} elseif (!empty($frame['function'])) { |
|
|
|
|
|
$code->appendChild($this->_document->createTextNode($frame['function'])); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
protected function handleCallback(ThrowableController $controller): HandlerOutput { |
|
|
$t->appendChild($this->_document->createTextNode("\u{00a0}\u{00a0}")); |
|
|
$frag = $this->_document->createDocumentFragment(); |
|
|
$code = $this->_document->createElement('code'); |
|
|
|
|
|
$code->appendChild($this->_document->createTextNode($frame['file'])); |
|
|
|
|
|
$t->appendChild($code); |
|
|
|
|
|
$t->appendChild($this->_document->createTextNode(":{$frame['line']}")); |
|
|
|
|
|
|
|
|
if ($this->_outputTime && $this->_timeFormat !== '') { |
|
|
if (isset($frame['args'])) { |
|
|
$p = $this->_document->createElement('p'); |
|
|
$pre = $this->_document->createElement('pre'); |
|
|
$time = $this->_document->createElement('time'); |
|
|
$pre->appendChild($this->_document->createTextNode(trim(print_r($frame['args'], true)))); |
|
|
$now = new \DateTimeImmutable(); |
|
|
$li->appendChild($pre); |
|
|
$tz = $now->getTimezone()->getName(); |
|
|
} |
|
|
if ($tz !== 'UTC' || !in_array($this->_timeFormat, [ 'c', 'Y-m-d\TH:i:sO', 'Y-m-d\TH:i:sP', 'Y-m-d\TH:i:s\Z' ])) { |
|
|
|
|
|
$n = ($tz !== 'UTC') ? $now->setTimezone(new \DateTimeZone('UTC')) : $now; |
|
|
|
|
|
$time->setAttribute('datetime', $n->format('Y-m-d\TH:i:s\Z')); |
|
|
|
|
|
} |
|
|
} |
|
|
$time->appendChild($this->_document->createTextNode($now->format($this->_timeFormat))); |
|
|
|
|
|
$p->appendChild($time); |
|
|
|
|
|
$frag->appendChild($p); |
|
|
|
|
|
|
|
|
|
|
|
$ip = $this->_document->createElement('div'); |
|
|
$hasSiblings = true; |
|
|
$frag->appendChild($ip); |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if ($hasSiblings) { |
|
|
|
|
|
$p = $this->_document->createElement('p'); |
|
|
|
|
|
$p->appendChild($tFrag); |
|
|
|
|
|
$ip->insertBefore($p, $ip->firstChild); |
|
|
} else { |
|
|
} else { |
|
|
$ip = $frag; |
|
|
$ip->appendChild($tFrag); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
$p = $this->_document->createElement('p'); |
|
|
return $frag; |
|
|
$p->appendChild($this->buildThrowable($controller)); |
|
|
} |
|
|
$ip->appendChild($p); |
|
|
|
|
|
|
|
|
|
|
|
if ($this->_outputPrevious) { |
|
|
|
|
|
$prev = $controller->getPrevious(); |
|
|
|
|
|
if ($prev !== null) { |
|
|
|
|
|
$ul = $this->_document->createElement('ul'); |
|
|
|
|
|
$ip->appendChild($ul); |
|
|
|
|
|
$f = null; |
|
|
|
|
|
while ($prev) { |
|
|
|
|
|
if ($f !== null) { |
|
|
|
|
|
$p = $this->_document->createElement('p'); |
|
|
|
|
|
$p->appendChild($f); |
|
|
|
|
|
$li->appendChild($p); |
|
|
|
|
|
$ul = $this->_document->createElement('ul'); |
|
|
|
|
|
$li->appendChild($ul); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$li = $this->_document->createElement('li'); |
|
|
protected function dispatchCallback(): void { |
|
|
$ul->appendChild($li); |
|
|
$frag = $this->_document->createDocumentFragment(); |
|
|
$f = $this->_document->createDocumentFragment(); |
|
|
$allSilent = true; |
|
|
$span = $this->_document->createElement('span'); |
|
|
foreach ($this->outputBuffer as $o) { |
|
|
$span->appendChild($this->_document->createTextNode('Caused by:')); |
|
|
if ($o['outputCode'] & self::SILENT) { |
|
|
$f->appendChild($span); |
|
|
continue; |
|
|
$f->appendChild($this->_document->createTextNode(' ')); |
|
|
} |
|
|
$f->appendChild($this->buildThrowable($prev)); |
|
|
|
|
|
|
|
|
|
|
|
$prev = $prev->getPrevious(); |
|
|
$li = $this->_document->createElement('li'); |
|
|
} |
|
|
$li->appendChild($this->buildOutputThrowable($o)); |
|
|
|
|
|
$frag->appendChild($li); |
|
|
|
|
|
|
|
|
$li->appendChild($f); |
|
|
$allSilent = false; |
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if ($this->_outputBacktrace) { |
|
|
if (!$allSilent) { |
|
|
$frames = $controller->getFrames(); |
|
|
$ul = $this->_document->createElement('ul'); |
|
|
if (count($frames) > 0) { |
|
|
$ul->appendChild($frag); |
|
|
$p = $this->_document->createElement('p'); |
|
|
$this->errorLocation->appendChild($ul); |
|
|
$p->appendChild($this->_document->createTextNode('Stack trace:')); |
|
|
$this->print($this->serializeDocument()); |
|
|
$ip->appendChild($p); |
|
|
|
|
|
|
|
|
|
|
|
$ol = $this->_document->createElement('ol'); |
|
|
|
|
|
$ip->appendChild($ol); |
|
|
|
|
|
|
|
|
|
|
|
$num = 0; |
|
|
|
|
|
foreach ($frames as $frame) { |
|
|
|
|
|
$li = $this->_document->createElement('li'); |
|
|
|
|
|
$ol->appendChild($li); |
|
|
|
|
|
|
|
|
|
|
|
$args = (isset($frame['args']) && $this->_backtraceArgFrameLimit >= ++$num); |
|
|
|
|
|
if ($args) { |
|
|
|
|
|
$t = $this->_document->createElement('p'); |
|
|
|
|
|
$li->appendChild($t); |
|
|
|
|
|
} else { |
|
|
|
|
|
$t = $li; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$b = $this->_document->createElement('b'); |
|
|
|
|
|
$code = $this->_document->createElement('code'); |
|
|
|
|
|
$b->appendChild($code); |
|
|
|
|
|
$t->appendChild($b); |
|
|
|
|
|
|
|
|
|
|
|
$text = $frame['error'] ?? $frame['class'] ?? ''; |
|
|
|
|
|
if (isset($frame['function'])) { |
|
|
|
|
|
$text = ((isset($frame['class'])) ? '::' : '') . "{$frame['function']}()"; |
|
|
|
|
|
} |
|
|
|
|
|
$code->appendChild($this->_document->createTextNode($text)); |
|
|
|
|
|
|
|
|
|
|
|
$t->appendChild($this->_document->createTextNode("\u{00a0}\u{00a0}")); |
|
|
|
|
|
$code = $this->_document->createElement('code'); |
|
|
|
|
|
$code->appendChild($this->_document->createTextNode($frame['file'])); |
|
|
|
|
|
$t->appendChild($code); |
|
|
|
|
|
$t->appendChild($this->_document->createTextNode(":{$frame['line']}")); |
|
|
|
|
|
|
|
|
|
|
|
if ($args) { |
|
|
|
|
|
$pre = $this->_document->createElement('pre'); |
|
|
|
|
|
$pre->appendChild($this->_document->createTextNode(print_r($frame['args'], true))); |
|
|
|
|
|
$li->appendChild($pre); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
return new HandlerOutput($this->getControlCode(), $this->getOutputCode(), $frag); |
|
|
protected function serializeDocument() { |
|
|
|
|
|
return $this->_document->saveHTML(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
