spiral / framework

src/Boot/src/AbstractKernel.php

Spacing +5 added lines, -5 removed lines

@@ -97,8 +97,8 @@ 
      */
     public function serve()
     {
-        foreach ($this->dispatchers as $dispatcher) {
-            if ($dispatcher->canServe()) {
+        foreach ($this->dispatchers as $dispatcher){
+            if ($dispatcher->canServe()){
                 return $this->container->runScope(
                     [DispatcherInterface::class => $dispatcher],
                     [$dispatcher, 'serve']
@@ -124,7 +124,7 @@ 
         EnvironmentInterface $environment = null,
         bool $handleErrors = true
     ): ?self {
-        if ($handleErrors) {
+        if ($handleErrors){
             ExceptionHandler::register();
         }
 
@@ -133,7 +133,7 @@ 
         $core = new static(new Container(), $directories);
         $core->container->bindSingleton(EnvironmentInterface::class, $environment);
 
-        try {
+        try{
             // will protect any against env overwrite action
             $core->container->runScope(
                 [EnvironmentInterface::class => $environment],
@@ -142,7 +142,7 @@ 
                     $core->bootstrap();
                 }
             );
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             ExceptionHandler::handleException($e);
 
             return null;

Braces +11 added lines, -5 removed lines

@@ -97,8 +97,10 @@ 
      */
     public function serve()
     {
-        foreach ($this->dispatchers as $dispatcher) {
-            if ($dispatcher->canServe()) {
+        foreach ($this->dispatchers as $dispatcher)
+        {
+            if ($dispatcher->canServe())
+            {
                 return $this->container->runScope(
                     [DispatcherInterface::class => $dispatcher],
                     [$dispatcher, 'serve']
@@ -124,7 +126,8 @@ 
         EnvironmentInterface $environment = null,
         bool $handleErrors = true
     ): ?self {
-        if ($handleErrors) {
+        if ($handleErrors)
+        {
             ExceptionHandler::register();
         }
 
@@ -133,7 +136,8 @@ 
         $core = new static(new Container(), $directories);
         $core->container->bindSingleton(EnvironmentInterface::class, $environment);
 
-        try {
+        try
+        {
             // will protect any against env overwrite action
             $core->container->runScope(
                 [EnvironmentInterface::class => $environment],
@@ -142,7 +146,9 @@ 
                     $core->bootstrap();
                 }
             );
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             ExceptionHandler::handleException($e);
 
             return null;

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/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/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'],

src/Exceptions/src/HtmlHandler.php

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

@@ -24,7 +24,7 @@ 
     /**
      * Visual styles.
      */
-    public const DEFAULT  = 'default';
+    public const default  = 'default';
     public const INVERTED = 'inverted';
 
     /** @var HtmlRenderer */
@@ -34,7 +34,7 @@ 
     protected $highlighter = null;
 
     /** @var string */
-    protected $style = self::DEFAULT;
+    protected $style = self::default;
 
     /** @var Dumper */
     protected $dumper = null;
@@ -45,7 +45,7 @@ 
     /**
      * @param string $style
      */
-    public function __construct(string $style = self::DEFAULT)
+    public function __construct(string $style = self::default)
     {
         $this->style = $style;
         $this->dumper = new Dumper();
@@ -54,11 +54,11 @@ 
             $this->renderer = new HtmlRenderer(HtmlRenderer::INVERTED);
             $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::INVERTED));
         } else {
-            $this->renderer = new HtmlRenderer(HtmlRenderer::DEFAULT);
-            $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::DEFAULT));
+            $this->renderer = new HtmlRenderer(HtmlRenderer::default);
+            $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::default));
         }
 
-        $this->dumper->setRenderer(Dumper::RETURN, $this->renderer);
+        $this->dumper->setRenderer(Dumper::return, $this->renderer);
     }
 
     /**

Spacing +7 added lines, -7 removed lines

@@ -50,10 +50,10 @@ 
         $this->style = $style;
         $this->dumper = new Dumper();
 
-        if ($style == self::INVERTED) {
+        if ($style == self::INVERTED){
             $this->renderer = new HtmlRenderer(HtmlRenderer::INVERTED);
             $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::INVERTED));
-        } else {
+        }else{
             $this->renderer = new HtmlRenderer(HtmlRenderer::DEFAULT);
             $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::DEFAULT));
         }
@@ -82,7 +82,7 @@ 
             'message'      => $this->getMessage($e),
             'exception'    => $e,
             'valueWrapper' => new ValueWrapper($this->dumper, $this->renderer, $verbosity),
-            'style'        => $this->render('styles/' . $this->style),
+            'style'        => $this->render('styles/'.$this->style),
             'footer'       => $this->render('partials/footer'),
             'variables'    => '',
             'logs'         => '',
@@ -105,20 +105,20 @@ 
             'valueWrapper' => $options['valueWrapper'],
         ]);
 
-        if ($this->state !== null) {
-            if ($this->state->getTags() !== []) {
+        if ($this->state !== null){
+            if ($this->state->getTags() !== []){
                 $options['tags'] = $this->render('partials/tags', [
                     'tags' => $this->state->getTags(),
                 ]);
             }
 
-            if ($this->state->getLogEvents() !== []) {
+            if ($this->state->getLogEvents() !== []){
                 $options['logs'] = $this->render('partials/logs', [
                     'logEvents' => $this->state->getLogEvents(),
                 ]);
             }
 
-            if ($this->state->getVariables() !== []) {
+            if ($this->state->getVariables() !== []){
                 $options['variables'] = $this->render('partials/variables', [
                     'variables' => $this->state->getVariables(),
                 ]);

Braces +13 added lines, -6 removed lines

@@ -50,10 +50,13 @@ 
         $this->style = $style;
         $this->dumper = new Dumper();
 
-        if ($style == self::INVERTED) {
+        if ($style == self::INVERTED)
+        {
             $this->renderer = new HtmlRenderer(HtmlRenderer::INVERTED);
             $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::INVERTED));
-        } else {
+        }
+        else
+        {
             $this->renderer = new HtmlRenderer(HtmlRenderer::DEFAULT);
             $this->highlighter = new Highlighter(new HtmlStyle(HtmlStyle::DEFAULT));
         }
@@ -105,20 +108,24 @@ 
             'valueWrapper' => $options['valueWrapper'],
         ]);
 
-        if ($this->state !== null) {
-            if ($this->state->getTags() !== []) {
+        if ($this->state !== null)
+        {
+            if ($this->state->getTags() !== [])
+            {
                 $options['tags'] = $this->render('partials/tags', [
                     'tags' => $this->state->getTags(),
                 ]);
             }
 
-            if ($this->state->getLogEvents() !== []) {
+            if ($this->state->getLogEvents() !== [])
+            {
                 $options['logs'] = $this->render('partials/logs', [
                     'logEvents' => $this->state->getLogEvents(),
                 ]);
             }
 
-            if ($this->state->getVariables() !== []) {
+            if ($this->state->getVariables() !== [])
+            {
                 $options['variables'] = $this->render('partials/variables', [
                     'variables' => $this->state->getVariables(),
                 ]);