spiral / framework

src/Exceptions/src/ValueWrapper.php

Spacing +8 added lines, -8 removed lines

@@ -56,33 +56,33 @@
     public function wrap(array $args): array
     {
         $result = [];
-        foreach ($args as $arg) {
+        foreach ($args as $arg){
             $display = $type = strtolower(gettype($arg));
 
-            if (is_numeric($arg)) {
+            if (is_numeric($arg)){
                 $result[] = $this->r->apply($arg, 'value', $type);
                 continue;
-            } elseif (is_bool($arg)) {
+            } elseif (is_bool($arg)){
                 $result[] = $this->r->apply($arg ? 'true' : 'false', 'value', $type);
                 continue;
-            } elseif (is_null($arg)) {
+            } elseif (is_null($arg)){
                 $result[] = $this->r->apply('null', 'value', $type);
                 continue;
             }
 
-            if (is_object($arg)) {
+            if (is_object($arg)){
                 $reflection = new \ReflectionClass($arg);
                 $display = sprintf('<span title="%s">%s</span>', $reflection->getName(), $reflection->getShortName());
             }
 
             $type = $this->r->apply($display, 'value', $type);
 
-            if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG) {
+            if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG){
                 $result[] = sprintf('<span>%s</span>', $type);
-            } else {
+            }else{
                 $hash = is_object($arg) ? spl_object_hash($arg) : md5(json_encode($arg));
 
-                if (!isset($this->values[$hash])) {
+                if (!isset($this->values[$hash])){
                     $this->values[$hash] = $this->dumper->dump($arg, Dumper::RETURN);
                 }
 

Braces +19 added lines, -8 removed lines

@@ -56,33 +56,44 @@
     public function wrap(array $args): array
     {
         $result = [];
-        foreach ($args as $arg) {
+        foreach ($args as $arg)
+        {
             $display = $type = strtolower(gettype($arg));
 
-            if (is_numeric($arg)) {
+            if (is_numeric($arg))
+            {
                 $result[] = $this->r->apply($arg, 'value', $type);
                 continue;
-            } elseif (is_bool($arg)) {
+            }
+            elseif (is_bool($arg))
+            {
                 $result[] = $this->r->apply($arg ? 'true' : 'false', 'value', $type);
                 continue;
-            } elseif (is_null($arg)) {
+            }
+            elseif (is_null($arg))
+            {
                 $result[] = $this->r->apply('null', 'value', $type);
                 continue;
             }
 
-            if (is_object($arg)) {
+            if (is_object($arg))
+            {
                 $reflection = new \ReflectionClass($arg);
                 $display = sprintf('<span title="%s">%s</span>', $reflection->getName(), $reflection->getShortName());
             }
 
             $type = $this->r->apply($display, 'value', $type);
 
-            if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG) {
+            if ($this->verbosity < HandlerInterface::VERBOSITY_DEBUG)
+            {
                 $result[] = sprintf('<span>%s</span>', $type);
-            } else {
+            }
+            else
+            {
                 $hash = is_object($arg) ? spl_object_hash($arg) : md5(json_encode($arg));
 
-                if (!isset($this->values[$hash])) {
+                if (!isset($this->values[$hash]))
+                {
                     $this->values[$hash] = $this->dumper->dump($arg, Dumper::RETURN);
                 }
 

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

@@ -83,7 +83,7 @@
                 $hash = is_object($arg) ? spl_object_hash($arg) : md5(json_encode($arg));
 
                 if (!isset($this->values[$hash])) {
-                    $this->values[$hash] = $this->dumper->dump($arg, Dumper::RETURN);
+                    $this->values[$hash] = $this->dumper->dump($arg, Dumper::return);
                 }
 
                 $result[] = sprintf('<span onclick="_da(\'%s\')">%s</span>', $hash, $type);

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
     {

src/Console/tests/BaseTest.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 abstract class BaseTest extends TestCase
 {
     public const TOKENIZER_CONFIG = [
-        'directories' => [__DIR__ . '/Fixtures/'],
+        'directories' => [__DIR__.'/Fixtures/'],
         'exclude'     => ['User'],
     ];
 

src/Console/tests/UpdateTest.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 class UpdateTest extends BaseTest
 {
     public const TOKENIZER_CONFIG = [
-        'directories' => [__DIR__ . '/../src/Command', __DIR__ . '/Fixtures/'],
+        'directories' => [__DIR__.'/../src/Command', __DIR__.'/Fixtures/'],
         'exclude'     => []
     ];
 
@@ -35,9 +35,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
     {