spiral / framework

src/Exceptions/src/Style/PlainStyle.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
      */
     public function line(int $number, string $code, bool $target = false): string
     {
-        if ($target) {
+        if ($target){
             return sprintf(
                 ">%s %s\n",
                 str_pad((string)$number, 4, ' ', STR_PAD_LEFT),

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
      */
     public function line(int $number, string $code, bool $target = false): string
     {
-        if ($target) {
+        if ($target)
+        {
             return sprintf(
                 ">%s %s\n",
                 str_pad((string)$number, 4, ' ', STR_PAD_LEFT),

src/Exceptions/src/ConsoleHandler.php

Spacing +21 added lines, -21 removed lines

@@ -69,10 +69,10 @@ 
     {
         $result = '';
 
-        if ($e instanceof \Error) {
-            $result .= $this->renderHeader('[' . get_class($e) . "]\n" . $e->getMessage(), 'bg:magenta,white');
-        } else {
-            $result .= $this->renderHeader('[' . get_class($e) . "]\n" . $e->getMessage(), 'bg:red,white');
+        if ($e instanceof \Error){
+            $result .= $this->renderHeader('['.get_class($e)."]\n".$e->getMessage(), 'bg:magenta,white');
+        }else{
+            $result .= $this->renderHeader('['.get_class($e)."]\n".$e->getMessage(), 'bg:red,white');
         }
 
         $result .= $this->format(
@@ -81,11 +81,11 @@ 
             $e->getLine()
         );
 
-        if ($verbosity >= self::VERBOSITY_DEBUG) {
+        if ($verbosity >= self::VERBOSITY_DEBUG){
             $result .= $this->renderTrace($e, new Highlighter(
                 $this->colorsSupport ? new ConsoleStyle() : new PlainStyle()
             ));
-        } elseif ($verbosity >= self::VERBOSITY_VERBOSE) {
+        } elseif ($verbosity >= self::VERBOSITY_VERBOSE){
             $result .= $this->renderTrace($e);
         }
 
@@ -113,7 +113,7 @@ 
 
         $length += $padding;
 
-        foreach ($lines as $line) {
+        foreach ($lines as $line){
             $result .= $this->format(
                 "<{$style}>%s%s%s</reset>\n",
                 str_repeat(' ', $padding + 1),
@@ -135,34 +135,34 @@ 
     private function renderTrace(\Throwable $e, Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if (empty($stacktrace)) {
+        if (empty($stacktrace)){
             return '';
         }
 
         $result = $this->format("\n<red>Exception Trace:</reset>\n");
 
-        foreach ($stacktrace as $trace) {
-            if (isset($trace['type']) && isset($trace['class'])) {
+        foreach ($stacktrace as $trace){
+            if (isset($trace['type']) && isset($trace['class'])){
                 $line = $this->format(
                     ' <white>%s%s%s()</reset>',
                     $trace['class'],
                     $trace['type'],
                     $trace['function']
                 );
-            } else {
+            }else{
                 $line = $this->format(
                     ' <white>%s()</reset>',
                     $trace['function']
                 );
             }
 
-            if (isset($trace['file'])) {
+            if (isset($trace['file'])){
                 $line .= $this->format(
                     ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>',
                     $trace['file'],
                     $trace['line']
                 );
-            } else {
+            }else{
                 $line .= $this->format(
                     ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>',
                     'n/a',
@@ -170,14 +170,14 @@ 
                 );
             }
 
-            $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";
             }
         }
 
@@ -193,13 +193,13 @@ 
      */
     private function format(string $format, ...$args): string
     {
-        if (!$this->colorsSupport) {
+        if (!$this->colorsSupport){
             $format = preg_replace('/<[^>]+>/', '', $format);
-        } else {
-            $format = preg_replace_callback('/(<([^>]+)>)/', function ($partial) {
+        }else{
+            $format = preg_replace_callback('/(<([^>]+)>)/', 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];
                     }
                 }

Braces +39 added lines, -17 removed lines

@@ -69,9 +69,12 @@ 
     {
         $result = '';
 
-        if ($e instanceof \Error) {
+        if ($e instanceof \Error)
+        {
             $result .= $this->renderHeader('[' . get_class($e) . "]\n" . $e->getMessage(), 'bg:magenta,white');
-        } else {
+        }
+        else
+        {
             $result .= $this->renderHeader('[' . get_class($e) . "]\n" . $e->getMessage(), 'bg:red,white');
         }
 
@@ -81,11 +84,14 @@ 
             $e->getLine()
         );
 
-        if ($verbosity >= self::VERBOSITY_DEBUG) {
+        if ($verbosity >= self::VERBOSITY_DEBUG)
+        {
             $result .= $this->renderTrace($e, new Highlighter(
                 $this->colorsSupport ? new ConsoleStyle() : new PlainStyle()
             ));
-        } elseif ($verbosity >= self::VERBOSITY_VERBOSE) {
+        }
+        elseif ($verbosity >= self::VERBOSITY_VERBOSE)
+        {
             $result .= $this->renderTrace($e);
         }
 
@@ -113,7 +119,8 @@ 
 
         $length += $padding;
 
-        foreach ($lines as $line) {
+        foreach ($lines as $line)
+        {
             $result .= $this->format(
                 "<{$style}>%s%s%s</reset>\n",
                 str_repeat(' ', $padding + 1),
@@ -135,34 +142,42 @@ 
     private function renderTrace(\Throwable $e, Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if (empty($stacktrace)) {
+        if (empty($stacktrace))
+        {
             return '';
         }
 
         $result = $this->format("\n<red>Exception Trace:</reset>\n");
 
-        foreach ($stacktrace as $trace) {
-            if (isset($trace['type']) && isset($trace['class'])) {
+        foreach ($stacktrace as $trace)
+        {
+            if (isset($trace['type']) && isset($trace['class']))
+            {
                 $line = $this->format(
                     ' <white>%s%s%s()</reset>',
                     $trace['class'],
                     $trace['type'],
                     $trace['function']
                 );
-            } else {
+            }
+            else
+            {
                 $line = $this->format(
                     ' <white>%s()</reset>',
                     $trace['function']
                 );
             }
 
-            if (isset($trace['file'])) {
+            if (isset($trace['file']))
+            {
                 $line .= $this->format(
                     ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>',
                     $trace['file'],
                     $trace['line']
                 );
-            } else {
+            }
+            else
+            {
                 $line .= $this->format(
                     ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>',
                     'n/a',
@@ -172,7 +187,8 @@ 
 
             $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'],
@@ -193,13 +209,19 @@ 
      */
     private function format(string $format, ...$args): string
     {
-        if (!$this->colorsSupport) {
+        if (!$this->colorsSupport)
+        {
             $format = preg_replace('/<[^>]+>/', '', $format);
-        } else {
-            $format = preg_replace_callback('/(<([^>]+)>)/', function ($partial) {
+        }
+        else
+        {
+            $format = preg_replace_callback('/(<([^>]+)>)/', 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];
                     }
                 }

src/Exceptions/src/Highlighter.php

Spacing +6 added lines, -6 removed lines

@@ -40,9 +40,9 @@ 
         $lines = explode("\n", str_replace("\r\n", "\n", $this->highlight($source)));
 
         $result = '';
-        foreach ($lines as $number => $code) {
+        foreach ($lines as $number => $code){
             $human = $number + 1;
-            if (!empty($around) && ($human < $line - $around || $human >= $line + $around + 1)) {
+            if (!empty($around) && ($human < $line - $around || $human >= $line + $around + 1)){
                 //Not included in a range
                 continue;
             }
@@ -63,7 +63,7 @@ 
     {
         $result = '';
         $previous = [];
-        foreach ($this->getTokens($source) as $token) {
+        foreach ($this->getTokens($source) as $token){
             $result .= $this->r->token($token, $previous);
             $previous = $token;
         }
@@ -82,12 +82,12 @@ 
         $tokens = [];
         $line = 0;
 
-        foreach (token_get_all($source) as $token) {
-            if (isset($token[2])) {
+        foreach (token_get_all($source) as $token){
+            if (isset($token[2])){
                 $line = $token[2];
             }
 
-            if (!is_array($token)) {
+            if (!is_array($token)){
                 $token = [$token, $token, $line];
             }
 

Braces +12 added lines, -6 removed lines

@@ -40,9 +40,11 @@ 
         $lines = explode("\n", str_replace("\r\n", "\n", $this->highlight($source)));
 
         $result = '';
-        foreach ($lines as $number => $code) {
+        foreach ($lines as $number => $code)
+        {
             $human = $number + 1;
-            if (!empty($around) && ($human < $line - $around || $human >= $line + $around + 1)) {
+            if (!empty($around) && ($human < $line - $around || $human >= $line + $around + 1))
+            {
                 //Not included in a range
                 continue;
             }
@@ -63,7 +65,8 @@ 
     {
         $result = '';
         $previous = [];
-        foreach ($this->getTokens($source) as $token) {
+        foreach ($this->getTokens($source) as $token)
+        {
             $result .= $this->r->token($token, $previous);
             $previous = $token;
         }
@@ -82,12 +85,15 @@ 
         $tokens = [];
         $line = 0;
 
-        foreach (token_get_all($source) as $token) {
-            if (isset($token[2])) {
+        foreach (token_get_all($source) as $token)
+        {
+            if (isset($token[2]))
+            {
                 $line = $token[2];
             }
 
-            if (!is_array($token)) {
+            if (!is_array($token))
+            {
                 $token = [$token, $token, $line];
             }
 

src/Exceptions/tests/HandlerTest.php

Spacing +12 added lines, -12 removed lines

@@ -201,9 +201,9 @@ 
         $handler = new ConsoleHandler();
         $handler->setColorsSupport(true);
 
-        try {
+        try{
             $this->makeException();
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
         }
 
         $result = $handler->renderException($e, HandlerInterface::VERBOSITY_DEBUG);
@@ -217,9 +217,9 @@ 
     {
         $handler = new PlainHandler();
 
-        try {
+        try{
             $this->makeException();
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
         }
 
         $result = $handler->renderException($e, HandlerInterface::VERBOSITY_DEBUG);
@@ -232,9 +232,9 @@ 
     {
         $handler = new JsonHandler();
 
-        try {
+        try{
             $this->makeException();
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
         }
 
         $result = $handler->renderException($e, HandlerInterface::VERBOSITY_DEBUG);
@@ -249,9 +249,9 @@ 
 
         $handler = new HtmlHandler(HtmlHandler::DEFAULT);
 
-        try {
+        try{
             $this->makeException();
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
         }
 
         $result = $handler->renderException($e, HandlerInterface::VERBOSITY_DEBUG);
@@ -267,9 +267,9 @@ 
 
         $handler = new HtmlHandler(HtmlHandler::INVERTED);
 
-        try {
+        try{
             $this->makeException();
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
         }
 
         $result = $handler->renderException($e, HandlerInterface::VERBOSITY_DEBUG);
@@ -281,13 +281,13 @@ 
 
     public function makeException(): void
     {
-        try {
+        try{
             $f = function (): void {
                 throw new \RuntimeException('error');
             };
 
             $f();
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new \LogicException('error', 0, $e);
         }
     }

Braces +30 added lines, -12 removed lines

@@ -201,9 +201,12 @@ 
         $handler = new ConsoleHandler();
         $handler->setColorsSupport(true);
 
-        try {
+        try
+        {
             $this->makeException();
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
         }
 
         $result = $handler->renderException($e, HandlerInterface::VERBOSITY_DEBUG);
@@ -217,9 +220,12 @@ 
     {
         $handler = new PlainHandler();
 
-        try {
+        try
+        {
             $this->makeException();
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
         }
 
         $result = $handler->renderException($e, HandlerInterface::VERBOSITY_DEBUG);
@@ -232,9 +238,12 @@ 
     {
         $handler = new JsonHandler();
 
-        try {
+        try
+        {
             $this->makeException();
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
         }
 
         $result = $handler->renderException($e, HandlerInterface::VERBOSITY_DEBUG);
@@ -249,9 +258,12 @@ 
 
         $handler = new HtmlHandler(HtmlHandler::DEFAULT);
 
-        try {
+        try
+        {
             $this->makeException();
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
         }
 
         $result = $handler->renderException($e, HandlerInterface::VERBOSITY_DEBUG);
@@ -267,9 +279,12 @@ 
 
         $handler = new HtmlHandler(HtmlHandler::INVERTED);
 
-        try {
+        try
+        {
             $this->makeException();
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
         }
 
         $result = $handler->renderException($e, HandlerInterface::VERBOSITY_DEBUG);
@@ -281,13 +296,16 @@ 
 
     public function makeException(): void
     {
-        try {
+        try
+        {
             $f = function (): void {
                 throw new \RuntimeException('error');
             };
 
             $f();
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new \LogicException('error', 0, $e);
         }
     }

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

@@ -113,7 +113,7 @@ 
 
     public function testHtmlHandlerDefaultBasic(): void
     {
-        $handler = new HtmlHandler(HtmlHandler::DEFAULT);
+        $handler = new HtmlHandler(HtmlHandler::default);
 
         $result = $handler->renderException(new Error(
             'message',
@@ -164,7 +164,7 @@ 
     {
         $this->markTestSkipped('FIXME: Very long execution time');
 
-        $handler = new HtmlHandler(HtmlHandler::DEFAULT);
+        $handler = new HtmlHandler(HtmlHandler::default);
 
         $result = $handler->renderException(new Error(
             'message',
@@ -247,7 +247,7 @@ 
     {
         $this->markTestSkipped('FIXME: Very long execution time');
 
-        $handler = new HtmlHandler(HtmlHandler::DEFAULT);
+        $handler = new HtmlHandler(HtmlHandler::default);
 
         try {
             $this->makeException();

src/Console/src/Sequence/CommandSequence.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         array $options = [],
         string $header = '',
         string $footer = ''
-    ) {
+    ){
         $this->command = $command;
         $this->options = $options;
 

src/Console/src/Sequence/AbstractSequence.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function writeHeader(OutputInterface $output): void
     {
-        if (!empty($this->header)) {
+        if (!empty($this->header)){
             $output->writeln($this->header);
         }
     }
@@ -47,7 +47,7 @@ 
      */
     public function whiteFooter(OutputInterface $output): void
     {
-        if (!empty($this->footer)) {
+        if (!empty($this->footer)){
             $output->writeln($this->footer);
         }
     }

Braces +4 added lines, -2 removed lines

@@ -37,7 +37,8 @@ 
      */
     public function writeHeader(OutputInterface $output): void
     {
-        if (!empty($this->header)) {
+        if (!empty($this->header))
+        {
             $output->writeln($this->header);
         }
     }
@@ -47,7 +48,8 @@ 
      */
     public function whiteFooter(OutputInterface $output): void
     {
-        if (!empty($this->footer)) {
+        if (!empty($this->footer))
+        {
             $output->writeln($this->footer);
         }
     }

src/Console/src/Command/SequenceCommand.php

Spacing +4 added lines, -4 removed lines

@@ -32,16 +32,16 @@
     protected function runSequence(iterable $commands, ContainerInterface $container): int
     {
         $errors = 0;
-        foreach ($commands as $sequence) {
+        foreach ($commands as $sequence){
             $sequence->writeHeader($this->output);
 
-            try {
+            try{
                 $sequence->execute($container, $this->output);
                 $sequence->whiteFooter($this->output);
-            } catch (Throwable $e) {
+            }catch (Throwable $e){
                 $errors++;
                 $this->sprintf("<error>%s</error>\n", $e);
-                if (!$this->option('ignore') && $this->option('break')) {
+                if (!$this->option('ignore') && $this->option('break')){
                     $this->writeln('<fg=red>Aborting.</fg=red>');
 
                     return 1;

Braces +9 added lines, -4 removed lines

@@ -32,16 +32,21 @@
     protected function runSequence(iterable $commands, ContainerInterface $container): int
     {
         $errors = 0;
-        foreach ($commands as $sequence) {
+        foreach ($commands as $sequence)
+        {
             $sequence->writeHeader($this->output);
 
-            try {
+            try
+            {
                 $sequence->execute($container, $this->output);
                 $sequence->whiteFooter($this->output);
-            } catch (Throwable $e) {
+            }
+            catch (Throwable $e)
+            {
                 $errors++;
                 $this->sprintf("<error>%s</error>\n", $e);
-                if (!$this->option('ignore') && $this->option('break')) {
+                if (!$this->option('ignore') && $this->option('break'))
+                {
                     $this->writeln('<fg=red>Aborting.</fg=red>');
 
                     return 1;

src/Console/src/Config/ConsoleConfig.php

Spacing +7 added lines, -7 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function getCommands(): array
     {
-        if (!array_key_exists('commands', $this->config)) {
+        if (!array_key_exists('commands', $this->config)){
             //Legacy config support
             return [];
         }
@@ -73,7 +73,7 @@ 
     public function configureSequence(): \Generator
     {
         $sequence = $this->config['configure'] ?? $this->config['configureSequence'] ?? [];
-        foreach ($sequence as $item) {
+        foreach ($sequence as $item){
             yield $this->parseSequence($item);
         }
     }
@@ -88,7 +88,7 @@ 
     public function updateSequence(): \Generator
     {
         $sequence = $this->config['update'] ?? $this->config['updateSequence'] ?? [];
-        foreach ($sequence as $item) {
+        foreach ($sequence as $item){
             yield $this->parseSequence($item);
         }
     }
@@ -101,15 +101,15 @@ 
      */
     protected function parseSequence($item): SequenceInterface
     {
-        if ($item instanceof SequenceInterface) {
+        if ($item instanceof SequenceInterface){
             return $item;
         }
 
-        if (is_string($item)) {
+        if (is_string($item)){
             return new CallableSequence($item);
         }
 
-        if (is_array($item) && isset($item['command'])) {
+        if (is_array($item) && isset($item['command'])){
             return new CommandSequence(
                 $item['command'],
                 $item['options'] ?? [],
@@ -118,7 +118,7 @@ 
             );
         }
 
-        if (is_array($item) && isset($item['invoke'])) {
+        if (is_array($item) && isset($item['invoke'])){
             return new CallableSequence(
                 $item['invoke'],
                 $item['parameters'] ?? [],

Braces +14 added lines, -7 removed lines

@@ -55,7 +55,8 @@ 
      */
     public function getCommands(): array
     {
-        if (!array_key_exists('commands', $this->config)) {
+        if (!array_key_exists('commands', $this->config))
+        {
             //Legacy config support
             return [];
         }
@@ -73,7 +74,8 @@ 
     public function configureSequence(): \Generator
     {
         $sequence = $this->config['configure'] ?? $this->config['configureSequence'] ?? [];
-        foreach ($sequence as $item) {
+        foreach ($sequence as $item)
+        {
             yield $this->parseSequence($item);
         }
     }
@@ -88,7 +90,8 @@ 
     public function updateSequence(): \Generator
     {
         $sequence = $this->config['update'] ?? $this->config['updateSequence'] ?? [];
-        foreach ($sequence as $item) {
+        foreach ($sequence as $item)
+        {
             yield $this->parseSequence($item);
         }
     }
@@ -101,15 +104,18 @@ 
      */
     protected function parseSequence($item): SequenceInterface
     {
-        if ($item instanceof SequenceInterface) {
+        if ($item instanceof SequenceInterface)
+        {
             return $item;
         }
 
-        if (is_string($item)) {
+        if (is_string($item))
+        {
             return new CallableSequence($item);
         }
 
-        if (is_array($item) && isset($item['command'])) {
+        if (is_array($item) && isset($item['command']))
+        {
             return new CommandSequence(
                 $item['command'],
                 $item['options'] ?? [],
@@ -118,7 +124,8 @@ 
             );
         }
 
-        if (is_array($item) && isset($item['invoke'])) {
+        if (is_array($item) && isset($item['invoke']))
+        {
             return new CallableSequence(
                 $item['invoke'],
                 $item['parameters'] ?? [],

src/Console/tests/ConfigureTest.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 class ConfigureTest extends BaseTest
 {
     public const TOKENIZER_CONFIG = [
-        'directories' => [__DIR__ . '/../src/Command', __DIR__ . '/Fixtures/'],
+        'directories' => [__DIR__.'/../src/Command', __DIR__.'/Fixtures/'],
         'exclude'     => []
     ];
 
@@ -34,9 +34,9 @@ 
             ['command' => 'test', 'header' => 'Test Command'],
             ['command' => 'helper', 'options' => ['helper' => 'writeln'], 'footer' => 'Good!'],
             ['invoke' => [self::class, 'do']],
-            ['invoke' => self::class . '::do'],
+            ['invoke' => self::class.'::do'],
             'Spiral\Tests\Console\ok',
-            ['invoke' => self::class . '::err'],
+            ['invoke' => self::class.'::err'],
         ]
     ];
 

Braces +3 added lines, -1 removed lines

@@ -126,10 +126,12 @@
         $this->assertEquals(1, $output->getCode());
     }
 
-    public function do(OutputInterface $output): void
+    public function do{
+        (OutputInterface $output): void
     {
         $output->write('OK');
     }
+    }
 
     public function err(OutputInterface $output): void
     {