@@ -47,8 +47,8 @@ |
||
| 47 | 47 | } |
| 48 | 48 | else if (is_array($throwableOrMessage)) |
| 49 | 49 | { |
| 50 | - $this->class = $throwableOrMessage[0]; |
|
| 51 | - $this->message = $throwableOrMessage[1]; |
|
| 50 | + $this->class = $throwableOrMessage[ 0 ]; |
|
| 51 | + $this->message = $throwableOrMessage[ 1 ]; |
|
| 52 | 52 | $this->prev = null; |
| 53 | 53 | } |
| 54 | 54 | else |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public static function toStackTrace($ex) |
| 58 | 58 | { |
| 59 | - $list = []; |
|
| 60 | - for ($stack = Throwable::getThrowableStack($ex); $stack !== null; $stack = $stack['prev']) |
|
| 59 | + $list = [ ]; |
|
| 60 | + for ($stack = Throwable::getThrowableStack($ex); $stack !== null; $stack = $stack[ 'prev' ]) |
|
| 61 | 61 | { |
| 62 | - $list = array_merge($stack['trace'], $list); |
|
| 62 | + $list = array_merge($stack[ 'trace' ], $list); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | return $list; |
@@ -73,10 +73,10 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public static function toThrowableTrace($ex) |
| 75 | 75 | { |
| 76 | - $list = []; |
|
| 77 | - for ($stack = Throwable::getThrowableStack($ex); $stack !== null; $stack = $stack['prev']) |
|
| 76 | + $list = [ ]; |
|
| 77 | + for ($stack = Throwable::getThrowableStack($ex); $stack !== null; $stack = $stack[ 'prev' ]) |
|
| 78 | 78 | { |
| 79 | - $list[] = Throwable::parseThrowableMessage($stack); |
|
| 79 | + $list[ ] = Throwable::parseThrowableMessage($stack); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | return array_reverse($list); |
@@ -90,14 +90,14 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | public static function toStackString($ex) |
| 92 | 92 | { |
| 93 | - $stack = []; |
|
| 93 | + $stack = [ ]; |
|
| 94 | 94 | $i = 0; |
| 95 | 95 | $trace = static::toStackTrace($ex); |
| 96 | 96 | $pad = strlen(count($trace)) > 2 ?: 2; |
| 97 | 97 | |
| 98 | 98 | foreach ($trace as $element) |
| 99 | 99 | { |
| 100 | - $stack[] = "\t" . str_pad('' . $i, $pad, ' ', STR_PAD_LEFT) . '. ' . $element; |
|
| 100 | + $stack[ ] = "\t" . str_pad('' . $i, $pad, ' ', STR_PAD_LEFT) . '. ' . $element; |
|
| 101 | 101 | ++$i; |
| 102 | 102 | } |
| 103 | 103 | |
@@ -112,14 +112,14 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | public static function toThrowableString($ex) |
| 114 | 114 | { |
| 115 | - $stack = []; |
|
| 115 | + $stack = [ ]; |
|
| 116 | 116 | $i = 0; |
| 117 | 117 | $trace = static::toThrowableTrace($ex); |
| 118 | 118 | $pad = strlen(count($trace)) > 2 ?: 2; |
| 119 | 119 | |
| 120 | 120 | foreach ($trace as $element) |
| 121 | 121 | { |
| 122 | - $stack[] = "\t" . str_pad('' . $i, $pad, ' ', STR_PAD_LEFT) . '. ' . $element; |
|
| 122 | + $stack[ ] = "\t" . str_pad('' . $i, $pad, ' ', STR_PAD_LEFT) . '. ' . $element; |
|
| 123 | 123 | ++$i; |
| 124 | 124 | } |
| 125 | 125 | |
@@ -12,9 +12,9 @@ discard block |
||
| 12 | 12 | */ |
| 13 | 13 | public static function parseThrowableMessage($ex) |
| 14 | 14 | { |
| 15 | - $message = $ex['message']; |
|
| 15 | + $message = $ex[ 'message' ]; |
|
| 16 | 16 | |
| 17 | - if ($ex['isError'] && strpos($message, ' in ') !== false) |
|
| 17 | + if ($ex[ 'isError' ] && strpos($message, ' in ') !== false) |
|
| 18 | 18 | { |
| 19 | 19 | $message = preg_replace('#([a-zA-Z0-9-_]+?)/#siU', '', $message); |
| 20 | 20 | $message = preg_replace('#/#si', '', $message, 1); |
@@ -22,12 +22,12 @@ discard block |
||
| 22 | 22 | else |
| 23 | 23 | { |
| 24 | 24 | $message = trim($message, '"'); |
| 25 | - $file = str_replace('.php', '', basename($ex['file'])); |
|
| 26 | - $line = $ex['line']; |
|
| 25 | + $file = str_replace('.php', '', basename($ex[ 'file' ])); |
|
| 26 | + $line = $ex[ 'line' ]; |
|
| 27 | 27 | $message = '"' . $message . '" in ' . $file . ':' . $line; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - return '[' . static::getBasename($ex['class']) . '] ' . $message; |
|
| 30 | + return '[' . static::getBasename($ex[ 'class' ]) . '] ' . $message; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -38,13 +38,13 @@ discard block |
||
| 38 | 38 | * @param int $offset |
| 39 | 39 | * @return mixed |
| 40 | 40 | */ |
| 41 | - public static function getThrowableStack($ex, &$data = [], $offset = 0) |
|
| 41 | + public static function getThrowableStack($ex, &$data = [ ], $offset = 0) |
|
| 42 | 42 | { |
| 43 | 43 | $data = static::getThrowableData($ex, $offset); |
| 44 | 44 | |
| 45 | 45 | if (($current = $ex->getPrevious()) !== null) |
| 46 | 46 | { |
| 47 | - static::getThrowableStack($current, $data['prev'], count(static::getTraceElements($ex))); |
|
| 47 | + static::getThrowableStack($current, $data[ 'prev' ], count(static::getTraceElements($ex))); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | return $data; |
@@ -81,16 +81,16 @@ discard block |
||
| 81 | 81 | $trace = $ex->getTrace(); |
| 82 | 82 | $file = str_replace('.php', '', basename($ex->getFile())); |
| 83 | 83 | $elements = [ |
| 84 | - '[throwable] ' . get_class($ex) . '(...) in ' . $file .':' . $ex->getLine() |
|
| 84 | + '[throwable] ' . get_class($ex) . '(...) in ' . $file . ':' . $ex->getLine() |
|
| 85 | 85 | ]; |
| 86 | 86 | |
| 87 | 87 | foreach ($trace as $currentTrack) |
| 88 | 88 | { |
| 89 | - $elements[] = static::parseTraceElement($currentTrack); |
|
| 89 | + $elements[ ] = static::parseTraceElement($currentTrack); |
|
| 90 | 90 | } |
| 91 | - $elements[] = '[main]'; |
|
| 91 | + $elements[ ] = '[main]'; |
|
| 92 | 92 | |
| 93 | - array_splice($elements, -$offset+1, $offset); |
|
| 93 | + array_splice($elements, -$offset + 1, $offset); |
|
| 94 | 94 | |
| 95 | 95 | return $elements; |
| 96 | 96 | } |
@@ -101,24 +101,24 @@ discard block |
||
| 101 | 101 | */ |
| 102 | 102 | protected static function parseTraceElement($element) |
| 103 | 103 | { |
| 104 | - $element['class'] = isset($element['class']) ? $element['class'] : 'Undefined'; |
|
| 105 | - $element['file'] = isset($element['file']) ? $element['file'] : 'unknown'; |
|
| 106 | - $element['line'] = isset($element['line']) ? $element['line'] : 0; |
|
| 107 | - $element['type'] = isset($element['type']) ? $element['type'] : ''; |
|
| 108 | - $element['function'] = isset($element['function']) ? $element['function'] : '::undefined'; |
|
| 109 | - $element['args'] = isset($element['args']) ? $element['args'] : []; |
|
| 104 | + $element[ 'class' ] = isset($element[ 'class' ]) ? $element[ 'class' ] : 'Undefined'; |
|
| 105 | + $element[ 'file' ] = isset($element[ 'file' ]) ? $element[ 'file' ] : 'unknown'; |
|
| 106 | + $element[ 'line' ] = isset($element[ 'line' ]) ? $element[ 'line' ] : 0; |
|
| 107 | + $element[ 'type' ] = isset($element[ 'type' ]) ? $element[ 'type' ] : ''; |
|
| 108 | + $element[ 'function' ] = isset($element[ 'function' ]) ? $element[ 'function' ] : '::undefined'; |
|
| 109 | + $element[ 'args' ] = isset($element[ 'args' ]) ? $element[ 'args' ] : [ ]; |
|
| 110 | 110 | |
| 111 | 111 | return implode('', [ |
| 112 | 112 | '[call] ', |
| 113 | - $element['class'], |
|
| 114 | - $element['type'], |
|
| 115 | - $element['function'], |
|
| 113 | + $element[ 'class' ], |
|
| 114 | + $element[ 'type' ], |
|
| 115 | + $element[ 'function' ], |
|
| 116 | 116 | '(', |
| 117 | - static::parseArgs($element['args']), |
|
| 117 | + static::parseArgs($element[ 'args' ]), |
|
| 118 | 118 | ') in ', |
| 119 | - str_replace('.php', '', basename($element['file'])), |
|
| 119 | + str_replace('.php', '', basename($element[ 'file' ])), |
|
| 120 | 120 | ':', |
| 121 | - $element['line'] |
|
| 121 | + $element[ 'line' ] |
|
| 122 | 122 | ]); |
| 123 | 123 | } |
| 124 | 124 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | protected static function parseArgs($args) |
| 130 | 130 | { |
| 131 | - $elements = []; |
|
| 131 | + $elements = [ ]; |
|
| 132 | 132 | |
| 133 | 133 | foreach ($args as $element) |
| 134 | 134 | { |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $element = '"' . $element . '"'; |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - $elements[] = $element; |
|
| 149 | + $elements[ ] = $element; |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | return implode(', ', $elements); |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | public static function handleError($code, $message, $file, $line) |
| 53 | 53 | { |
| 54 | 54 | $list = static::getSystemError($code); |
| 55 | - $name = $list[0]; |
|
| 56 | - $type = $list[1]; |
|
| 55 | + $name = $list[ 0 ]; |
|
| 56 | + $type = $list[ 1 ]; |
|
| 57 | 57 | |
| 58 | 58 | $message = "\"$message\" in $file:$line"; |
| 59 | 59 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | try |
| 79 | 79 | { |
| 80 | - static::handleError($err['type'], $err['message'], $err['file'], $err['line']); |
|
| 80 | + static::handleError($err[ 'type' ], $err[ 'message' ], $err[ 'file' ], $err[ 'line' ]); |
|
| 81 | 81 | } |
| 82 | 82 | catch (\Error $ex) |
| 83 | 83 | { |
@@ -100,55 +100,55 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | private static function getSystemError($type) |
| 102 | 102 | { |
| 103 | - switch($type) |
|
| 103 | + switch ($type) |
|
| 104 | 104 | { |
| 105 | 105 | case E_ERROR: // 1 // |
| 106 | - return [ 'E_ERROR', static::E_ERROR ]; |
|
| 106 | + return [ 'E_ERROR', static::E_ERROR ]; |
|
| 107 | 107 | |
| 108 | 108 | case E_WARNING: // 2 // |
| 109 | - return [ 'E_WARNING', static::E_WARNING ]; |
|
| 109 | + return [ 'E_WARNING', static::E_WARNING ]; |
|
| 110 | 110 | |
| 111 | 111 | case E_PARSE: // 4 // |
| 112 | - return [ 'E_PARSE', static::E_ERROR ]; |
|
| 112 | + return [ 'E_PARSE', static::E_ERROR ]; |
|
| 113 | 113 | |
| 114 | 114 | case E_NOTICE: // 8 // |
| 115 | - return [ 'E_NOTICE', static::E_NOTICE ]; |
|
| 115 | + return [ 'E_NOTICE', static::E_NOTICE ]; |
|
| 116 | 116 | |
| 117 | 117 | case E_CORE_ERROR: // 16 // |
| 118 | - return [ 'E_CORE_ERROR', static::E_ERROR ]; |
|
| 118 | + return [ 'E_CORE_ERROR', static::E_ERROR ]; |
|
| 119 | 119 | |
| 120 | 120 | case E_CORE_WARNING: // 32 // |
| 121 | - return [ 'E_CORE_WARNING', static::E_WARNING ]; |
|
| 121 | + return [ 'E_CORE_WARNING', static::E_WARNING ]; |
|
| 122 | 122 | |
| 123 | 123 | case E_COMPILE_ERROR: // 64 // |
| 124 | - return [ 'E_COMPILE_ERROR', static::E_ERROR ]; |
|
| 124 | + return [ 'E_COMPILE_ERROR', static::E_ERROR ]; |
|
| 125 | 125 | |
| 126 | 126 | case E_COMPILE_WARNING: // 128 // |
| 127 | - return [ 'E_COMPILE_WARNING', static::E_WARNING ]; |
|
| 127 | + return [ 'E_COMPILE_WARNING', static::E_WARNING ]; |
|
| 128 | 128 | |
| 129 | 129 | case E_USER_ERROR: // 256 // |
| 130 | - return [ 'E_USER_ERROR', static::E_ERROR ]; |
|
| 130 | + return [ 'E_USER_ERROR', static::E_ERROR ]; |
|
| 131 | 131 | |
| 132 | 132 | case E_USER_WARNING: // 512 // |
| 133 | - return [ 'E_USER_WARNING', static::E_WARNING ]; |
|
| 133 | + return [ 'E_USER_WARNING', static::E_WARNING ]; |
|
| 134 | 134 | |
| 135 | 135 | case E_USER_NOTICE: // 1024 // |
| 136 | - return [ 'E_USER_NOTICE', static::E_NOTICE ]; |
|
| 136 | + return [ 'E_USER_NOTICE', static::E_NOTICE ]; |
|
| 137 | 137 | |
| 138 | 138 | case E_STRICT: // 2048 // |
| 139 | - return [ 'E_STRICT', static::E_ERROR ]; |
|
| 139 | + return [ 'E_STRICT', static::E_ERROR ]; |
|
| 140 | 140 | |
| 141 | 141 | case E_RECOVERABLE_ERROR: // 4096 // |
| 142 | 142 | return [ 'E_RECOVERABLE_ERROR', static::E_WARNING ]; |
| 143 | 143 | |
| 144 | 144 | case E_DEPRECATED: // 8192 // |
| 145 | - return [ 'E_DEPRECATED', static::E_NOTICE ]; |
|
| 145 | + return [ 'E_DEPRECATED', static::E_NOTICE ]; |
|
| 146 | 146 | |
| 147 | 147 | case E_USER_DEPRECATED: // 16384 // |
| 148 | - return [ 'E_USER_DEPRECATED', static::E_NOTICE ]; |
|
| 148 | + return [ 'E_USER_DEPRECATED', static::E_NOTICE ]; |
|
| 149 | 149 | |
| 150 | 150 | default: |
| 151 | - return [ 'E_UNKNOWN', static::E_UNSUPPORTED ]; |
|
| 151 | + return [ 'E_UNKNOWN', static::E_UNSUPPORTED ]; |
|
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | 154 | } |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public static function toStackTrace($ex) |
| 58 | 58 | { |
| 59 | - $list = []; |
|
| 60 | - for ($stack = Throwable::getThrowableStack($ex); $stack !== null; $stack = $stack['prev']) |
|
| 59 | + $list = [ ]; |
|
| 60 | + for ($stack = Throwable::getThrowableStack($ex); $stack !== null; $stack = $stack[ 'prev' ]) |
|
| 61 | 61 | { |
| 62 | - $list = array_merge($stack['trace'], $list); |
|
| 62 | + $list = array_merge($stack[ 'trace' ], $list); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | return $list; |
@@ -73,10 +73,10 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public static function toThrowableTrace($ex) |
| 75 | 75 | { |
| 76 | - $list = []; |
|
| 77 | - for ($stack = Throwable::getThrowableStack($ex); $stack !== null; $stack = $stack['prev']) |
|
| 76 | + $list = [ ]; |
|
| 77 | + for ($stack = Throwable::getThrowableStack($ex); $stack !== null; $stack = $stack[ 'prev' ]) |
|
| 78 | 78 | { |
| 79 | - $list[] = Throwable::parseThrowableMessage($stack); |
|
| 79 | + $list[ ] = Throwable::parseThrowableMessage($stack); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | return array_reverse($list); |
@@ -90,14 +90,14 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | public static function toStackString($ex) |
| 92 | 92 | { |
| 93 | - $stack = []; |
|
| 93 | + $stack = [ ]; |
|
| 94 | 94 | $i = 0; |
| 95 | 95 | $trace = static::toStackTrace($ex); |
| 96 | 96 | $pad = strlen(count($trace)) > 2 ?: 2; |
| 97 | 97 | |
| 98 | 98 | foreach ($trace as $element) |
| 99 | 99 | { |
| 100 | - $stack[] = "\t" . str_pad('' . $i, $pad, ' ', STR_PAD_LEFT) . '. ' . $element; |
|
| 100 | + $stack[ ] = "\t" . str_pad('' . $i, $pad, ' ', STR_PAD_LEFT) . '. ' . $element; |
|
| 101 | 101 | ++$i; |
| 102 | 102 | } |
| 103 | 103 | |
@@ -112,14 +112,14 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | public static function toThrowableString($ex) |
| 114 | 114 | { |
| 115 | - $stack = []; |
|
| 115 | + $stack = [ ]; |
|
| 116 | 116 | $i = 0; |
| 117 | 117 | $trace = static::toThrowableTrace($ex); |
| 118 | 118 | $pad = strlen(count($trace)) > 2 ?: 2; |
| 119 | 119 | |
| 120 | 120 | foreach ($trace as $element) |
| 121 | 121 | { |
| 122 | - $stack[] = "\t" . str_pad('' . $i, $pad, ' ', STR_PAD_LEFT) . '. ' . $element; |
|
| 122 | + $stack[ ] = "\t" . str_pad('' . $i, $pad, ' ', STR_PAD_LEFT) . '. ' . $element; |
|
| 123 | 123 | ++$i; |
| 124 | 124 | } |
| 125 | 125 | |