@@ -31,7 +31,7 @@ |
||
31 | 31 | */ |
32 | 32 | public function line(int $number, string $code, bool $target = false): string |
33 | 33 | { |
34 | - if ($target) { |
|
34 | + if ($target){ |
|
35 | 35 | return sprintf( |
36 | 36 | ">%s %s\n", |
37 | 37 | str_pad((string)$number, 4, ' ', STR_PAD_LEFT), |
@@ -31,7 +31,8 @@ |
||
31 | 31 | */ |
32 | 32 | public function line(int $number, string $code, bool $target = false): string |
33 | 33 | { |
34 | - if ($target) { |
|
34 | + if ($target) |
|
35 | + { |
|
35 | 36 | return sprintf( |
36 | 37 | ">%s %s\n", |
37 | 38 | str_pad((string)$number, 4, ' ', STR_PAD_LEFT), |
@@ -69,10 +69,10 @@ discard block |
||
69 | 69 | { |
70 | 70 | $result = ''; |
71 | 71 | |
72 | - if ($e instanceof \Error) { |
|
73 | - $result .= $this->renderHeader('[' . get_class($e) . "]\n" . $e->getMessage(), 'bg:magenta,white'); |
|
74 | - } else { |
|
75 | - $result .= $this->renderHeader('[' . get_class($e) . "]\n" . $e->getMessage(), 'bg:red,white'); |
|
72 | + if ($e instanceof \Error){ |
|
73 | + $result .= $this->renderHeader('['.get_class($e)."]\n".$e->getMessage(), 'bg:magenta,white'); |
|
74 | + }else{ |
|
75 | + $result .= $this->renderHeader('['.get_class($e)."]\n".$e->getMessage(), 'bg:red,white'); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | $result .= $this->format( |
@@ -81,11 +81,11 @@ discard block |
||
81 | 81 | $e->getLine() |
82 | 82 | ); |
83 | 83 | |
84 | - if ($verbosity >= self::VERBOSITY_DEBUG) { |
|
84 | + if ($verbosity >= self::VERBOSITY_DEBUG){ |
|
85 | 85 | $result .= $this->renderTrace($e, new Highlighter( |
86 | 86 | $this->colorsSupport ? new ConsoleStyle() : new PlainStyle() |
87 | 87 | )); |
88 | - } elseif ($verbosity >= self::VERBOSITY_VERBOSE) { |
|
88 | + } elseif ($verbosity >= self::VERBOSITY_VERBOSE){ |
|
89 | 89 | $result .= $this->renderTrace($e); |
90 | 90 | } |
91 | 91 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | $length += $padding; |
115 | 115 | |
116 | - foreach ($lines as $line) { |
|
116 | + foreach ($lines as $line){ |
|
117 | 117 | $result .= $this->format( |
118 | 118 | "<{$style}>%s%s%s</reset>\n", |
119 | 119 | str_repeat(' ', $padding + 1), |
@@ -135,34 +135,34 @@ discard block |
||
135 | 135 | private function renderTrace(\Throwable $e, Highlighter $h = null): string |
136 | 136 | { |
137 | 137 | $stacktrace = $this->getStacktrace($e); |
138 | - if (empty($stacktrace)) { |
|
138 | + if (empty($stacktrace)){ |
|
139 | 139 | return ''; |
140 | 140 | } |
141 | 141 | |
142 | 142 | $result = $this->format("\n<red>Exception Trace:</reset>\n"); |
143 | 143 | |
144 | - foreach ($stacktrace as $trace) { |
|
145 | - if (isset($trace['type']) && isset($trace['class'])) { |
|
144 | + foreach ($stacktrace as $trace){ |
|
145 | + if (isset($trace['type']) && isset($trace['class'])){ |
|
146 | 146 | $line = $this->format( |
147 | 147 | ' <white>%s%s%s()</reset>', |
148 | 148 | $trace['class'], |
149 | 149 | $trace['type'], |
150 | 150 | $trace['function'] |
151 | 151 | ); |
152 | - } else { |
|
152 | + }else{ |
|
153 | 153 | $line = $this->format( |
154 | 154 | ' <white>%s()</reset>', |
155 | 155 | $trace['function'] |
156 | 156 | ); |
157 | 157 | } |
158 | 158 | |
159 | - if (isset($trace['file'])) { |
|
159 | + if (isset($trace['file'])){ |
|
160 | 160 | $line .= $this->format( |
161 | 161 | ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>', |
162 | 162 | $trace['file'], |
163 | 163 | $trace['line'] |
164 | 164 | ); |
165 | - } else { |
|
165 | + }else{ |
|
166 | 166 | $line .= $this->format( |
167 | 167 | ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>', |
168 | 168 | 'n/a', |
@@ -170,14 +170,14 @@ discard block |
||
170 | 170 | ); |
171 | 171 | } |
172 | 172 | |
173 | - $result .= $line . "\n"; |
|
173 | + $result .= $line."\n"; |
|
174 | 174 | |
175 | - if (!empty($h) && !empty($trace['file'])) { |
|
175 | + if (!empty($h) && !empty($trace['file'])){ |
|
176 | 176 | $result .= $h->highlightLines( |
177 | 177 | file_get_contents($trace['file']), |
178 | 178 | $trace['line'], |
179 | 179 | static::SHOW_LINES |
180 | - ) . "\n"; |
|
180 | + )."\n"; |
|
181 | 181 | } |
182 | 182 | } |
183 | 183 | |
@@ -193,13 +193,13 @@ discard block |
||
193 | 193 | */ |
194 | 194 | private function format(string $format, ...$args): string |
195 | 195 | { |
196 | - if (!$this->colorsSupport) { |
|
196 | + if (!$this->colorsSupport){ |
|
197 | 197 | $format = preg_replace('/<[^>]+>/', '', $format); |
198 | - } else { |
|
199 | - $format = preg_replace_callback('/(<([^>]+)>)/', function ($partial) { |
|
198 | + }else{ |
|
199 | + $format = preg_replace_callback('/(<([^>]+)>)/', function ($partial){ |
|
200 | 200 | $style = ''; |
201 | - foreach (explode(',', trim($partial[2], '/')) as $color) { |
|
202 | - if (isset(self::COLORS[$color])) { |
|
201 | + foreach (explode(',', trim($partial[2], '/')) as $color){ |
|
202 | + if (isset(self::COLORS[$color])){ |
|
203 | 203 | $style .= self::COLORS[$color]; |
204 | 204 | } |
205 | 205 | } |
@@ -69,9 +69,12 @@ discard block |
||
69 | 69 | { |
70 | 70 | $result = ''; |
71 | 71 | |
72 | - if ($e instanceof \Error) { |
|
72 | + if ($e instanceof \Error) |
|
73 | + { |
|
73 | 74 | $result .= $this->renderHeader('[' . get_class($e) . "]\n" . $e->getMessage(), 'bg:magenta,white'); |
74 | - } else { |
|
75 | + } |
|
76 | + else |
|
77 | + { |
|
75 | 78 | $result .= $this->renderHeader('[' . get_class($e) . "]\n" . $e->getMessage(), 'bg:red,white'); |
76 | 79 | } |
77 | 80 | |
@@ -81,11 +84,14 @@ discard block |
||
81 | 84 | $e->getLine() |
82 | 85 | ); |
83 | 86 | |
84 | - if ($verbosity >= self::VERBOSITY_DEBUG) { |
|
87 | + if ($verbosity >= self::VERBOSITY_DEBUG) |
|
88 | + { |
|
85 | 89 | $result .= $this->renderTrace($e, new Highlighter( |
86 | 90 | $this->colorsSupport ? new ConsoleStyle() : new PlainStyle() |
87 | 91 | )); |
88 | - } elseif ($verbosity >= self::VERBOSITY_VERBOSE) { |
|
92 | + } |
|
93 | + elseif ($verbosity >= self::VERBOSITY_VERBOSE) |
|
94 | + { |
|
89 | 95 | $result .= $this->renderTrace($e); |
90 | 96 | } |
91 | 97 | |
@@ -113,7 +119,8 @@ discard block |
||
113 | 119 | |
114 | 120 | $length += $padding; |
115 | 121 | |
116 | - foreach ($lines as $line) { |
|
122 | + foreach ($lines as $line) |
|
123 | + { |
|
117 | 124 | $result .= $this->format( |
118 | 125 | "<{$style}>%s%s%s</reset>\n", |
119 | 126 | str_repeat(' ', $padding + 1), |
@@ -135,34 +142,42 @@ discard block |
||
135 | 142 | private function renderTrace(\Throwable $e, Highlighter $h = null): string |
136 | 143 | { |
137 | 144 | $stacktrace = $this->getStacktrace($e); |
138 | - if (empty($stacktrace)) { |
|
145 | + if (empty($stacktrace)) |
|
146 | + { |
|
139 | 147 | return ''; |
140 | 148 | } |
141 | 149 | |
142 | 150 | $result = $this->format("\n<red>Exception Trace:</reset>\n"); |
143 | 151 | |
144 | - foreach ($stacktrace as $trace) { |
|
145 | - if (isset($trace['type']) && isset($trace['class'])) { |
|
152 | + foreach ($stacktrace as $trace) |
|
153 | + { |
|
154 | + if (isset($trace['type']) && isset($trace['class'])) |
|
155 | + { |
|
146 | 156 | $line = $this->format( |
147 | 157 | ' <white>%s%s%s()</reset>', |
148 | 158 | $trace['class'], |
149 | 159 | $trace['type'], |
150 | 160 | $trace['function'] |
151 | 161 | ); |
152 | - } else { |
|
162 | + } |
|
163 | + else |
|
164 | + { |
|
153 | 165 | $line = $this->format( |
154 | 166 | ' <white>%s()</reset>', |
155 | 167 | $trace['function'] |
156 | 168 | ); |
157 | 169 | } |
158 | 170 | |
159 | - if (isset($trace['file'])) { |
|
171 | + if (isset($trace['file'])) |
|
172 | + { |
|
160 | 173 | $line .= $this->format( |
161 | 174 | ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>', |
162 | 175 | $trace['file'], |
163 | 176 | $trace['line'] |
164 | 177 | ); |
165 | - } else { |
|
178 | + } |
|
179 | + else |
|
180 | + { |
|
166 | 181 | $line .= $this->format( |
167 | 182 | ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>', |
168 | 183 | 'n/a', |
@@ -172,7 +187,8 @@ discard block |
||
172 | 187 | |
173 | 188 | $result .= $line . "\n"; |
174 | 189 | |
175 | - if (!empty($h) && !empty($trace['file'])) { |
|
190 | + if (!empty($h) && !empty($trace['file'])) |
|
191 | + { |
|
176 | 192 | $result .= $h->highlightLines( |
177 | 193 | file_get_contents($trace['file']), |
178 | 194 | $trace['line'], |
@@ -193,13 +209,19 @@ discard block |
||
193 | 209 | */ |
194 | 210 | private function format(string $format, ...$args): string |
195 | 211 | { |
196 | - if (!$this->colorsSupport) { |
|
212 | + if (!$this->colorsSupport) |
|
213 | + { |
|
197 | 214 | $format = preg_replace('/<[^>]+>/', '', $format); |
198 | - } else { |
|
199 | - $format = preg_replace_callback('/(<([^>]+)>)/', function ($partial) { |
|
215 | + } |
|
216 | + else |
|
217 | + { |
|
218 | + $format = preg_replace_callback('/(<([^>]+)>)/', function ($partial) |
|
219 | + { |
|
200 | 220 | $style = ''; |
201 | - foreach (explode(',', trim($partial[2], '/')) as $color) { |
|
202 | - if (isset(self::COLORS[$color])) { |
|
221 | + foreach (explode(',', trim($partial[2], '/')) as $color) |
|
222 | + { |
|
223 | + if (isset(self::COLORS[$color])) |
|
224 | + { |
|
203 | 225 | $style .= self::COLORS[$color]; |
204 | 226 | } |
205 | 227 | } |
@@ -40,9 +40,9 @@ discard block |
||
40 | 40 | $lines = explode("\n", str_replace("\r\n", "\n", $this->highlight($source))); |
41 | 41 | |
42 | 42 | $result = ''; |
43 | - foreach ($lines as $number => $code) { |
|
43 | + foreach ($lines as $number => $code){ |
|
44 | 44 | $human = $number + 1; |
45 | - if (!empty($around) && ($human < $line - $around || $human >= $line + $around + 1)) { |
|
45 | + if (!empty($around) && ($human < $line - $around || $human >= $line + $around + 1)){ |
|
46 | 46 | //Not included in a range |
47 | 47 | continue; |
48 | 48 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | { |
64 | 64 | $result = ''; |
65 | 65 | $previous = []; |
66 | - foreach ($this->getTokens($source) as $token) { |
|
66 | + foreach ($this->getTokens($source) as $token){ |
|
67 | 67 | $result .= $this->r->token($token, $previous); |
68 | 68 | $previous = $token; |
69 | 69 | } |
@@ -82,12 +82,12 @@ discard block |
||
82 | 82 | $tokens = []; |
83 | 83 | $line = 0; |
84 | 84 | |
85 | - foreach (token_get_all($source) as $token) { |
|
86 | - if (isset($token[2])) { |
|
85 | + foreach (token_get_all($source) as $token){ |
|
86 | + if (isset($token[2])){ |
|
87 | 87 | $line = $token[2]; |
88 | 88 | } |
89 | 89 | |
90 | - if (!is_array($token)) { |
|
90 | + if (!is_array($token)){ |
|
91 | 91 | $token = [$token, $token, $line]; |
92 | 92 | } |
93 | 93 |
@@ -40,9 +40,11 @@ discard block |
||
40 | 40 | $lines = explode("\n", str_replace("\r\n", "\n", $this->highlight($source))); |
41 | 41 | |
42 | 42 | $result = ''; |
43 | - foreach ($lines as $number => $code) { |
|
43 | + foreach ($lines as $number => $code) |
|
44 | + { |
|
44 | 45 | $human = $number + 1; |
45 | - if (!empty($around) && ($human < $line - $around || $human >= $line + $around + 1)) { |
|
46 | + if (!empty($around) && ($human < $line - $around || $human >= $line + $around + 1)) |
|
47 | + { |
|
46 | 48 | //Not included in a range |
47 | 49 | continue; |
48 | 50 | } |
@@ -63,7 +65,8 @@ discard block |
||
63 | 65 | { |
64 | 66 | $result = ''; |
65 | 67 | $previous = []; |
66 | - foreach ($this->getTokens($source) as $token) { |
|
68 | + foreach ($this->getTokens($source) as $token) |
|
69 | + { |
|
67 | 70 | $result .= $this->r->token($token, $previous); |
68 | 71 | $previous = $token; |
69 | 72 | } |
@@ -82,12 +85,15 @@ discard block |
||
82 | 85 | $tokens = []; |
83 | 86 | $line = 0; |
84 | 87 | |
85 | - foreach (token_get_all($source) as $token) { |
|
86 | - if (isset($token[2])) { |
|
88 | + foreach (token_get_all($source) as $token) |
|
89 | + { |
|
90 | + if (isset($token[2])) |
|
91 | + { |
|
87 | 92 | $line = $token[2]; |
88 | 93 | } |
89 | 94 | |
90 | - if (!is_array($token)) { |
|
95 | + if (!is_array($token)) |
|
96 | + { |
|
91 | 97 | $token = [$token, $token, $line]; |
92 | 98 | } |
93 | 99 |
@@ -56,33 +56,33 @@ |
||
56 | 56 | public function wrap(array $args): array |
57 | 57 | { |
58 | 58 | $result = []; |
59 | - foreach ($args as $arg) { |
|
59 | + foreach ($args as $arg){ |
|
60 | 60 | $display = $type = strtolower(gettype($arg)); |
61 | 61 | |
62 | - if (is_numeric($arg)) { |
|
62 | + if (is_numeric($arg)){ |
|
63 | 63 | $result[] = $this->r->apply($arg, 'value', $type); |
64 | 64 | continue; |
65 | - } elseif (is_bool($arg)) { |
|
65 | + } elseif (is_bool($arg)){ |
|
66 | 66 | $result[] = $this->r->apply($arg ? 'true' : 'false', 'value', $type); |
67 | 67 | continue; |
68 | - } elseif (is_null($arg)) { |
|
68 | + } elseif (is_null($arg)){ |
|
69 | 69 | $result[] = $this->r->apply('null', 'value', $type); |
70 | 70 | continue; |
71 | 71 | } |
72 | 72 | |
73 | - if (is_object($arg)) { |
|
73 | + if (is_object($arg)){ |
|
74 | 74 | $reflection = new \ReflectionClass($arg); |
75 | 75 | $display = sprintf('<span title="%s">%s</span>', $reflection->getName(), $reflection->getShortName()); |
76 | 76 | } |
77 | 77 | |
78 | 78 | $type = $this->r->apply($display, 'value', $type); |
79 | 79 | |
80 | - if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG) { |
|
80 | + if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG){ |
|
81 | 81 | $result[] = sprintf('<span>%s</span>', $type); |
82 | - } else { |
|
82 | + }else{ |
|
83 | 83 | $hash = is_object($arg) ? spl_object_hash($arg) : md5(json_encode($arg)); |
84 | 84 | |
85 | - if (!isset($this->values[$hash])) { |
|
85 | + if (!isset($this->values[$hash])){ |
|
86 | 86 | $this->values[$hash] = $this->dumper->dump($arg, Dumper::RETURN); |
87 | 87 | } |
88 | 88 |
@@ -56,33 +56,44 @@ |
||
56 | 56 | public function wrap(array $args): array |
57 | 57 | { |
58 | 58 | $result = []; |
59 | - foreach ($args as $arg) { |
|
59 | + foreach ($args as $arg) |
|
60 | + { |
|
60 | 61 | $display = $type = strtolower(gettype($arg)); |
61 | 62 | |
62 | - if (is_numeric($arg)) { |
|
63 | + if (is_numeric($arg)) |
|
64 | + { |
|
63 | 65 | $result[] = $this->r->apply($arg, 'value', $type); |
64 | 66 | continue; |
65 | - } elseif (is_bool($arg)) { |
|
67 | + } |
|
68 | + elseif (is_bool($arg)) |
|
69 | + { |
|
66 | 70 | $result[] = $this->r->apply($arg ? 'true' : 'false', 'value', $type); |
67 | 71 | continue; |
68 | - } elseif (is_null($arg)) { |
|
72 | + } |
|
73 | + elseif (is_null($arg)) |
|
74 | + { |
|
69 | 75 | $result[] = $this->r->apply('null', 'value', $type); |
70 | 76 | continue; |
71 | 77 | } |
72 | 78 | |
73 | - if (is_object($arg)) { |
|
79 | + if (is_object($arg)) |
|
80 | + { |
|
74 | 81 | $reflection = new \ReflectionClass($arg); |
75 | 82 | $display = sprintf('<span title="%s">%s</span>', $reflection->getName(), $reflection->getShortName()); |
76 | 83 | } |
77 | 84 | |
78 | 85 | $type = $this->r->apply($display, 'value', $type); |
79 | 86 | |
80 | - if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG) { |
|
87 | + if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG) |
|
88 | + { |
|
81 | 89 | $result[] = sprintf('<span>%s</span>', $type); |
82 | - } else { |
|
90 | + } |
|
91 | + else |
|
92 | + { |
|
83 | 93 | $hash = is_object($arg) ? spl_object_hash($arg) : md5(json_encode($arg)); |
84 | 94 | |
85 | - if (!isset($this->values[$hash])) { |
|
95 | + if (!isset($this->values[$hash])) |
|
96 | + { |
|
86 | 97 | $this->values[$hash] = $this->dumper->dump($arg, Dumper::RETURN); |
87 | 98 | } |
88 | 99 |
@@ -83,7 +83,7 @@ |
||
83 | 83 | $hash = is_object($arg) ? spl_object_hash($arg) : md5(json_encode($arg)); |
84 | 84 | |
85 | 85 | if (!isset($this->values[$hash])) { |
86 | - $this->values[$hash] = $this->dumper->dump($arg, Dumper::RETURN); |
|
86 | + $this->values[$hash] = $this->dumper->dump($arg, Dumper::return); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | $result[] = sprintf('<span onclick="_da(\'%s\')">%s</span>', $hash, $type); |