Merge branch '5.0'
* 5.0: cs fix Escape variable in Exception Template
This commit is contained in:
commit
1e2b88f43e
@ -247,7 +247,7 @@ class Deprecation
|
|||||||
foreach (get_declared_classes() as $class) {
|
foreach (get_declared_classes() as $class) {
|
||||||
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
|
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
|
||||||
$r = new \ReflectionClass($class);
|
$r = new \ReflectionClass($class);
|
||||||
$v = \dirname($r->getFileName(), 2);
|
$v = \dirname(\dirname($r->getFileName()));
|
||||||
if (file_exists($v.'/composer/installed.json')) {
|
if (file_exists($v.'/composer/installed.json')) {
|
||||||
self::$vendors[] = $v;
|
self::$vendors[] = $v;
|
||||||
$loader = require $v.'/autoload.php';
|
$loader = require $v.'/autoload.php';
|
||||||
|
@ -20,15 +20,15 @@
|
|||||||
<?php if ($exception['trace']) { ?>
|
<?php if ($exception['trace']) { ?>
|
||||||
<pre class="stacktrace">
|
<pre class="stacktrace">
|
||||||
<?php
|
<?php
|
||||||
echo $exception['class'].":\n";
|
echo $this->escape($exception['class']).":\n";
|
||||||
if ($exception['message']) {
|
if ($exception['message']) {
|
||||||
echo $exception['message']."\n";
|
echo $this->escape($exception['message'])."\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($exception['trace'] as $trace) {
|
foreach ($exception['trace'] as $trace) {
|
||||||
echo "\n ";
|
echo "\n ";
|
||||||
if ($trace['function']) {
|
if ($trace['function']) {
|
||||||
echo 'at '.$trace['class'].$trace['type'].$trace['function'].'('.(isset($trace['args']) ? $this->formatArgsAsText($trace['args']) : '').')';
|
echo $this->escape('at '.$trace['class'].$trace['type'].$trace['function']).'('.(isset($trace['args']) ? $this->formatArgsAsText($trace['args']) : '').')';
|
||||||
}
|
}
|
||||||
if ($trace['file'] && $trace['line']) {
|
if ($trace['file'] && $trace['line']) {
|
||||||
echo($trace['function'] ? "\n (" : 'at ').strtr(strip_tags($this->formatFile($trace['file'], $trace['line'])), [' at line '.$trace['line'] => '']).':'.$trace['line'].($trace['function'] ? ')' : '');
|
echo($trace['function'] ? "\n (" : 'at ').strtr(strip_tags($this->formatFile($trace['file'], $trace['line'])), [' at line '.$trace['line'] => '']).':'.$trace['line'].($trace['function'] ? ')' : '');
|
||||||
|
Reference in New Issue
Block a user