diff --git a/f_config/config.php b/f_config/config.php index 9563f586..01365cd0 100644 --- a/f_config/config.php +++ b/f_config/config.php @@ -15,35 +15,35 @@ ini_set("session.gc_maxlifetime", '604800'); // seconds function getFriendlyErrorType($type) { switch ($type) { - case E_ERROR: // 1 // + case E_ERROR: // 1 // return 'E_ERROR'; - case E_WARNING: // 2 // + case E_WARNING: // 2 // return 'E_WARNING'; - case E_PARSE: // 4 // + case E_PARSE: // 4 // return 'E_PARSE'; - case E_NOTICE: // 8 // + case E_NOTICE: // 8 // return 'E_NOTICE'; - case E_CORE_ERROR: // 16 // + case E_CORE_ERROR: // 16 // return 'E_CORE_ERROR'; - case E_CORE_WARNING: // 32 // + case E_CORE_WARNING: // 32 // return 'E_CORE_WARNING'; - case E_COMPILE_ERROR: // 64 // + case E_COMPILE_ERROR: // 64 // return 'E_COMPILE_ERROR'; - case E_COMPILE_WARNING: // 128 // + case E_COMPILE_WARNING: // 128 // return 'E_COMPILE_WARNING'; - case E_USER_ERROR: // 256 // + case E_USER_ERROR: // 256 // return 'E_USER_ERROR'; - case E_USER_WARNING: // 512 // + case E_USER_WARNING: // 512 // return 'E_USER_WARNING'; - case E_USER_NOTICE: // 1024 // + case E_USER_NOTICE: // 1024 // return 'E_USER_NOTICE'; - case E_STRICT: // 2048 // + case E_STRICT: // 2048 // return 'E_STRICT'; - case E_RECOVERABLE_ERROR: // 4096 // + case E_RECOVERABLE_ERROR: // 4096 // return 'E_RECOVERABLE_ERROR'; - case E_DEPRECATED: // 8192 // + case E_DEPRECATED: // 8192 // return 'E_DEPRECATED'; - case E_USER_DEPRECATED: // 16384 // + case E_USER_DEPRECATED: // 16384 // return 'E_USER_DEPRECATED'; } return "{$type}"; @@ -134,7 +134,7 @@ function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, in getExceptionTraceAsString($e) ); } -set_error_handler("\sammo\logErrorByCustomHandler"); +set_error_handler("\\sammo\\logErrorByCustomHandler"); function logExceptionByCustomHandler(\Throwable $e) diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php index dad46146..be0b5352 100644 --- a/hwe/func_tournament.php +++ b/hwe/func_tournament.php @@ -1132,7 +1132,7 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) { $gen1resKey = 'd'; $gen2resKey = 'd'; break; - default: new MustNotBeReachedException(); + default: throw new MustNotBeReachedException(); } $db->update('rank_data', [ diff --git a/hwe/sammo/Command/Nation/che_피장파장.php b/hwe/sammo/Command/Nation/che_피장파장.php index c9737bc7..9083474d 100644 --- a/hwe/sammo/Command/Nation/che_피장파장.php +++ b/hwe/sammo/Command/Nation/che_피장파장.php @@ -33,6 +33,9 @@ class che_피장파장 extends Command\NationCommand{ if(!key_exists('destNationID', $this->arg)){ return false; } + if(!key_exists('commandType', $this->arg)){ + return false; + } $destNationID = $this->arg['destNationID']; $commandType = $this->arg['commandType'];