spiral / framework

src/Exceptions/tests/HighlighterTest.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 
     public function testHtmlHighlighter(): void
     {
-        $highlighter = new Highlighter(new HtmlStyle(HtmlStyle::DEFAULT));
+        $highlighter = new Highlighter(new HtmlStyle(HtmlStyle::default));
 
         $this->assertStringContainsString('HighlighterTest', $highlighter->highlight(file_get_contents(__FILE__)));
     }
@@ -59,7 +59,7 @@ 
 
     public function testHtmlHighlighterLines(): void
     {
-        $highlighter = new Highlighter(new HtmlStyle(HtmlStyle::DEFAULT));
+        $highlighter = new Highlighter(new HtmlStyle(HtmlStyle::default));
 
         $this->assertStringContainsString(
             'HighlighterTest',

src/Exceptions/views/exception.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         </div>
     </div>
     <?php
-    foreach ($valueWrapper->getValues() as $id => $content) {
+    foreach ($valueWrapper->getValues() as $id => $content){
         echo "<div id=\"argument-{$id}\" style=\"display: none\">{$content}</div>";
     }
     ?>

Braces +2 added lines, -1 removed lines

@@ -47,7 +47,8 @@
         </div>
     </div>
     <?php
-    foreach ($valueWrapper->getValues() as $id => $content) {
+    foreach ($valueWrapper->getValues() as $id => $content)
+    {
         echo "<div id=\"argument-{$id}\" style=\"display: none\">{$content}</div>";
     }
     ?>

src/Exceptions/views/partials/stacktrace.php

Spacing +13 added lines, -13 removed lines

@@ -10,14 +10,14 @@ 
 $vendorDir = dirname(dirname($vendorDir));
 $vendorID = null;
 $vendorCount = 0;
-foreach ($stacktrace as $index => $trace) {
+foreach ($stacktrace as $index => $trace){
     $args = [];
-    if (isset($trace['args'])) {
+    if (isset($trace['args'])){
         $args = $valueWrapper->wrap($trace['args']);
     }
 
-    $function = '<strong>' . $trace['function'] . '</strong>';
-    if (isset($trace['type']) && isset($trace['class'])) {
+    $function = '<strong>'.$trace['function'].'</strong>';
+    if (isset($trace['type']) && isset($trace['class'])){
         $reflection = new ReflectionClass($trace['class']);
         $function = sprintf(
             '<span title="%s">%s</span>%s%s',
@@ -28,7 +28,7 @@ 
         );
     }
 
-    if (!isset($trace['file']) || !file_exists($trace['file'])) { ?>
+    if (!isset($trace['file']) || !file_exists($trace['file'])){ ?>
         <div class="container no-trace">
             <?= $function ?>(<span class="arguments"><?= join(', ', $args) ?></span>)
         </div>
@@ -37,21 +37,21 @@ 
     }
 
     $isVendor = strpos($trace['file'], $vendorDir) === 0 && $index > 1;
-    if ($isVendor) {
-        if ($vendorID === null) {
+    if ($isVendor){
+        if ($vendorID === null){
             $vendorID = $index;
             $vendorCount++;
             echo sprintf('<span id="hidden-trace-%s" style="display: none;">', $vendorID);
-        } else {
+        }else{
             $vendorCount++;
         }
-    } elseif ($vendorID !== null) {
+    } elseif ($vendorID !== null){
         echo '</span>';
         echo sprintf(
             '<div id="%s" class="container" style="cursor: pointer;" onclick="toggle(\'%s\'); toggle(\'%s\');">&plus; %s vendor frame(s)...</div>',
-            'toggle-trace-' . $vendorID,
-            'toggle-trace-' . $vendorID,
-            'hidden-trace-' . $vendorID,
+            'toggle-trace-'.$vendorID,
+            'toggle-trace-'.$vendorID,
+            'hidden-trace-'.$vendorID,
             $vendorCount
         );
         $vendorID = null;
@@ -72,6 +72,6 @@ 
     <?php
 }
 
-if ($vendorID !== null) {
+if ($vendorID !== null){
     echo '</span>';
 }

Braces +21 added lines, -9 removed lines

@@ -10,14 +10,17 @@ 
 $vendorDir = dirname(dirname($vendorDir));
 $vendorID = null;
 $vendorCount = 0;
-foreach ($stacktrace as $index => $trace) {
+foreach ($stacktrace as $index => $trace)
+{
     $args = [];
-    if (isset($trace['args'])) {
+    if (isset($trace['args']))
+    {
         $args = $valueWrapper->wrap($trace['args']);
     }
 
     $function = '<strong>' . $trace['function'] . '</strong>';
-    if (isset($trace['type']) && isset($trace['class'])) {
+    if (isset($trace['type']) && isset($trace['class']))
+    {
         $reflection = new ReflectionClass($trace['class']);
         $function = sprintf(
             '<span title="%s">%s</span>%s%s',
@@ -28,7 +31,9 @@ 
         );
     }
 
-    if (!isset($trace['file']) || !file_exists($trace['file'])) { ?>
+    if (!isset($trace['file']) || !file_exists($trace['file']))
+    {
+?>
         <div class="container no-trace">
             <?= $function ?>(<span class="arguments"><?= join(', ', $args) ?></span>)
         </div>
@@ -37,15 +42,21 @@ 
     }
 
     $isVendor = strpos($trace['file'], $vendorDir) === 0 && $index > 1;
-    if ($isVendor) {
-        if ($vendorID === null) {
+    if ($isVendor)
+    {
+        if ($vendorID === null)
+        {
             $vendorID = $index;
             $vendorCount++;
             echo sprintf('<span id="hidden-trace-%s" style="display: none;">', $vendorID);
-        } else {
+        }
+        else
+        {
             $vendorCount++;
         }
-    } elseif ($vendorID !== null) {
+    }
+    elseif ($vendorID !== null)
+    {
         echo '</span>';
         echo sprintf(
             '<div id="%s" class="container" style="cursor: pointer;" onclick="toggle(\'%s\'); toggle(\'%s\');">&plus; %s vendor frame(s)...</div>',
@@ -72,6 +83,7 @@ 
     <?php
 }
 
-if ($vendorID !== null) {
+if ($vendorID !== null)
+{
     echo '</span>';
 }

src/Exceptions/views/partials/tags.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <div class="tags">
     <div class="container">
         <?php
-        foreach ($tags as $tag => $value) {
+        foreach ($tags as $tag => $value){
             echo sprintf(
                 '<div class="tag"><div class="name">%s</div><div class="value">%s</div></div>',
                 $tag,

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <div class="tags">
     <div class="container">
         <?php
-        foreach ($tags as $tag => $value) {
+        foreach ($tags as $tag => $value)
+        {
             echo sprintf(
                 '<div class="tag"><div class="name">%s</div><div class="value">%s</div></div>',
                 $tag,

src/Exceptions/views/partials/logs.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
             <table>
                 <?php
                 /** @var \Spiral\Logger\Event\LogEvent $log */
-                foreach ($logEvents as $log) {
+                foreach ($logEvents as $log){
                     echo sprintf(
                         '<tr><td class="channel">%s</td><td class="message">%s</td></tr>',
                         $log->getChannel(),

Braces +2 added lines, -1 removed lines

@@ -5,7 +5,8 @@
             <table>
                 <?php
                 /** @var \Spiral\Logger\Event\LogEvent $log */
-                foreach ($logEvents as $log) {
+                foreach ($logEvents as $log)
+                {
                     echo sprintf(
                         '<tr><td class="channel">%s</td><td class="message">%s</td></tr>',
                         $log->getChannel(),

src/Exceptions/views/partials/variables.php

Spacing +3 added lines, -3 removed lines

@@ -6,12 +6,12 @@
             </div>
             <div class="dump" id="<?= md5($name) ?>-variables" style="display: none;">
                 <?php
-                if (!is_array($content)) {
+                if (!is_array($content)){
                     echo is_scalar($value) ? htmlspecialchars($value) : json_encode($value, JSON_PRETTY_PRINT);
-                } else { ?>
+                }else{ ?>
                     <table>
                         <?php
-                        foreach ($content as $key => $value) {
+                        foreach ($content as $key => $value){
                             // todo: values
                             echo sprintf(
                                 '<tr><td class="name">%s</td><td>%s</td></tr>',

Braces +8 added lines, -3 removed lines

@@ -6,12 +6,17 @@
             </div>
             <div class="dump" id="<?= md5($name) ?>-variables" style="display: none;">
                 <?php
-                if (!is_array($content)) {
+                if (!is_array($content))
+                {
                     echo is_scalar($value) ? htmlspecialchars($value) : json_encode($value, JSON_PRETTY_PRINT);
-                } else { ?>
+                }
+                else
+                {
+?>
                     <table>
                         <?php
-                        foreach ($content as $key => $value) {
+                        foreach ($content as $key => $value)
+                        {
                             // todo: values
                             echo sprintf(
                                 '<tr><td class="name">%s</td><td>%s</td></tr>',

src/Exceptions/views/partials/chain.php

Spacing +7 added lines, -7 removed lines

@@ -4,23 +4,23 @@ 
  * @var Throwable                       $exception
  * @var \Spiral\Exceptions\ValueWrapper $valueWrapper
  */
-foreach ($stacktrace as $index => $trace) {
-    if (empty($trace['file']) && isset($stacktrace[$index - 1]['file'])) {
+foreach ($stacktrace as $index => $trace){
+    if (empty($trace['file']) && isset($stacktrace[$index - 1]['file'])){
         $trace['file'] = $stacktrace[$index - 1]['file'];
         $trace['line'] = $stacktrace[$index - 1]['line'];
     }
 
-    if (!isset($stacktrace[$index + 1])) {
+    if (!isset($stacktrace[$index + 1])){
         $trace['file'] = $exception->getFile();
         $trace['line'] = $exception->getLine();
     }
 
-    if (!isset($trace['function']) || !isset($trace['file'])) {
+    if (!isset($trace['function']) || !isset($trace['file'])){
         continue;
     }
 
-    $function = '<strong>' . $trace['function'] . '</strong>';
-    if (isset($trace['type']) && isset($trace['class'])) {
+    $function = '<strong>'.$trace['function'].'</strong>';
+    if (isset($trace['type']) && isset($trace['class'])){
         $reflection = new ReflectionClass($trace['class']);
         $function = sprintf(
             '<span title="%s">%s</span>%s%s',
@@ -32,7 +32,7 @@ 
     }
 
     $args = [];
-    if (isset($trace['args'])) {
+    if (isset($trace['args'])){
         $args = $valueWrapper->wrap($trace['args']);
     } ?>
     <div class="call">

Braces +12 added lines, -6 removed lines

@@ -4,23 +4,28 @@ 
  * @var Throwable                       $exception
  * @var \Spiral\Exceptions\ValueWrapper $valueWrapper
  */
-foreach ($stacktrace as $index => $trace) {
-    if (empty($trace['file']) && isset($stacktrace[$index - 1]['file'])) {
+foreach ($stacktrace as $index => $trace)
+{
+    if (empty($trace['file']) && isset($stacktrace[$index - 1]['file']))
+    {
         $trace['file'] = $stacktrace[$index - 1]['file'];
         $trace['line'] = $stacktrace[$index - 1]['line'];
     }
 
-    if (!isset($stacktrace[$index + 1])) {
+    if (!isset($stacktrace[$index + 1]))
+    {
         $trace['file'] = $exception->getFile();
         $trace['line'] = $exception->getLine();
     }
 
-    if (!isset($trace['function']) || !isset($trace['file'])) {
+    if (!isset($trace['function']) || !isset($trace['file']))
+    {
         continue;
     }
 
     $function = '<strong>' . $trace['function'] . '</strong>';
-    if (isset($trace['type']) && isset($trace['class'])) {
+    if (isset($trace['type']) && isset($trace['class']))
+    {
         $reflection = new ReflectionClass($trace['class']);
         $function = sprintf(
             '<span title="%s">%s</span>%s%s',
@@ -32,7 +37,8 @@ 
     }
 
     $args = [];
-    if (isset($trace['args'])) {
+    if (isset($trace['args']))
+    {
         $args = $valueWrapper->wrap($trace['args']);
     } ?>
     <div class="call">

src/Exceptions/src/AbstractHandler.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     protected function getStacktrace(\Throwable $e): array
     {
         $stacktrace = $e->getTrace();
-        if (empty($stacktrace)) {
+        if (empty($stacktrace)){
             return [];
         }
 
@@ -43,7 +43,7 @@ 
                 'line' => $e->getLine()
             ] + $stacktrace[0];
 
-        if ($stacktrace[0] != $header) {
+        if ($stacktrace[0] != $header){
             array_unshift($stacktrace, $header);
         }
 

Braces +4 added lines, -2 removed lines

@@ -33,7 +33,8 @@ 
     protected function getStacktrace(\Throwable $e): array
     {
         $stacktrace = $e->getTrace();
-        if (empty($stacktrace)) {
+        if (empty($stacktrace))
+        {
             return [];
         }
 
@@ -43,7 +44,8 @@ 
                 'line' => $e->getLine()
             ] + $stacktrace[0];
 
-        if ($stacktrace[0] != $header) {
+        if ($stacktrace[0] != $header)
+        {
             array_unshift($stacktrace, $header);
         }
 

src/Exceptions/src/PlainHandler.php

Spacing +15 added lines, -15 removed lines

@@ -25,17 +25,17 @@ 
     {
         $result = '';
 
-        if ($e instanceof \Error) {
-            $result .= '[' . get_class($e) . "]\n" . $e->getMessage();
-        } else {
-            $result .= '[' . get_class($e) . "]\n" . $e->getMessage();
+        if ($e instanceof \Error){
+            $result .= '['.get_class($e)."]\n".$e->getMessage();
+        }else{
+            $result .= '['.get_class($e)."]\n".$e->getMessage();
         }
 
         $result .= sprintf("in %s:%s\n", $e->getFile(), $e->getLine());
 
-        if ($verbosity >= self::VERBOSITY_DEBUG) {
+        if ($verbosity >= self::VERBOSITY_DEBUG){
             $result .= $this->renderTrace($e, new Highlighter(new PlainStyle()));
-        } elseif ($verbosity >= self::VERBOSITY_VERBOSE) {
+        } elseif ($verbosity >= self::VERBOSITY_VERBOSE){
             $result .= $this->renderTrace($e);
         }
 
@@ -52,38 +52,38 @@ 
     private function renderTrace(\Throwable $e, Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if (empty($stacktrace)) {
+        if (empty($stacktrace)){
             return '';
         }
 
         $result = "\nException Trace:\n";
 
-        foreach ($stacktrace as $trace) {
-            if (isset($trace['type']) && isset($trace['class'])) {
+        foreach ($stacktrace as $trace){
+            if (isset($trace['type']) && isset($trace['class'])){
                 $line = sprintf(
                     ' %s%s%s()',
                     $trace['class'],
                     $trace['type'],
                     $trace['function']
                 );
-            } else {
+            }else{
                 $line = $trace['function'];
             }
 
-            if (isset($trace['file'])) {
+            if (isset($trace['file'])){
                 $line .= sprintf(' at %s:%s', $trace['file'], $trace['line']);
-            } else {
+            }else{
                 $line .= sprintf(' at %s:%s', 'n/a', 'n/a');
             }
 
-            $result .= $line . "\n";
+            $result .= $line."\n";
 
-            if (!empty($h) && !empty($trace['file'])) {
+            if (!empty($h) && !empty($trace['file'])){
                 $result .= $h->highlightLines(
                     file_get_contents($trace['file']),
                     $trace['line'],
                     static::SHOW_LINES
-                ) . "\n";
+                )."\n";
             }
         }
 

Braces +26 added lines, -11 removed lines

@@ -25,17 +25,23 @@ 
     {
         $result = '';
 
-        if ($e instanceof \Error) {
+        if ($e instanceof \Error)
+        {
             $result .= '[' . get_class($e) . "]\n" . $e->getMessage();
-        } else {
+        }
+        else
+        {
             $result .= '[' . get_class($e) . "]\n" . $e->getMessage();
         }
 
         $result .= sprintf("in %s:%s\n", $e->getFile(), $e->getLine());
 
-        if ($verbosity >= self::VERBOSITY_DEBUG) {
+        if ($verbosity >= self::VERBOSITY_DEBUG)
+        {
             $result .= $this->renderTrace($e, new Highlighter(new PlainStyle()));
-        } elseif ($verbosity >= self::VERBOSITY_VERBOSE) {
+        }
+        elseif ($verbosity >= self::VERBOSITY_VERBOSE)
+        {
             $result .= $this->renderTrace($e);
         }
 
@@ -52,33 +58,42 @@ 
     private function renderTrace(\Throwable $e, Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if (empty($stacktrace)) {
+        if (empty($stacktrace))
+        {
             return '';
         }
 
         $result = "\nException Trace:\n";
 
-        foreach ($stacktrace as $trace) {
-            if (isset($trace['type']) && isset($trace['class'])) {
+        foreach ($stacktrace as $trace)
+        {
+            if (isset($trace['type']) && isset($trace['class']))
+            {
                 $line = sprintf(
                     ' %s%s%s()',
                     $trace['class'],
                     $trace['type'],
                     $trace['function']
                 );
-            } else {
+            }
+            else
+            {
                 $line = $trace['function'];
             }
 
-            if (isset($trace['file'])) {
+            if (isset($trace['file']))
+            {
                 $line .= sprintf(' at %s:%s', $trace['file'], $trace['line']);
-            } else {
+            }
+            else
+            {
                 $line .= sprintf(' at %s:%s', 'n/a', 'n/a');
             }
 
             $result .= $line . "\n";
 
-            if (!empty($h) && !empty($trace['file'])) {
+            if (!empty($h) && !empty($trace['file']))
+            {
                 $result .= $h->highlightLines(
                     file_get_contents($trace['file']),
                     $trace['line'],