mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 23:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

格式化代码

Browse Source
This commit is contained in:
yunwuxin
2016-05-15 10:15:19 +08:00
parent f78ba76767
commit 19d5b1fee9
2 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/think/Console.php
View File

@@ -663,18 +663,11 @@ class Console
if (true === $input->hasParameterOption(['--quiet', '-q'])) { if (true === $input->hasParameterOption(['--quiet', '-q'])) {
$output->setVerbosity(Output::VERBOSITY_QUIET); $output->setVerbosity(Output::VERBOSITY_QUIET);
} else { } else {
if ($input->hasParameterOption('-vvv') || $input->hasParameterOption('--verbose=3') if ($input->hasParameterOption('-vvv') || $input->hasParameterOption('--verbose=3') || $input->getParameterOption('--verbose') === 3) {
|| $input->getParameterOption('--verbose') === 3
) {
$output->setVerbosity(Output::VERBOSITY_DEBUG); $output->setVerbosity(Output::VERBOSITY_DEBUG);
} elseif ($input->hasParameterOption('-vv') || $input->hasParameterOption('--verbose=2') } elseif ($input->hasParameterOption('-vv') || $input->hasParameterOption('--verbose=2') || $input->getParameterOption('--verbose') === 2) {
|| $input->getParameterOption('--verbose') === 2
) {
$output->setVerbosity(Output::VERBOSITY_VERY_VERBOSE); $output->setVerbosity(Output::VERBOSITY_VERY_VERBOSE);
} elseif ($input->hasParameterOption('-v') || $input->hasParameterOption('--verbose=1') } elseif ($input->hasParameterOption('-v') || $input->hasParameterOption('--verbose=1') || $input->hasParameterOption('--verbose') || $input->getParameterOption('--verbose')) {
|| $input->hasParameterOption('--verbose')
|| $input->getParameterOption('--verbose')
) {
$output->setVerbosity(Output::VERBOSITY_VERBOSE); $output->setVerbosity(Output::VERBOSITY_VERBOSE);
} }
} }

7
library/think/Error.php
View File

@@ -77,12 +77,7 @@ class Error
{ {
if (!is_null($error = error_get_last()) && self::isFatal($error['type'])) { if (!is_null($error = error_get_last()) && self::isFatal($error['type'])) {
// 将错误信息托管至think\ErrorException // 将错误信息托管至think\ErrorException
$exception = new ErrorException( $exception = new ErrorException($error['type'], $error['message'], $error['file'], $error['line']);
$error['type'],
$error['message'],
$error['file'],
$error['line']
);
self::appException($exception); self::appException($exception);
} }