@@ -4,23 +4,23 @@ discard block |
||
4 | 4 | * @var Throwable $exception |
5 | 5 | * @var \Spiral\Exceptions\ValueWrapper $valueWrapper |
6 | 6 | */ |
7 | -foreach ($stacktrace as $index => $trace) { |
|
8 | - if (empty($trace['file']) && isset($stacktrace[$index - 1]['file'])) { |
|
7 | +foreach ($stacktrace as $index => $trace){ |
|
8 | + if (empty($trace['file']) && isset($stacktrace[$index - 1]['file'])){ |
|
9 | 9 | $trace['file'] = $stacktrace[$index - 1]['file']; |
10 | 10 | $trace['line'] = $stacktrace[$index - 1]['line']; |
11 | 11 | } |
12 | 12 | |
13 | - if (!isset($stacktrace[$index + 1])) { |
|
13 | + if (!isset($stacktrace[$index + 1])){ |
|
14 | 14 | $trace['file'] = $exception->getFile(); |
15 | 15 | $trace['line'] = $exception->getLine(); |
16 | 16 | } |
17 | 17 | |
18 | - if (!isset($trace['function']) || !isset($trace['file'])) { |
|
18 | + if (!isset($trace['function']) || !isset($trace['file'])){ |
|
19 | 19 | continue; |
20 | 20 | } |
21 | 21 | |
22 | - $function = '<strong>' . $trace['function'] . '</strong>'; |
|
23 | - if (isset($trace['type']) && isset($trace['class'])) { |
|
22 | + $function = '<strong>'.$trace['function'].'</strong>'; |
|
23 | + if (isset($trace['type']) && isset($trace['class'])){ |
|
24 | 24 | $reflection = new ReflectionClass($trace['class']); |
25 | 25 | $function = sprintf( |
26 | 26 | '<span title="%s">%s</span>%s%s', |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | $args = []; |
35 | - if (isset($trace['args'])) { |
|
35 | + if (isset($trace['args'])){ |
|
36 | 36 | $args = $valueWrapper->wrap($trace['args']); |
37 | 37 | } ?> |
38 | 38 | <div class="call"> |
@@ -4,23 +4,28 @@ discard block |
||
4 | 4 | * @var Throwable $exception |
5 | 5 | * @var \Spiral\Exceptions\ValueWrapper $valueWrapper |
6 | 6 | */ |
7 | -foreach ($stacktrace as $index => $trace) { |
|
8 | - if (empty($trace['file']) && isset($stacktrace[$index - 1]['file'])) { |
|
7 | +foreach ($stacktrace as $index => $trace) |
|
8 | +{ |
|
9 | + if (empty($trace['file']) && isset($stacktrace[$index - 1]['file'])) |
|
10 | + { |
|
9 | 11 | $trace['file'] = $stacktrace[$index - 1]['file']; |
10 | 12 | $trace['line'] = $stacktrace[$index - 1]['line']; |
11 | 13 | } |
12 | 14 | |
13 | - if (!isset($stacktrace[$index + 1])) { |
|
15 | + if (!isset($stacktrace[$index + 1])) |
|
16 | + { |
|
14 | 17 | $trace['file'] = $exception->getFile(); |
15 | 18 | $trace['line'] = $exception->getLine(); |
16 | 19 | } |
17 | 20 | |
18 | - if (!isset($trace['function']) || !isset($trace['file'])) { |
|
21 | + if (!isset($trace['function']) || !isset($trace['file'])) |
|
22 | + { |
|
19 | 23 | continue; |
20 | 24 | } |
21 | 25 | |
22 | 26 | $function = '<strong>' . $trace['function'] . '</strong>'; |
23 | - if (isset($trace['type']) && isset($trace['class'])) { |
|
27 | + if (isset($trace['type']) && isset($trace['class'])) |
|
28 | + { |
|
24 | 29 | $reflection = new ReflectionClass($trace['class']); |
25 | 30 | $function = sprintf( |
26 | 31 | '<span title="%s">%s</span>%s%s', |
@@ -32,7 +37,8 @@ discard block |
||
32 | 37 | } |
33 | 38 | |
34 | 39 | $args = []; |
35 | - if (isset($trace['args'])) { |
|
40 | + if (isset($trace['args'])) |
|
41 | + { |
|
36 | 42 | $args = $valueWrapper->wrap($trace['args']); |
37 | 43 | } ?> |
38 | 44 | <div class="call"> |
@@ -25,17 +25,17 @@ discard block |
||
25 | 25 | { |
26 | 26 | $result = ''; |
27 | 27 | |
28 | - if ($e instanceof \Error) { |
|
29 | - $result .= '[' . get_class($e) . "]\n" . $e->getMessage(); |
|
30 | - } else { |
|
31 | - $result .= '[' . get_class($e) . "]\n" . $e->getMessage(); |
|
28 | + if ($e instanceof \Error){ |
|
29 | + $result .= '['.get_class($e)."]\n".$e->getMessage(); |
|
30 | + }else{ |
|
31 | + $result .= '['.get_class($e)."]\n".$e->getMessage(); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | $result .= sprintf("in %s:%s\n", $e->getFile(), $e->getLine()); |
35 | 35 | |
36 | - if ($verbosity >= self::VERBOSITY_DEBUG) { |
|
36 | + if ($verbosity >= self::VERBOSITY_DEBUG){ |
|
37 | 37 | $result .= $this->renderTrace($e, new Highlighter(new PlainStyle())); |
38 | - } elseif ($verbosity >= self::VERBOSITY_VERBOSE) { |
|
38 | + } elseif ($verbosity >= self::VERBOSITY_VERBOSE){ |
|
39 | 39 | $result .= $this->renderTrace($e); |
40 | 40 | } |
41 | 41 | |
@@ -52,38 +52,38 @@ discard block |
||
52 | 52 | private function renderTrace(\Throwable $e, Highlighter $h = null): string |
53 | 53 | { |
54 | 54 | $stacktrace = $this->getStacktrace($e); |
55 | - if (empty($stacktrace)) { |
|
55 | + if (empty($stacktrace)){ |
|
56 | 56 | return ''; |
57 | 57 | } |
58 | 58 | |
59 | 59 | $result = "\nException Trace:\n"; |
60 | 60 | |
61 | - foreach ($stacktrace as $trace) { |
|
62 | - if (isset($trace['type']) && isset($trace['class'])) { |
|
61 | + foreach ($stacktrace as $trace){ |
|
62 | + if (isset($trace['type']) && isset($trace['class'])){ |
|
63 | 63 | $line = sprintf( |
64 | 64 | ' %s%s%s()', |
65 | 65 | $trace['class'], |
66 | 66 | $trace['type'], |
67 | 67 | $trace['function'] |
68 | 68 | ); |
69 | - } else { |
|
69 | + }else{ |
|
70 | 70 | $line = $trace['function']; |
71 | 71 | } |
72 | 72 | |
73 | - if (isset($trace['file'])) { |
|
73 | + if (isset($trace['file'])){ |
|
74 | 74 | $line .= sprintf(' at %s:%s', $trace['file'], $trace['line']); |
75 | - } else { |
|
75 | + }else{ |
|
76 | 76 | $line .= sprintf(' at %s:%s', 'n/a', 'n/a'); |
77 | 77 | } |
78 | 78 | |
79 | - $result .= $line . "\n"; |
|
79 | + $result .= $line."\n"; |
|
80 | 80 | |
81 | - if (!empty($h) && !empty($trace['file'])) { |
|
81 | + if (!empty($h) && !empty($trace['file'])){ |
|
82 | 82 | $result .= $h->highlightLines( |
83 | 83 | file_get_contents($trace['file']), |
84 | 84 | $trace['line'], |
85 | 85 | static::SHOW_LINES |
86 | - ) . "\n"; |
|
86 | + )."\n"; |
|
87 | 87 | } |
88 | 88 | } |
89 | 89 |
@@ -25,17 +25,23 @@ discard block |
||
25 | 25 | { |
26 | 26 | $result = ''; |
27 | 27 | |
28 | - if ($e instanceof \Error) { |
|
28 | + if ($e instanceof \Error) |
|
29 | + { |
|
29 | 30 | $result .= '[' . get_class($e) . "]\n" . $e->getMessage(); |
30 | - } else { |
|
31 | + } |
|
32 | + else |
|
33 | + { |
|
31 | 34 | $result .= '[' . get_class($e) . "]\n" . $e->getMessage(); |
32 | 35 | } |
33 | 36 | |
34 | 37 | $result .= sprintf("in %s:%s\n", $e->getFile(), $e->getLine()); |
35 | 38 | |
36 | - if ($verbosity >= self::VERBOSITY_DEBUG) { |
|
39 | + if ($verbosity >= self::VERBOSITY_DEBUG) |
|
40 | + { |
|
37 | 41 | $result .= $this->renderTrace($e, new Highlighter(new PlainStyle())); |
38 | - } elseif ($verbosity >= self::VERBOSITY_VERBOSE) { |
|
42 | + } |
|
43 | + elseif ($verbosity >= self::VERBOSITY_VERBOSE) |
|
44 | + { |
|
39 | 45 | $result .= $this->renderTrace($e); |
40 | 46 | } |
41 | 47 | |
@@ -52,33 +58,42 @@ discard block |
||
52 | 58 | private function renderTrace(\Throwable $e, Highlighter $h = null): string |
53 | 59 | { |
54 | 60 | $stacktrace = $this->getStacktrace($e); |
55 | - if (empty($stacktrace)) { |
|
61 | + if (empty($stacktrace)) |
|
62 | + { |
|
56 | 63 | return ''; |
57 | 64 | } |
58 | 65 | |
59 | 66 | $result = "\nException Trace:\n"; |
60 | 67 | |
61 | - foreach ($stacktrace as $trace) { |
|
62 | - if (isset($trace['type']) && isset($trace['class'])) { |
|
68 | + foreach ($stacktrace as $trace) |
|
69 | + { |
|
70 | + if (isset($trace['type']) && isset($trace['class'])) |
|
71 | + { |
|
63 | 72 | $line = sprintf( |
64 | 73 | ' %s%s%s()', |
65 | 74 | $trace['class'], |
66 | 75 | $trace['type'], |
67 | 76 | $trace['function'] |
68 | 77 | ); |
69 | - } else { |
|
78 | + } |
|
79 | + else |
|
80 | + { |
|
70 | 81 | $line = $trace['function']; |
71 | 82 | } |
72 | 83 | |
73 | - if (isset($trace['file'])) { |
|
84 | + if (isset($trace['file'])) |
|
85 | + { |
|
74 | 86 | $line .= sprintf(' at %s:%s', $trace['file'], $trace['line']); |
75 | - } else { |
|
87 | + } |
|
88 | + else |
|
89 | + { |
|
76 | 90 | $line .= sprintf(' at %s:%s', 'n/a', 'n/a'); |
77 | 91 | } |
78 | 92 | |
79 | 93 | $result .= $line . "\n"; |
80 | 94 | |
81 | - if (!empty($h) && !empty($trace['file'])) { |
|
95 | + if (!empty($h) && !empty($trace['file'])) |
|
96 | + { |
|
82 | 97 | $result .= $h->highlightLines( |
83 | 98 | file_get_contents($trace['file']), |
84 | 99 | $trace['line'], |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | /** |
25 | 25 | * Visual styles. |
26 | 26 | */ |
27 | - public const DEFAULT = 'default'; |
|
27 | + public const default = 'default'; |
|
28 | 28 | public const INVERTED = 'inverted'; |
29 | 29 | |
30 | 30 | /** @var HtmlRenderer */ |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | protected $highlighter = null; |
35 | 35 | |
36 | 36 | /** @var string */ |
37 | - protected $style = self::DEFAULT; |
|
37 | + protected $style = self::default; |
|
38 | 38 | |
39 | 39 | /** @var Dumper */ |
40 | 40 | protected $dumper = null; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | /** |
46 | 46 | * @param string $style |
47 | 47 | */ |
48 | - public function __construct(string $style = self::DEFAULT) |
|
48 | + public function __construct(string $style = self::default) |
|
49 | 49 | { |
50 | 50 | $this->style = $style; |
51 | 51 | $this->dumper = new Dumper(); |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | $this->renderer = new HtmlRenderer(HtmlRenderer::INVERTED); |
55 | 55 | $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::INVERTED)); |
56 | 56 | } else { |
57 | - $this->renderer = new HtmlRenderer(HtmlRenderer::DEFAULT); |
|
58 | - $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::DEFAULT)); |
|
57 | + $this->renderer = new HtmlRenderer(HtmlRenderer::default); |
|
58 | + $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::default)); |
|
59 | 59 | } |
60 | 60 | |
61 | - $this->dumper->setRenderer(Dumper::RETURN, $this->renderer); |
|
61 | + $this->dumper->setRenderer(Dumper::return, $this->renderer); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -50,10 +50,10 @@ discard block |
||
50 | 50 | $this->style = $style; |
51 | 51 | $this->dumper = new Dumper(); |
52 | 52 | |
53 | - if ($style == self::INVERTED) { |
|
53 | + if ($style == self::INVERTED){ |
|
54 | 54 | $this->renderer = new HtmlRenderer(HtmlRenderer::INVERTED); |
55 | 55 | $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::INVERTED)); |
56 | - } else { |
|
56 | + }else{ |
|
57 | 57 | $this->renderer = new HtmlRenderer(HtmlRenderer::DEFAULT); |
58 | 58 | $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::DEFAULT)); |
59 | 59 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | 'message' => $this->getMessage($e), |
83 | 83 | 'exception' => $e, |
84 | 84 | 'valueWrapper' => new ValueWrapper($this->dumper, $this->renderer, $verbosity), |
85 | - 'style' => $this->render('styles/' . $this->style), |
|
85 | + 'style' => $this->render('styles/'.$this->style), |
|
86 | 86 | 'footer' => $this->render('partials/footer'), |
87 | 87 | 'variables' => '', |
88 | 88 | 'logs' => '', |
@@ -105,20 +105,20 @@ discard block |
||
105 | 105 | 'valueWrapper' => $options['valueWrapper'], |
106 | 106 | ]); |
107 | 107 | |
108 | - if ($this->state !== null) { |
|
109 | - if ($this->state->getTags() !== []) { |
|
108 | + if ($this->state !== null){ |
|
109 | + if ($this->state->getTags() !== []){ |
|
110 | 110 | $options['tags'] = $this->render('partials/tags', [ |
111 | 111 | 'tags' => $this->state->getTags(), |
112 | 112 | ]); |
113 | 113 | } |
114 | 114 | |
115 | - if ($this->state->getLogEvents() !== []) { |
|
115 | + if ($this->state->getLogEvents() !== []){ |
|
116 | 116 | $options['logs'] = $this->render('partials/logs', [ |
117 | 117 | 'logEvents' => $this->state->getLogEvents(), |
118 | 118 | ]); |
119 | 119 | } |
120 | 120 | |
121 | - if ($this->state->getVariables() !== []) { |
|
121 | + if ($this->state->getVariables() !== []){ |
|
122 | 122 | $options['variables'] = $this->render('partials/variables', [ |
123 | 123 | 'variables' => $this->state->getVariables(), |
124 | 124 | ]); |
@@ -50,10 +50,13 @@ discard block |
||
50 | 50 | $this->style = $style; |
51 | 51 | $this->dumper = new Dumper(); |
52 | 52 | |
53 | - if ($style == self::INVERTED) { |
|
53 | + if ($style == self::INVERTED) |
|
54 | + { |
|
54 | 55 | $this->renderer = new HtmlRenderer(HtmlRenderer::INVERTED); |
55 | 56 | $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::INVERTED)); |
56 | - } else { |
|
57 | + } |
|
58 | + else |
|
59 | + { |
|
57 | 60 | $this->renderer = new HtmlRenderer(HtmlRenderer::DEFAULT); |
58 | 61 | $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::DEFAULT)); |
59 | 62 | } |
@@ -105,20 +108,24 @@ discard block |
||
105 | 108 | 'valueWrapper' => $options['valueWrapper'], |
106 | 109 | ]); |
107 | 110 | |
108 | - if ($this->state !== null) { |
|
109 | - if ($this->state->getTags() !== []) { |
|
111 | + if ($this->state !== null) |
|
112 | + { |
|
113 | + if ($this->state->getTags() !== []) |
|
114 | + { |
|
110 | 115 | $options['tags'] = $this->render('partials/tags', [ |
111 | 116 | 'tags' => $this->state->getTags(), |
112 | 117 | ]); |
113 | 118 | } |
114 | 119 | |
115 | - if ($this->state->getLogEvents() !== []) { |
|
120 | + if ($this->state->getLogEvents() !== []) |
|
121 | + { |
|
116 | 122 | $options['logs'] = $this->render('partials/logs', [ |
117 | 123 | 'logEvents' => $this->state->getLogEvents(), |
118 | 124 | ]); |
119 | 125 | } |
120 | 126 | |
121 | - if ($this->state->getVariables() !== []) { |
|
127 | + if ($this->state->getVariables() !== []) |
|
128 | + { |
|
122 | 129 | $options['variables'] = $this->render('partials/variables', [ |
123 | 130 | 'variables' => $this->state->getVariables(), |
124 | 131 | ]); |
@@ -99,12 +99,14 @@ discard block |
||
99 | 99 | { |
100 | 100 | $style = $this->getStyle($token, $previous); |
101 | 101 | |
102 | - if (strpos($token[1], "\n") === false) { |
|
102 | + if (strpos($token[1], "\n") === false) |
|
103 | + { |
|
103 | 104 | return sprintf($this->templates['token'], $style, $token[1]); |
104 | 105 | } |
105 | 106 | |
106 | 107 | $lines = []; |
107 | - foreach (explode("\n", $token[1]) as $line) { |
|
108 | + foreach (explode("\n", $token[1]) as $line) |
|
109 | + { |
|
108 | 110 | $lines[] = sprintf($this->templates['token'], $style, $line); |
109 | 111 | } |
110 | 112 | |
@@ -132,16 +134,21 @@ discard block |
||
132 | 134 | */ |
133 | 135 | private function getStyle(array $token, array $previous): string |
134 | 136 | { |
135 | - if (!empty($previous)) { |
|
136 | - foreach ($this->style as $style => $tokens) { |
|
137 | - if (in_array($previous[1] . $token[0], $tokens)) { |
|
137 | + if (!empty($previous)) |
|
138 | + { |
|
139 | + foreach ($this->style as $style => $tokens) |
|
140 | + { |
|
141 | + if (in_array($previous[1] . $token[0], $tokens)) |
|
142 | + { |
|
138 | 143 | return $style; |
139 | 144 | } |
140 | 145 | } |
141 | 146 | } |
142 | 147 | |
143 | - foreach ($this->style as $style => $tokens) { |
|
144 | - if (in_array($token[0], $tokens)) { |
|
148 | + foreach ($this->style as $style => $tokens) |
|
149 | + { |
|
150 | + if (in_array($token[0], $tokens)) |
|
151 | + { |
|
145 | 152 | return $style; |
146 | 153 | } |
147 | 154 | } |
@@ -21,9 +21,9 @@ discard block |
||
21 | 21 | { |
22 | 22 | /** @var array */ |
23 | 23 | protected $templates = [ |
24 | - 'token' => '%s%s' . Color::RESET, |
|
25 | - 'line' => Color::LIGHT_CYAN . ' %s ' . Color::RESET . " %s\n", |
|
26 | - 'active' => Color::BG_RED . ' ' . Color::LIGHT_WHITE . '%s ' . Color::RESET . " %s\n", |
|
24 | + 'token' => '%s%s'.Color::RESET, |
|
25 | + 'line' => Color::LIGHT_CYAN.' %s '.Color::RESET." %s\n", |
|
26 | + 'active' => Color::BG_RED.' '.Color::LIGHT_WHITE.'%s '.Color::RESET." %s\n", |
|
27 | 27 | ]; |
28 | 28 | |
29 | 29 | /** @var array */ |
@@ -87,8 +87,8 @@ discard block |
||
87 | 87 | T_VARIABLE, |
88 | 88 | ], |
89 | 89 | Color::LIGHT_YELLOW => [ |
90 | - '->' . T_STRING, |
|
91 | - '::' . T_STRING, |
|
90 | + '->'.T_STRING, |
|
91 | + '::'.T_STRING, |
|
92 | 92 | ], |
93 | 93 | ]; |
94 | 94 | |
@@ -99,12 +99,12 @@ discard block |
||
99 | 99 | { |
100 | 100 | $style = $this->getStyle($token, $previous); |
101 | 101 | |
102 | - if (strpos($token[1], "\n") === false) { |
|
102 | + if (strpos($token[1], "\n") === false){ |
|
103 | 103 | return sprintf($this->templates['token'], $style, $token[1]); |
104 | 104 | } |
105 | 105 | |
106 | 106 | $lines = []; |
107 | - foreach (explode("\n", $token[1]) as $line) { |
|
107 | + foreach (explode("\n", $token[1]) as $line){ |
|
108 | 108 | $lines[] = sprintf($this->templates['token'], $style, $line); |
109 | 109 | } |
110 | 110 | |
@@ -132,16 +132,16 @@ discard block |
||
132 | 132 | */ |
133 | 133 | private function getStyle(array $token, array $previous): string |
134 | 134 | { |
135 | - if (!empty($previous)) { |
|
136 | - foreach ($this->style as $style => $tokens) { |
|
137 | - if (in_array($previous[1] . $token[0], $tokens)) { |
|
135 | + if (!empty($previous)){ |
|
136 | + foreach ($this->style as $style => $tokens){ |
|
137 | + if (in_array($previous[1].$token[0], $tokens)){ |
|
138 | 138 | return $style; |
139 | 139 | } |
140 | 140 | } |
141 | 141 | } |
142 | 142 | |
143 | - foreach ($this->style as $style => $tokens) { |
|
144 | - if (in_array($token[0], $tokens)) { |
|
143 | + foreach ($this->style as $style => $tokens){ |
|
144 | + if (in_array($token[0], $tokens)){ |
|
145 | 145 | return $style; |
146 | 146 | } |
147 | 147 | } |
@@ -186,12 +186,14 @@ discard block |
||
186 | 186 | { |
187 | 187 | $style = $this->getStyle($token, $previous); |
188 | 188 | |
189 | - if (strpos($token[1], "\n") === false) { |
|
189 | + if (strpos($token[1], "\n") === false) |
|
190 | + { |
|
190 | 191 | return sprintf($this->templates['token'], $style, htmlspecialchars($token[1])); |
191 | 192 | } |
192 | 193 | |
193 | 194 | $lines = []; |
194 | - foreach (explode("\n", $token[1]) as $line) { |
|
195 | + foreach (explode("\n", $token[1]) as $line) |
|
196 | + { |
|
195 | 197 | $lines[] = sprintf($this->templates['token'], $style, htmlspecialchars($line)); |
196 | 198 | } |
197 | 199 | |
@@ -215,16 +217,21 @@ discard block |
||
215 | 217 | */ |
216 | 218 | private function getStyle(array $token, array $previous): string |
217 | 219 | { |
218 | - if (!empty($previous)) { |
|
219 | - foreach ($this->style as $style => $tokens) { |
|
220 | - if (in_array($previous[1] . $token[0], $tokens)) { |
|
220 | + if (!empty($previous)) |
|
221 | + { |
|
222 | + foreach ($this->style as $style => $tokens) |
|
223 | + { |
|
224 | + if (in_array($previous[1] . $token[0], $tokens)) |
|
225 | + { |
|
221 | 226 | return $style; |
222 | 227 | } |
223 | 228 | } |
224 | 229 | } |
225 | 230 | |
226 | - foreach ($this->style as $style => $tokens) { |
|
227 | - if (in_array($token[0], $tokens)) { |
|
231 | + foreach ($this->style as $style => $tokens) |
|
232 | + { |
|
233 | + if (in_array($token[0], $tokens)) |
|
234 | + { |
|
228 | 235 | return $style; |
229 | 236 | } |
230 | 237 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | /** |
23 | 23 | * Default code styles. |
24 | 24 | */ |
25 | - public const DEFAULT = [ |
|
25 | + public const default = [ |
|
26 | 26 | 'color: blue; font-weight: bold;' => [ |
27 | 27 | T_STATIC, |
28 | 28 | T_PUBLIC, |
@@ -169,12 +169,12 @@ discard block |
||
169 | 169 | * |
170 | 170 | * @var array |
171 | 171 | */ |
172 | - protected $style = self::DEFAULT; |
|
172 | + protected $style = self::default; |
|
173 | 173 | |
174 | 174 | /** |
175 | 175 | * @param array $style |
176 | 176 | */ |
177 | - public function __construct(array $style = self::DEFAULT) |
|
177 | + public function __construct(array $style = self::default) |
|
178 | 178 | { |
179 | 179 | $this->style = $style; |
180 | 180 | } |
@@ -148,8 +148,8 @@ discard block |
||
148 | 148 | T_VARIABLE, |
149 | 149 | ], |
150 | 150 | 'color: #E6D100;' => [ |
151 | - '->' . T_STRING, |
|
152 | - '::' . T_STRING, |
|
151 | + '->'.T_STRING, |
|
152 | + '::'.T_STRING, |
|
153 | 153 | ], |
154 | 154 | ]; |
155 | 155 | |
@@ -186,12 +186,12 @@ discard block |
||
186 | 186 | { |
187 | 187 | $style = $this->getStyle($token, $previous); |
188 | 188 | |
189 | - if (strpos($token[1], "\n") === false) { |
|
189 | + if (strpos($token[1], "\n") === false){ |
|
190 | 190 | return sprintf($this->templates['token'], $style, htmlspecialchars($token[1])); |
191 | 191 | } |
192 | 192 | |
193 | 193 | $lines = []; |
194 | - foreach (explode("\n", $token[1]) as $line) { |
|
194 | + foreach (explode("\n", $token[1]) as $line){ |
|
195 | 195 | $lines[] = sprintf($this->templates['token'], $style, htmlspecialchars($line)); |
196 | 196 | } |
197 | 197 | |
@@ -215,16 +215,16 @@ discard block |
||
215 | 215 | */ |
216 | 216 | private function getStyle(array $token, array $previous): string |
217 | 217 | { |
218 | - if (!empty($previous)) { |
|
219 | - foreach ($this->style as $style => $tokens) { |
|
220 | - if (in_array($previous[1] . $token[0], $tokens)) { |
|
218 | + if (!empty($previous)){ |
|
219 | + foreach ($this->style as $style => $tokens){ |
|
220 | + if (in_array($previous[1].$token[0], $tokens)){ |
|
221 | 221 | return $style; |
222 | 222 | } |
223 | 223 | } |
224 | 224 | } |
225 | 225 | |
226 | - foreach ($this->style as $style => $tokens) { |
|
227 | - if (in_array($token[0], $tokens)) { |
|
226 | + foreach ($this->style as $style => $tokens){ |
|
227 | + if (in_array($token[0], $tokens)){ |
|
228 | 228 | return $style; |
229 | 229 | } |
230 | 230 | } |
@@ -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); |