spiral / framework

src/Exceptions/src/Renderer/PlainRenderer.php

Spacing +15 added lines, -15 removed lines

@@ -22,7 +22,7 @@ 
     ): string {
         $verbosity ??= $this->defaultVerbosity;
         $exceptions = [$exception];
-        while ($exception = $exception->getPrevious()) {
+        while ($exception = $exception->getPrevious()){
             $exceptions[] = $exception;
         }
 
@@ -31,7 +31,7 @@ 
         $result = [];
         $rootDir = \getcwd();
 
-        foreach ($exceptions as $exception) {
+        foreach ($exceptions as $exception){
             $file = \str_starts_with($exception->getFile(), $rootDir)
                 ? \substr($exception->getFile(), \strlen($rootDir) + 1)
                 : $exception->getFile();
@@ -44,9 +44,9 @@ 
                 $exception->getLine(),
             );
 
-            if ($verbosity->value >= Verbosity::DEBUG->value) {
+            if ($verbosity->value >= Verbosity::DEBUG->value){
                 $row .= $this->renderTrace($exception, new Highlighter(new PlainStyle()));
-            } elseif ($verbosity->value >= Verbosity::VERBOSE->value) {
+            } elseif ($verbosity->value >= Verbosity::VERBOSE->value){
                 $row .= $this->renderTrace($exception);
             }
 
@@ -64,7 +64,7 @@ 
     private function renderTrace(\Throwable $e, Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if ($stacktrace === []) {
+        if ($stacktrace === []){
             return '';
         }
 
@@ -73,20 +73,20 @@ 
 
         $pad = \strlen((string)\count($stacktrace));
 
-        foreach ($stacktrace as $i => $trace) {
-            if (isset($trace['type'], $trace['class'])) {
+        foreach ($stacktrace as $i => $trace){
+            if (isset($trace['type'], $trace['class'])){
                 $line = \sprintf(
                     '%s. %s%s%s()',
-                    \str_pad((string)((int) $i + 1), $pad, ' ', \STR_PAD_LEFT),
+                    \str_pad((string)((int)$i + 1), $pad, ' ', \STR_PAD_LEFT),
                     $trace['class'],
                     $trace['type'],
                     $trace['function']
                 );
-            } else {
+            }else{
                 $line = $trace['function'];
             }
 
-            if (isset($trace['file'])) {
+            if (isset($trace['file'])){
                 $file = \str_starts_with($trace['file'], $rootDir)
                     ? \substr($trace['file'], \strlen($rootDir) + 1)
                     : $trace['file'];
@@ -94,23 +94,23 @@ 
                 $line .= \sprintf(' at %s:%s', $file, $trace['line']);
             }
 
-            if (\in_array($line, $this->lines, true)) {
+            if (\in_array($line, $this->lines, true)){
                 continue;
             }
 
             $this->lines[] = $line;
 
-            $result .= $line . "\n";
+            $result .= $line."\n";
 
-            if ($h !== null && !empty($trace['file'])) {
+            if ($h !== null && !empty($trace['file'])){
                 $result .= $h->highlightLines(
                     \file_get_contents($trace['file']),
                     $trace['line'],
                     self::SHOW_LINES
-                ) . "\n";
+                )."\n";
             }
         }
 
-        return $result . "\n";
+        return $result."\n";
     }
 }

Braces +24 added lines, -11 removed lines

@@ -22,7 +22,8 @@ 
     ): string {
         $verbosity ??= $this->defaultVerbosity;
         $exceptions = [$exception];
-        while ($exception = $exception->getPrevious()) {
+        while ($exception = $exception->getPrevious())
+        {
             $exceptions[] = $exception;
         }
 
@@ -31,7 +32,8 @@ 
         $result = [];
         $rootDir = \getcwd();
 
-        foreach ($exceptions as $exception) {
+        foreach ($exceptions as $exception)
+        {
             $file = \str_starts_with($exception->getFile(), $rootDir)
                 ? \substr($exception->getFile(), \strlen($rootDir) + 1)
                 : $exception->getFile();
@@ -44,9 +46,12 @@ 
                 $exception->getLine(),
             );
 
-            if ($verbosity->value >= Verbosity::DEBUG->value) {
+            if ($verbosity->value >= Verbosity::DEBUG->value)
+            {
                 $row .= $this->renderTrace($exception, new Highlighter(new PlainStyle()));
-            } elseif ($verbosity->value >= Verbosity::VERBOSE->value) {
+            }
+            elseif ($verbosity->value >= Verbosity::VERBOSE->value)
+            {
                 $row .= $this->renderTrace($exception);
             }
 
@@ -64,7 +69,8 @@ 
     private function renderTrace(\Throwable $e, Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if ($stacktrace === []) {
+        if ($stacktrace === [])
+        {
             return '';
         }
 
@@ -73,8 +79,10 @@ 
 
         $pad = \strlen((string)\count($stacktrace));
 
-        foreach ($stacktrace as $i => $trace) {
-            if (isset($trace['type'], $trace['class'])) {
+        foreach ($stacktrace as $i => $trace)
+        {
+            if (isset($trace['type'], $trace['class']))
+            {
                 $line = \sprintf(
                     '%s. %s%s%s()',
                     \str_pad((string)((int) $i + 1), $pad, ' ', \STR_PAD_LEFT),
@@ -82,11 +90,14 @@ 
                     $trace['type'],
                     $trace['function']
                 );
-            } else {
+            }
+            else
+            {
                 $line = $trace['function'];
             }
 
-            if (isset($trace['file'])) {
+            if (isset($trace['file']))
+            {
                 $file = \str_starts_with($trace['file'], $rootDir)
                     ? \substr($trace['file'], \strlen($rootDir) + 1)
                     : $trace['file'];
@@ -94,7 +105,8 @@ 
                 $line .= \sprintf(' at %s:%s', $file, $trace['line']);
             }
 
-            if (\in_array($line, $this->lines, true)) {
+            if (\in_array($line, $this->lines, true))
+            {
                 continue;
             }
 
@@ -102,7 +114,8 @@ 
 
             $result .= $line . "\n";
 
-            if ($h !== null && !empty($trace['file'])) {
+            if ($h !== null && !empty($trace['file']))
+            {
                 $result .= $h->highlightLines(
                     \file_get_contents($trace['file']),
                     $trace['line'],

src/Exceptions/src/Renderer/ConsoleRenderer.php

Spacing +24 added lines, -24 removed lines

@@ -68,7 +68,7 @@ 
         $exceptions = [$exception];
         $currentE = $exception;
 
-        while ($exception = $exception->getPrevious()) {
+        while ($exception = $exception->getPrevious()){
             $exceptions[] = $exception;
         }
 
@@ -77,7 +77,7 @@ 
         $result = [];
         $rootDir = \getcwd();
 
-        foreach ($exceptions as $exception) {
+        foreach ($exceptions as $exception){
             $prefix = $currentE === $exception ? '' : 'Previous: ';
             $row = $this->renderHeader(
                 \sprintf("%s[%s]\n%s", $prefix, $exception::class, $exception->getMessage()),
@@ -94,14 +94,14 @@ 
                 $exception->getLine()
             );
 
-            if ($verbosity->value >= Verbosity::DEBUG->value) {
+            if ($verbosity->value >= Verbosity::DEBUG->value){
                 $row .= $this->renderTrace(
                     $exception,
                     new Highlighter(
                         $this->colorsSupport ? new ConsoleStyle() : new PlainStyle()
                     )
                 );
-            } elseif ($verbosity->value >= Verbosity::VERBOSE->value) {
+            } elseif ($verbosity->value >= Verbosity::VERBOSE->value){
                 $row .= $this->renderTrace($exception);
             }
 
@@ -132,7 +132,7 @@ 
 
         $length += $padding;
 
-        foreach ($lines as $line) {
+        foreach ($lines as $line){
             $result .= $this->format(
                 "<{$style}>%s%s%s</reset>\n",
                 \str_repeat('', $padding + 1),
@@ -150,7 +150,7 @@ 
     private function renderTrace(\Throwable $e, Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if (empty($stacktrace)) {
+        if (empty($stacktrace)){
             return '';
         }
 
@@ -159,11 +159,11 @@ 
 
         $pad = \strlen((string)\count($stacktrace));
 
-        foreach ($stacktrace as $i => $trace) {
+        foreach ($stacktrace as $i => $trace){
             $file = null;
             $classColor = 'while';
 
-            if (isset($trace['file'])) {
+            if (isset($trace['file'])){
                 $file = \str_starts_with($trace['file'], $rootDir)
                     ? \substr($trace['file'], \strlen($rootDir) + 1)
                     : $trace['file'];
@@ -171,7 +171,7 @@ 
                 $classColor = \str_starts_with($file, 'vendor/') ? 'gray' : 'white';
             }
 
-            if (isset($trace['type'], $trace['class'])) {
+            if (isset($trace['type'], $trace['class'])){
                 $line = $this->format(
                     "<$classColor>%s.</reset> <white>%s%s%s()</reset>",
                     \str_pad((string)((int)$i + 1), $pad, ' ', \STR_PAD_LEFT),
@@ -179,13 +179,13 @@ 
                     $trace['type'],
                     $trace['function']
                 );
-            } else {
+            }else{
                 $line = $this->format(
                     ' <white>%s()</reset>',
                     $trace['function']
                 );
             }
-            if ($file !== null) {
+            if ($file !== null){
                 $line .= $this->format(
                     ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>',
                     $file,
@@ -193,20 +193,20 @@ 
                 );
             }
 
-            if (\in_array($line, $this->lines, true)) {
+            if (\in_array($line, $this->lines, true)){
                 continue;
             }
 
             $this->lines[] = $line;
 
-            $result .= $line . "\n";
+            $result .= $line."\n";
 
-            if ($h !== null && !empty($trace['file'])) {
+            if ($h !== null && !empty($trace['file'])){
                 $result .= $h->highlightLines(
                     \file_get_contents($trace['file']),
                     $trace['line'],
                     static::SHOW_LINES
-                ) . "\n";
+                )."\n";
             }
         }
 
@@ -218,13 +218,13 @@ 
      */
     private function format(string $format, mixed ...$args): string
     {
-        if (!$this->colorsSupport) {
+        if (!$this->colorsSupport){
             $format = \preg_replace('/<[^>]+>/', '', $format);
-        } else {
-            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial) {
+        }else{
+            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial){
                 $style = '';
-                foreach (\explode(',', \trim($partial[2], '/')) as $color) {
-                    if (isset(self::COLORS[$color])) {
+                foreach (\explode(',', \trim($partial[2], '/')) as $color){
+                    if (isset(self::COLORS[$color])){
                         $style .= self::COLORS[$color];
                     }
                 }
@@ -243,12 +243,12 @@ 
      */
     private function isColorsSupported(mixed $stream = STDOUT): bool
     {
-        if ('Hyper' === \getenv('TERM_PROGRAM')) {
+        if ('Hyper' === \getenv('TERM_PROGRAM')){
             return true;
         }
 
-        try {
-            if (\DIRECTORY_SEPARATOR === '\\') {
+        try{
+            if (\DIRECTORY_SEPARATOR === '\\'){
                 return (\function_exists('sapi_windows_vt100_support') && @\sapi_windows_vt100_support($stream))
                     || \getenv('ANSICON') !== false
                     || \getenv('ConEmuANSI') === 'ON'
@@ -256,7 +256,7 @@ 
             }
 
             return @\stream_isatty($stream);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
     }

Braces +48 added lines, -22 removed lines

@@ -68,7 +68,8 @@ 
         $exceptions = [$exception];
         $currentE = $exception;
 
-        while ($exception = $exception->getPrevious()) {
+        while ($exception = $exception->getPrevious())
+        {
             $exceptions[] = $exception;
         }
 
@@ -77,7 +78,8 @@ 
         $result = [];
         $rootDir = \getcwd();
 
-        foreach ($exceptions as $exception) {
+        foreach ($exceptions as $exception)
+        {
             $prefix = $currentE === $exception ? '' : 'Previous: ';
             $row = $this->renderHeader(
                 \sprintf("%s[%s]\n%s", $prefix, $exception::class, $exception->getMessage()),
@@ -94,14 +96,17 @@ 
                 $exception->getLine()
             );
 
-            if ($verbosity->value >= Verbosity::DEBUG->value) {
+            if ($verbosity->value >= Verbosity::DEBUG->value)
+            {
                 $row .= $this->renderTrace(
                     $exception,
                     new Highlighter(
                         $this->colorsSupport ? new ConsoleStyle() : new PlainStyle()
                     )
                 );
-            } elseif ($verbosity->value >= Verbosity::VERBOSE->value) {
+            }
+            elseif ($verbosity->value >= Verbosity::VERBOSE->value)
+            {
                 $row .= $this->renderTrace($exception);
             }
 
@@ -132,7 +137,8 @@ 
 
         $length += $padding;
 
-        foreach ($lines as $line) {
+        foreach ($lines as $line)
+        {
             $result .= $this->format(
                 "<{$style}>%s%s%s</reset>\n",
                 \str_repeat('', $padding + 1),
@@ -150,7 +156,8 @@ 
     private function renderTrace(\Throwable $e, Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if (empty($stacktrace)) {
+        if (empty($stacktrace))
+        {
             return '';
         }
 
@@ -159,11 +166,13 @@ 
 
         $pad = \strlen((string)\count($stacktrace));
 
-        foreach ($stacktrace as $i => $trace) {
+        foreach ($stacktrace as $i => $trace)
+        {
             $file = null;
             $classColor = 'while';
 
-            if (isset($trace['file'])) {
+            if (isset($trace['file']))
+            {
                 $file = \str_starts_with($trace['file'], $rootDir)
                     ? \substr($trace['file'], \strlen($rootDir) + 1)
                     : $trace['file'];
@@ -171,7 +180,8 @@ 
                 $classColor = \str_starts_with($file, 'vendor/') ? 'gray' : 'white';
             }
 
-            if (isset($trace['type'], $trace['class'])) {
+            if (isset($trace['type'], $trace['class']))
+            {
                 $line = $this->format(
                     "<$classColor>%s.</reset> <white>%s%s%s()</reset>",
                     \str_pad((string)((int)$i + 1), $pad, ' ', \STR_PAD_LEFT),
@@ -179,13 +189,16 @@ 
                     $trace['type'],
                     $trace['function']
                 );
-            } else {
+            }
+            else
+            {
                 $line = $this->format(
                     ' <white>%s()</reset>',
                     $trace['function']
                 );
             }
-            if ($file !== null) {
+            if ($file !== null)
+            {
                 $line .= $this->format(
                     ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>',
                     $file,
@@ -193,7 +206,8 @@ 
                 );
             }
 
-            if (\in_array($line, $this->lines, true)) {
+            if (\in_array($line, $this->lines, true))
+            {
                 continue;
             }
 
@@ -201,7 +215,8 @@ 
 
             $result .= $line . "\n";
 
-            if ($h !== null && !empty($trace['file'])) {
+            if ($h !== null && !empty($trace['file']))
+            {
                 $result .= $h->highlightLines(
                     \file_get_contents($trace['file']),
                     $trace['line'],
@@ -218,13 +233,19 @@ 
      */
     private function format(string $format, mixed ...$args): string
     {
-        if (!$this->colorsSupport) {
+        if (!$this->colorsSupport)
+        {
             $format = \preg_replace('/<[^>]+>/', '', $format);
-        } else {
-            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial) {
+        }
+        else
+        {
+            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial)
+            {
                 $style = '';
-                foreach (\explode(',', \trim($partial[2], '/')) as $color) {
-                    if (isset(self::COLORS[$color])) {
+                foreach (\explode(',', \trim($partial[2], '/')) as $color)
+                {
+                    if (isset(self::COLORS[$color]))
+                    {
                         $style .= self::COLORS[$color];
                     }
                 }
@@ -243,12 +264,15 @@ 
      */
     private function isColorsSupported(mixed $stream = STDOUT): bool
     {
-        if ('Hyper' === \getenv('TERM_PROGRAM')) {
+        if ('Hyper' === \getenv('TERM_PROGRAM'))
+        {
             return true;
         }
 
-        try {
-            if (\DIRECTORY_SEPARATOR === '\\') {
+        try
+        {
+            if (\DIRECTORY_SEPARATOR === '\\')
+            {
                 return (\function_exists('sapi_windows_vt100_support') && @\sapi_windows_vt100_support($stream))
                     || \getenv('ANSICON') !== false
                     || \getenv('ConEmuANSI') === 'ON'
@@ -256,7 +280,9 @@ 
             }
 
             return @\stream_isatty($stream);
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             return false;
         }
     }