as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-04-28 10:43:16 +08:00
parent 33d8531f6b
commit 759b12d1d7
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
function.php
+14 -21
View File
@@ -91,9 +91,9 @@ if (!function_exists('scan_directory')) {
*/ */
function scan_directory($dir, $namespace) function scan_directory($dir, $namespace)
{ {
$annotation = Snowflake::app()->getAnnotation(); $annotation = Snowflake::app()->getAnnotation();
$annotation->read($dir, $namespace); $annotation->read($dir, $namespace);
$annotation->runtime($dir, $namespace); $annotation->runtime($dir, $namespace);
} }
} }
@@ -509,7 +509,7 @@ if (!function_exists('request')) {
function request(): Request function request(): Request
{ {
if (!Context::hasContext('request')) { if (!Context::hasContext('request')) {
return new Request(); return new Request();
} }
return Context::getContext('request'); return Context::getContext('request');
} }
@@ -855,30 +855,23 @@ if (!function_exists('jTraceEx')) {
$result[] = sprintf('%s%s: %s', $starter, $e::class, $e->getMessage()); $result[] = sprintf('%s%s: %s', $starter, $e::class, $e->getMessage());
$file = $e->getFile(); $file = $e->getFile();
$line = $e->getLine(); $line = $e->getLine();
while (true) {
$current = "$file:$line"; foreach ($trace as $value) {
if (is_array($seen) && in_array($current, $seen)) {
$result[] = sprintf(' ... %d more', count($trace) + 1);
break;
}
$result[] = sprintf(' at %s%s%s(%s%s%s)', $result[] = sprintf(' at %s%s%s(%s%s%s)',
count($trace) && array_key_exists('class', $trace[0]) ? str_replace('\\', '.', $trace[0]['class']) : '', count($value) && array_key_exists('class', $value) ? str_replace('\\', '.', $value['class']) : '',
count($trace) && array_key_exists('class', $trace[0]) && array_key_exists('function', $trace[0]) ? '.' : '', count($value) && array_key_exists('class', $value) && array_key_exists('function', $value) ? '.' : '',
count($trace) && array_key_exists('function', $trace[0]) ? str_replace('\\', '.', $trace[0]['function']) : '(main)', count($value) && array_key_exists('function', $value) ? str_replace('\\', '.', $value['function']) : '(main)',
$line === null ? $file : basename($file), $line === null ? $file : basename($file),
$line === null ? '' : ':', $line === null ? '' : ':',
$line === null ? '' : $line); $line === null ? '' : $line);
if (is_array($seen))
$seen[] = "$file:$line"; $file = array_key_exists('file', $value) ? $value['file'] : 'Unknown Source';
if (!count($trace)) $line = array_key_exists('file', $value) && array_key_exists('line', $value) && $value['line'] ? $value['line'] : null;
break;
$file = array_key_exists('file', $trace[0]) ? $trace[0]['file'] : 'Unknown Source';
$line = array_key_exists('file', $trace[0]) && array_key_exists('line', $trace[0]) && $trace[0]['line'] ? $trace[0]['line'] : null;
array_shift($trace);
} }
$result = join("\n", $result); $result = join("\n", $result);
if ($prev) if ($prev) {
$result .= "\n" . jTraceEx($prev, $seen); $result .= "\n" . jTraceEx($prev, $seen);
}
return $result; return $result;
} }