spiral / framework

src/Console/src/StaticLocator.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     public function locateCommands(): array
     {
         $commands = [];
-        foreach ($this->commands as $command) {
+        foreach ($this->commands as $command){
             $commands[] = $this->factory->get($command);
         }
 

Braces +2 added lines, -1 removed lines

@@ -38,7 +38,8 @@
     public function locateCommands(): array
     {
         $commands = [];
-        foreach ($this->commands as $command) {
+        foreach ($this->commands as $command)
+        {
             $commands[] = $this->factory->get($command);
         }
 

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/Command.php

Spacing +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        if ($this->container === null) {
+        if ($this->container === null){
             throw new ScopeException('Container is not set');
         }
 
@@ -69,7 +69,7 @@ 
         /** @var ResolverInterface $resolver */
         $resolver = $this->container->get(ResolverInterface::class);
 
-        try {
+        try{
             list($this->input, $this->output) = [$input, $output];
 
             //Executing perform method with method injection
@@ -77,7 +77,7 @@ 
                 $reflection,
                 compact('input', 'output')
             ));
-        } finally {
+        }finally{
             [$this->input, $this->output] = [null, null];
         }
     }
@@ -90,11 +90,11 @@ 
         $this->setName(static::NAME);
         $this->setDescription(static::DESCRIPTION);
 
-        foreach ($this->defineOptions() as $option) {
+        foreach ($this->defineOptions() as $option){
             call_user_func_array([$this, 'addOption'], $option);
         }
 
-        foreach ($this->defineArguments() as $argument) {
+        foreach ($this->defineArguments() as $argument){
             call_user_func_array([$this, 'addArgument'], $argument);
         }
     }

Braces +11 added lines, -5 removed lines

@@ -59,7 +59,8 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        if ($this->container === null) {
+        if ($this->container === null)
+        {
             throw new ScopeException('Container is not set');
         }
 
@@ -69,7 +70,8 @@ 
         /** @var ResolverInterface $resolver */
         $resolver = $this->container->get(ResolverInterface::class);
 
-        try {
+        try
+        {
             list($this->input, $this->output) = [$input, $output];
 
             //Executing perform method with method injection
@@ -77,7 +79,9 @@ 
                 $reflection,
                 compact('input', 'output')
             ));
-        } finally {
+        }
+        finally
+        {
             [$this->input, $this->output] = [null, null];
         }
     }
@@ -90,11 +94,13 @@ 
         $this->setName(static::NAME);
         $this->setDescription(static::DESCRIPTION);
 
-        foreach ($this->defineOptions() as $option) {
+        foreach ($this->defineOptions() as $option)
+        {
             call_user_func_array([$this, 'addOption'], $option);
         }
 
-        foreach ($this->defineArguments() as $argument) {
+        foreach ($this->defineArguments() as $argument)
+        {
             call_user_func_array([$this, 'addArgument'], $argument);
         }
     }

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/src/Console.php

Spacing +20 added lines, -20 removed lines

@@ -52,7 +52,7 @@ 
         ConsoleConfig $config,
         LocatorInterface $locator = null,
         ContainerInterface $container = null
-    ) {
+    ){
         $this->config = $config;
         $this->locator = $locator;
         $this->container = $container ?? new Container();
@@ -102,7 +102,7 @@ 
 
         $this->configureIO($input, $output);
 
-        if ($command !== null) {
+        if ($command !== null){
             $input = new InputProxy($input, ['firstArgument' => $command]);
         }
 
@@ -122,7 +122,7 @@ 
      */
     public function getApplication(): Application
     {
-        if ($this->application !== null) {
+        if ($this->application !== null){
             return $this->application;
         }
 
@@ -130,7 +130,7 @@ 
         $this->application->setCatchExceptions(false);
         $this->application->setAutoExit(false);
 
-        if ($this->locator !== null) {
+        if ($this->locator !== null){
             $this->addCommands($this->locator->locateCommands());
         }
 
@@ -146,8 +146,8 @@ 
      */
     private function addCommands(iterable $commands): void
     {
-        foreach ($commands as $command) {
-            if ($command instanceof Command) {
+        foreach ($commands as $command){
+            if ($command instanceof Command){
                 $command->setContainer($this->container);
             }
 
@@ -164,27 +164,27 @@ 
      */
     private function configureIO(InputInterface $input, OutputInterface $output): void
     {
-        if (true === $input->hasParameterOption(['--ansi'], true)) {
+        if (true === $input->hasParameterOption(['--ansi'], true)){
             $output->setDecorated(true);
-        } elseif (true === $input->hasParameterOption(['--no-ansi'], true)) {
+        } elseif (true === $input->hasParameterOption(['--no-ansi'], true)){
             $output->setDecorated(false);
         }
 
-        if (true === $input->hasParameterOption(['--no-interaction', '-n'], true)) {
+        if (true === $input->hasParameterOption(['--no-interaction', '-n'], true)){
             $input->setInteractive(false);
-        } elseif (\function_exists('posix_isatty')) {
+        } elseif (\function_exists('posix_isatty')){
             $inputStream = null;
 
-            if ($input instanceof StreamableInputInterface) {
+            if ($input instanceof StreamableInputInterface){
                 $inputStream = $input->getStream();
             }
 
-            if (!@posix_isatty($inputStream) && false === getenv('SHELL_INTERACTIVE')) {
+            if (!@posix_isatty($inputStream) && false === getenv('SHELL_INTERACTIVE')){
                 $input->setInteractive(false);
             }
         }
 
-        switch ($shellVerbosity = (int)getenv('SHELL_VERBOSITY')) {
+        switch ($shellVerbosity = (int)getenv('SHELL_VERBOSITY')){
             case -1:
                 $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
                 break;
@@ -204,22 +204,22 @@ 
 
         if (
             true === $input->hasParameterOption(['--quiet', '-q'], true)
-        ) {
+        ){
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
             $shellVerbosity = -1;
-        } else {
+        }else{
             if (
                 $input->hasParameterOption('-vvv', true)
                 || $input->hasParameterOption('--verbose=3', true)
                 || 3 === $input->getParameterOption('--verbose', false, true)
-            ) {
+            ){
                 $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
                 $shellVerbosity = 3;
             } elseif (
                 $input->hasParameterOption('-vv', true)
                 || $input->hasParameterOption('--verbose=2', true)
                 || 2 === $input->getParameterOption('--verbose', false, true)
-            ) {
+            ){
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
                 $shellVerbosity = 2;
             } elseif (
@@ -227,17 +227,17 @@ 
                 || $input->hasParameterOption('--verbose=1', true)
                 || $input->hasParameterOption('--verbose', true)
                 || $input->getParameterOption('--verbose', false, true)
-            ) {
+            ){
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
                 $shellVerbosity = 1;
             }
         }
 
-        if (-1 === $shellVerbosity) {
+        if (-1 === $shellVerbosity){
             $input->setInteractive(false);
         }
 
-        putenv('SHELL_VERBOSITY=' . $shellVerbosity);
+        putenv('SHELL_VERBOSITY='.$shellVerbosity);
         $_ENV['SHELL_VERBOSITY'] = $shellVerbosity;
         $_SERVER['SHELL_VERBOSITY'] = $shellVerbosity;
     }

Braces +39 added lines, -18 removed lines

@@ -72,7 +72,8 @@ 
         $input = $input ?? new ArgvInput();
         $output = $output ?? new ConsoleOutput();
 
-        return ContainerScope::runScope($this->container, function () use ($input, $output) {
+        return ContainerScope::runScope($this->container, function () use ($input, $output)
+        {
             return $this->run(
                 $input->getFirstArgument() ?? 'list',
                 $input,
@@ -102,11 +103,13 @@ 
 
         $this->configureIO($input, $output);
 
-        if ($command !== null) {
+        if ($command !== null)
+        {
             $input = new InputProxy($input, ['firstArgument' => $command]);
         }
 
-        $code = ContainerScope::runScope($this->container, function () use ($input, $output) {
+        $code = ContainerScope::runScope($this->container, function () use ($input, $output)
+        {
             return $this->getApplication()->doRun($input, $output);
         });
 
@@ -122,7 +125,8 @@ 
      */
     public function getApplication(): Application
     {
-        if ($this->application !== null) {
+        if ($this->application !== null)
+        {
             return $this->application;
         }
 
@@ -130,7 +134,8 @@ 
         $this->application->setCatchExceptions(false);
         $this->application->setAutoExit(false);
 
-        if ($this->locator !== null) {
+        if ($this->locator !== null)
+        {
             $this->addCommands($this->locator->locateCommands());
         }
 
@@ -146,8 +151,10 @@ 
      */
     private function addCommands(iterable $commands): void
     {
-        foreach ($commands as $command) {
-            if ($command instanceof Command) {
+        foreach ($commands as $command)
+        {
+            if ($command instanceof Command)
+            {
                 $command->setContainer($this->container);
             }
 
@@ -164,27 +171,36 @@ 
      */
     private function configureIO(InputInterface $input, OutputInterface $output): void
     {
-        if (true === $input->hasParameterOption(['--ansi'], true)) {
+        if (true === $input->hasParameterOption(['--ansi'], true))
+        {
             $output->setDecorated(true);
-        } elseif (true === $input->hasParameterOption(['--no-ansi'], true)) {
+        }
+        elseif (true === $input->hasParameterOption(['--no-ansi'], true))
+        {
             $output->setDecorated(false);
         }
 
-        if (true === $input->hasParameterOption(['--no-interaction', '-n'], true)) {
+        if (true === $input->hasParameterOption(['--no-interaction', '-n'], true))
+        {
             $input->setInteractive(false);
-        } elseif (\function_exists('posix_isatty')) {
+        }
+        elseif (\function_exists('posix_isatty'))
+        {
             $inputStream = null;
 
-            if ($input instanceof StreamableInputInterface) {
+            if ($input instanceof StreamableInputInterface)
+            {
                 $inputStream = $input->getStream();
             }
 
-            if (!@posix_isatty($inputStream) && false === getenv('SHELL_INTERACTIVE')) {
+            if (!@posix_isatty($inputStream) && false === getenv('SHELL_INTERACTIVE'))
+            {
                 $input->setInteractive(false);
             }
         }
 
-        switch ($shellVerbosity = (int)getenv('SHELL_VERBOSITY')) {
+        switch ($shellVerbosity = (int)getenv('SHELL_VERBOSITY'))
+        {
             case -1:
                 $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
                 break;
@@ -207,7 +223,9 @@ 
         ) {
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
             $shellVerbosity = -1;
-        } else {
+        }
+        else
+        {
             if (
                 $input->hasParameterOption('-vvv', true)
                 || $input->hasParameterOption('--verbose=3', true)
@@ -215,14 +233,16 @@ 
             ) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
                 $shellVerbosity = 3;
-            } elseif (
+            }
+            elseif (
                 $input->hasParameterOption('-vv', true)
                 || $input->hasParameterOption('--verbose=2', true)
                 || 2 === $input->getParameterOption('--verbose', false, true)
             ) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
                 $shellVerbosity = 2;
-            } elseif (
+            }
+            elseif (
                 $input->hasParameterOption('-v', true)
                 || $input->hasParameterOption('--verbose=1', true)
                 || $input->hasParameterOption('--verbose', true)
@@ -233,7 +253,8 @@ 
             }
         }
 
-        if (-1 === $shellVerbosity) {
+        if (-1 === $shellVerbosity)
+        {
             $input->setInteractive(false);
         }
 

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