Passed
Pull Request — master (#1196)
by Abdul Malik
11:01
created
src/Exceptions/src/Renderer/ConsoleRenderer.php 2 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
         $exceptions = [$exception];
69 69
         $currentE = $exception;
70 70
 
71
-        while ($exception = $exception->getPrevious()) {
71
+        while ($exception = $exception->getPrevious()){
72 72
             $exceptions[] = $exception;
73 73
         }
74 74
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         $result = [];
78 78
         $rootDir = \getcwd();
79 79
 
80
-        foreach ($exceptions as $exception) {
80
+        foreach ($exceptions as $exception){
81 81
             $prefix = $currentE === $exception ? '' : 'Previous: ';
82 82
             $row = $this->renderHeader(
83 83
                 \sprintf("%s[%s]\n%s", $prefix, $exception::class, $exception->getMessage()),
@@ -94,14 +94,14 @@  discard block
 block discarded – undo
94 94
                 $exception->getLine()
95 95
             );
96 96
 
97
-            if ($verbosity->value >= Verbosity::DEBUG->value) {
97
+            if ($verbosity->value >= Verbosity::DEBUG->value){
98 98
                 $row .= $this->renderTrace(
99 99
                     $exception,
100 100
                     new Highlighter(
101 101
                         $this->colorsSupport ? new ConsoleStyle() : new PlainStyle()
102 102
                     )
103 103
                 );
104
-            } elseif ($verbosity->value >= Verbosity::VERBOSE->value) {
104
+            } elseif ($verbosity->value >= Verbosity::VERBOSE->value){
105 105
                 $row .= $this->renderTrace($exception);
106 106
             }
107 107
 
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
         $length += $padding;
134 134
 
135
-        foreach ($lines as $line) {
135
+        foreach ($lines as $line){
136 136
             $result .= $this->format(
137 137
                 "<{$style}>%s%s%s</reset>\n",
138 138
                 \str_repeat('', $padding + 1),
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
     private function renderTrace(\Throwable $e, ?Highlighter $h = null): string
151 151
     {
152 152
         $stacktrace = $this->getStacktrace($e);
153
-        if (empty($stacktrace)) {
153
+        if (empty($stacktrace)){
154 154
             return '';
155 155
         }
156 156
 
@@ -159,16 +159,16 @@  discard block
 block discarded – undo
159 159
 
160 160
         $pad = \strlen((string)\count($stacktrace));
161 161
 
162
-        foreach ($stacktrace as $i => $trace) {
163
-            $file = isset($trace['file']) ? (string) $trace['file'] : null;
162
+        foreach ($stacktrace as $i => $trace){
163
+            $file = isset($trace['file']) ? (string)$trace['file'] : null;
164 164
             $classColor = 'while';
165 165
 
166
-            if ($file !== null) {
166
+            if ($file !== null){
167 167
                 \str_starts_with($file, $rootDir) and $file = \substr($file, \strlen($rootDir) + 1);
168 168
                 $classColor = \str_starts_with($file, 'vendor/') ? 'gray' : 'white';
169 169
             }
170 170
 
171
-            if (isset($trace['type'], $trace['class'])) {
171
+            if (isset($trace['type'], $trace['class'])){
172 172
                 $line = $this->format(
173 173
                     "<$classColor>%s.</reset> <white>%s%s%s()</reset>",
174 174
                     \str_pad((string)((int)$i + 1), $pad, ' ', \STR_PAD_LEFT),
@@ -176,13 +176,13 @@  discard block
 block discarded – undo
176 176
                     $trace['type'],
177 177
                     $trace['function']
178 178
                 );
179
-            } else {
179
+            }else{
180 180
                 $line = $this->format(
181 181
                     ' <white>%s()</reset>',
182 182
                     $trace['function']
183 183
                 );
184 184
             }
185
-            if ($file !== null) {
185
+            if ($file !== null){
186 186
                 $line .= $this->format(
187 187
                     ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>',
188 188
                     $file,
@@ -190,21 +190,21 @@  discard block
 block discarded – undo
190 190
                 );
191 191
             }
192 192
 
193
-            if (\in_array($line, $this->lines, true)) {
193
+            if (\in_array($line, $this->lines, true)){
194 194
                 continue;
195 195
             }
196 196
 
197 197
             $this->lines[] = $line;
198 198
 
199
-            $result .= $line . "\n";
199
+            $result .= $line."\n";
200 200
 
201
-            if ($h instanceof \Spiral\Exceptions\Renderer\Highlighter && !empty($trace['file'])) {
201
+            if ($h instanceof \Spiral\Exceptions\Renderer\Highlighter && !empty($trace['file'])){
202 202
                 $str = @\file_get_contents($trace['file']);
203 203
                 $result .= $h->highlightLines(
204 204
                     $str,
205 205
                     $trace['line'],
206 206
                     static::SHOW_LINES
207
-                ) . "\n";
207
+                )."\n";
208 208
                 unset($str);
209 209
             }
210 210
         }
@@ -217,13 +217,13 @@  discard block
 block discarded – undo
217 217
      */
218 218
     private function format(string $format, mixed ...$args): string
219 219
     {
220
-        if (!$this->colorsSupport) {
220
+        if (!$this->colorsSupport){
221 221
             $format = \preg_replace('/<[^>]+>/', '', $format);
222
-        } else {
223
-            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial) {
222
+        }else{
223
+            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial){
224 224
                 $style = '';
225
-                foreach (\explode(',', \trim($partial[2], '/')) as $color) {
226
-                    if (isset(self::COLORS[$color])) {
225
+                foreach (\explode(',', \trim($partial[2], '/')) as $color){
226
+                    if (isset(self::COLORS[$color])){
227 227
                         $style .= self::COLORS[$color];
228 228
                     }
229 229
                 }
@@ -242,12 +242,12 @@  discard block
 block discarded – undo
242 242
      */
243 243
     private function isColorsSupported(mixed $stream = STDOUT): bool
244 244
     {
245
-        if ('Hyper' === \getenv('TERM_PROGRAM')) {
245
+        if ('Hyper' === \getenv('TERM_PROGRAM')){
246 246
             return true;
247 247
         }
248 248
 
249
-        try {
250
-            if (\DIRECTORY_SEPARATOR === '\\') {
249
+        try{
250
+            if (\DIRECTORY_SEPARATOR === '\\'){
251 251
                 return (\function_exists('sapi_windows_vt100_support') && @\sapi_windows_vt100_support($stream))
252 252
                     || \getenv('ANSICON') !== false
253 253
                     || \getenv('ConEmuANSI') === 'ON'
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
             }
256 256
 
257 257
             return @\stream_isatty($stream);
258
-        } catch (\Throwable) {
258
+        }catch (\Throwable){
259 259
             return false;
260 260
         }
261 261
     }
Please login to merge, or discard this patch.
Braces   +48 added lines, -22 removed lines patch added patch discarded remove patch
@@ -68,7 +68,8 @@  discard block
 block discarded – undo
68 68
         $exceptions = [$exception];
69 69
         $currentE = $exception;
70 70
 
71
-        while ($exception = $exception->getPrevious()) {
71
+        while ($exception = $exception->getPrevious())
72
+        {
72 73
             $exceptions[] = $exception;
73 74
         }
74 75
 
@@ -77,7 +78,8 @@  discard block
 block discarded – undo
77 78
         $result = [];
78 79
         $rootDir = \getcwd();
79 80
 
80
-        foreach ($exceptions as $exception) {
81
+        foreach ($exceptions as $exception)
82
+        {
81 83
             $prefix = $currentE === $exception ? '' : 'Previous: ';
82 84
             $row = $this->renderHeader(
83 85
                 \sprintf("%s[%s]\n%s", $prefix, $exception::class, $exception->getMessage()),
@@ -94,14 +96,17 @@  discard block
 block discarded – undo
94 96
                 $exception->getLine()
95 97
             );
96 98
 
97
-            if ($verbosity->value >= Verbosity::DEBUG->value) {
99
+            if ($verbosity->value >= Verbosity::DEBUG->value)
100
+            {
98 101
                 $row .= $this->renderTrace(
99 102
                     $exception,
100 103
                     new Highlighter(
101 104
                         $this->colorsSupport ? new ConsoleStyle() : new PlainStyle()
102 105
                     )
103 106
                 );
104
-            } elseif ($verbosity->value >= Verbosity::VERBOSE->value) {
107
+            }
108
+            elseif ($verbosity->value >= Verbosity::VERBOSE->value)
109
+            {
105 110
                 $row .= $this->renderTrace($exception);
106 111
             }
107 112
 
@@ -132,7 +137,8 @@  discard block
 block discarded – undo
132 137
 
133 138
         $length += $padding;
134 139
 
135
-        foreach ($lines as $line) {
140
+        foreach ($lines as $line)
141
+        {
136 142
             $result .= $this->format(
137 143
                 "<{$style}>%s%s%s</reset>\n",
138 144
                 \str_repeat('', $padding + 1),
@@ -150,7 +156,8 @@  discard block
 block discarded – undo
150 156
     private function renderTrace(\Throwable $e, ?Highlighter $h = null): string
151 157
     {
152 158
         $stacktrace = $this->getStacktrace($e);
153
-        if (empty($stacktrace)) {
159
+        if (empty($stacktrace))
160
+        {
154 161
             return '';
155 162
         }
156 163
 
@@ -159,16 +166,19 @@  discard block
 block discarded – undo
159 166
 
160 167
         $pad = \strlen((string)\count($stacktrace));
161 168
 
162
-        foreach ($stacktrace as $i => $trace) {
169
+        foreach ($stacktrace as $i => $trace)
170
+        {
163 171
             $file = isset($trace['file']) ? (string) $trace['file'] : null;
164 172
             $classColor = 'while';
165 173
 
166
-            if ($file !== null) {
174
+            if ($file !== null)
175
+            {
167 176
                 \str_starts_with($file, $rootDir) and $file = \substr($file, \strlen($rootDir) + 1);
168 177
                 $classColor = \str_starts_with($file, 'vendor/') ? 'gray' : 'white';
169 178
             }
170 179
 
171
-            if (isset($trace['type'], $trace['class'])) {
180
+            if (isset($trace['type'], $trace['class']))
181
+            {
172 182
                 $line = $this->format(
173 183
                     "<$classColor>%s.</reset> <white>%s%s%s()</reset>",
174 184
                     \str_pad((string)((int)$i + 1), $pad, ' ', \STR_PAD_LEFT),
@@ -176,13 +186,16 @@  discard block
 block discarded – undo
176 186
                     $trace['type'],
177 187
                     $trace['function']
178 188
                 );
179
-            } else {
189
+            }
190
+            else
191
+            {
180 192
                 $line = $this->format(
181 193
                     ' <white>%s()</reset>',
182 194
                     $trace['function']
183 195
                 );
184 196
             }
185
-            if ($file !== null) {
197
+            if ($file !== null)
198
+            {
186 199
                 $line .= $this->format(
187 200
                     ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>',
188 201
                     $file,
@@ -190,7 +203,8 @@  discard block
 block discarded – undo
190 203
                 );
191 204
             }
192 205
 
193
-            if (\in_array($line, $this->lines, true)) {
206
+            if (\in_array($line, $this->lines, true))
207
+            {
194 208
                 continue;
195 209
             }
196 210
 
@@ -198,7 +212,8 @@  discard block
 block discarded – undo
198 212
 
199 213
             $result .= $line . "\n";
200 214
 
201
-            if ($h instanceof \Spiral\Exceptions\Renderer\Highlighter && !empty($trace['file'])) {
215
+            if ($h instanceof \Spiral\Exceptions\Renderer\Highlighter && !empty($trace['file']))
216
+            {
202 217
                 $str = @\file_get_contents($trace['file']);
203 218
                 $result .= $h->highlightLines(
204 219
                     $str,
@@ -217,13 +232,19 @@  discard block
 block discarded – undo
217 232
      */
218 233
     private function format(string $format, mixed ...$args): string
219 234
     {
220
-        if (!$this->colorsSupport) {
235
+        if (!$this->colorsSupport)
236
+        {
221 237
             $format = \preg_replace('/<[^>]+>/', '', $format);
222
-        } else {
223
-            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial) {
238
+        }
239
+        else
240
+        {
241
+            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial)
242
+            {
224 243
                 $style = '';
225
-                foreach (\explode(',', \trim($partial[2], '/')) as $color) {
226
-                    if (isset(self::COLORS[$color])) {
244
+                foreach (\explode(',', \trim($partial[2], '/')) as $color)
245
+                {
246
+                    if (isset(self::COLORS[$color]))
247
+                    {
227 248
                         $style .= self::COLORS[$color];
228 249
                     }
229 250
                 }
@@ -242,12 +263,15 @@  discard block
 block discarded – undo
242 263
      */
243 264
     private function isColorsSupported(mixed $stream = STDOUT): bool
244 265
     {
245
-        if ('Hyper' === \getenv('TERM_PROGRAM')) {
266
+        if ('Hyper' === \getenv('TERM_PROGRAM'))
267
+        {
246 268
             return true;
247 269
         }
248 270
 
249
-        try {
250
-            if (\DIRECTORY_SEPARATOR === '\\') {
271
+        try
272
+        {
273
+            if (\DIRECTORY_SEPARATOR === '\\')
274
+            {
251 275
                 return (\function_exists('sapi_windows_vt100_support') && @\sapi_windows_vt100_support($stream))
252 276
                     || \getenv('ANSICON') !== false
253 277
                     || \getenv('ConEmuANSI') === 'ON'
@@ -255,7 +279,9 @@  discard block
 block discarded – undo
255 279
             }
256 280
 
257 281
             return @\stream_isatty($stream);
258
-        } catch (\Throwable) {
282
+        }
283
+        catch (\Throwable)
284
+        {
259 285
             return false;
260 286
         }
261 287
     }
Please login to merge, or discard this patch.
src/Telemetry/src/AbstractTracer.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 {
20 20
     public function __construct(
21 21
         private readonly ?ScopeInterface $scope = new Container(),
22
-    ) {
22
+    ){
23 23
     }
24 24
 
25 25
     /**
@@ -28,33 +28,33 @@  discard block
 block discarded – undo
28 28
     final protected function runScope(Span $span, callable $callback): mixed
29 29
     {
30 30
         $container = ContainerScope::getContainer();
31
-        if (!$container instanceof \Psr\Container\ContainerInterface) {
31
+        if (!$container instanceof \Psr\Container\ContainerInterface){
32 32
             return $this->scope->runScope([
33 33
                 SpanInterface::class => $span,
34 34
                 TracerInterface::class => $this,
35 35
             ], static fn (InvokerInterface $invoker): mixed => $invoker->invoke($callback));
36 36
         }
37 37
 
38
-        if ($container instanceof Container) {
38
+        if ($container instanceof Container){
39 39
             $invoker = $container;
40 40
             $binder = $container;
41
-        } else {
41
+        }else{
42 42
             /** @var InvokerInterface $invoker */
43 43
             $invoker = $container->get(InvokerInterface::class);
44 44
             /** @var BinderInterface $binder */
45 45
             $binder = $container->get(BinderInterface::class);
46 46
         }
47 47
 
48
-        try {
48
+        try{
49 49
             $prevSpan = $container->get(SpanInterface::class);
50
-        } catch (\Throwable) {
50
+        }catch (\Throwable){
51 51
             $prevSpan = null;
52 52
         }
53 53
 
54 54
         $binder->bindSingleton(SpanInterface::class, $span);
55
-        try {
55
+        try{
56 56
             return $invoker->invoke($callback);
57
-        } finally {
57
+        }finally{
58 58
             $prevSpan === null
59 59
                 ? $binder->removeBinding(SpanInterface::class)
60 60
                 : $binder->bindSingleton(SpanInterface::class, $prevSpan);
Please login to merge, or discard this patch.
Braces   +17 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,33 +28,43 @@
 block discarded – undo
28 28
     final protected function runScope(Span $span, callable $callback): mixed
29 29
     {
30 30
         $container = ContainerScope::getContainer();
31
-        if (!$container instanceof \Psr\Container\ContainerInterface) {
31
+        if (!$container instanceof \Psr\Container\ContainerInterface)
32
+        {
32 33
             return $this->scope->runScope([
33 34
                 SpanInterface::class => $span,
34 35
                 TracerInterface::class => $this,
35 36
             ], static fn (InvokerInterface $invoker): mixed => $invoker->invoke($callback));
36 37
         }
37 38
 
38
-        if ($container instanceof Container) {
39
+        if ($container instanceof Container)
40
+        {
39 41
             $invoker = $container;
40 42
             $binder = $container;
41
-        } else {
43
+        }
44
+        else
45
+        {
42 46
             /** @var InvokerInterface $invoker */
43 47
             $invoker = $container->get(InvokerInterface::class);
44 48
             /** @var BinderInterface $binder */
45 49
             $binder = $container->get(BinderInterface::class);
46 50
         }
47 51
 
48
-        try {
52
+        try
53
+        {
49 54
             $prevSpan = $container->get(SpanInterface::class);
50
-        } catch (\Throwable) {
55
+        }
56
+        catch (\Throwable)
57
+        {
51 58
             $prevSpan = null;
52 59
         }
53 60
 
54 61
         $binder->bindSingleton(SpanInterface::class, $span);
55
-        try {
62
+        try
63
+        {
56 64
             return $invoker->invoke($callback);
57
-        } finally {
65
+        }
66
+        finally
67
+        {
58 68
             $prevSpan === null
59 69
                 ? $binder->removeBinding(SpanInterface::class)
60 70
                 : $binder->bindSingleton(SpanInterface::class, $prevSpan);
Please login to merge, or discard this patch.