FramyFramework / Framy

app/framework/Component/Console/Input/Input.php

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,7 @@ 
 
     public function __construct(InputDefinition $definition = null)
     {
-        if($definition === null) {
+        if ($definition === null) {
             $this->definition = new InputDefinition();
         } else {
             $this->bind($definition);
@@ -55,12 +55,12 @@ 
         $definition = $this->definition;
         $givenArguments = $this->arguments;
 
-        $missingArguments = array_filter(array_keys($definition->getArguments()), function ($argument) use ($definition, $givenArguments) {
+        $missingArguments = array_filter(array_keys($definition->getArguments()), function($argument) use ($definition, $givenArguments) {
             return !array_key_exists($argument, $givenArguments) && $definition->getArgument($argument)->isRequired();
         });
 
-        if(count($missingArguments) > 0) {
-            throw new \RuntimeException(sprintf('Not enough arguments (missing: "%s").', implode(' ,', $missingArguments )));
+        if (count($missingArguments) > 0) {
+            throw new \RuntimeException(sprintf('Not enough arguments (missing: "%s").', implode(' ,', $missingArguments)));
         }
     }
 
@@ -93,10 +93,10 @@ 
      */
     public function getArgument($name)
     {
-        if(!$this->definition->hasArgument($name))
+        if (!$this->definition->hasArgument($name))
             throw new \InvalidArgumentException(sprintf('The "%s" arguments does not exist.', $name));
 
-        return isset($this->arguments[$name]) ? $this->arguments[$name] : $this->definition->getArgument($name)->getDefault();
+        return isset($this->arguments[ $name ]) ? $this->arguments[ $name ] : $this->definition->getArgument($name)->getDefault();
     }
 
     /**
@@ -104,10 +104,10 @@ 
      */
     public function setArgument($name, $value)
     {
-        if(!$this->definition->hasArgument($name))
+        if (!$this->definition->hasArgument($name))
             throw new \InvalidArgumentException(sprintf('The "%s" arguments does not exist.', $name));
 
-        $this->arguments[$name] = $value;
+        $this->arguments[ $name ] = $value;
     }
 
     /**
@@ -134,7 +134,7 @@ 
         if (!$this->definition->hasOption($name)) {
             throw new \InvalidArgumentException(sprintf('The "%s" option does not exist.', $name));
         }
-        return array_key_exists($name, $this->options) ? $this->options[$name] : $this->definition->getOption($name)->getDefault();
+        return array_key_exists($name, $this->options) ? $this->options[ $name ] : $this->definition->getOption($name)->getDefault();
     }
 
     /**
@@ -145,7 +145,7 @@ 
         if (!$this->definition->hasOption($name)) {
             throw new \InvalidArgumentException(sprintf('The "%s" option does not exist.', $name));
         }
-        $this->options[$name] = $value;
+        $this->options[ $name ] = $value;
     }
 
     /**

Braces +6 added lines, -4 removed lines

@@ -93,8 +93,9 @@ 
      */
     public function getArgument($name)
     {
-        if(!$this->definition->hasArgument($name))
-            throw new \InvalidArgumentException(sprintf('The "%s" arguments does not exist.', $name));
+        if(!$this->definition->hasArgument($name)) {
+                    throw new \InvalidArgumentException(sprintf('The "%s" arguments does not exist.', $name));
+        }
 
         return isset($this->arguments[$name]) ? $this->arguments[$name] : $this->definition->getArgument($name)->getDefault();
     }
@@ -104,8 +105,9 @@ 
      */
     public function setArgument($name, $value)
     {
-        if(!$this->definition->hasArgument($name))
-            throw new \InvalidArgumentException(sprintf('The "%s" arguments does not exist.', $name));
+        if(!$this->definition->hasArgument($name)) {
+                    throw new \InvalidArgumentException(sprintf('The "%s" arguments does not exist.', $name));
+        }
 
         $this->arguments[$name] = $value;
     }

app/framework/Component/Console/Command/KeyGenerateCommand.php

Spacing +2 added lines, -2 removed lines

@@ -63,10 +63,10 @@
      */
     function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
     {
-        $pieces = [];
+        $pieces = [ ];
         $max = mb_strlen($keyspace, '8bit') - 1;
         for ($i = 0; $i < $length; ++$i) {
-            $pieces []= $keyspace[random_int(0, $max)];
+            $pieces [ ] = $keyspace[ random_int(0, $max) ];
         }
         return implode('', $pieces);
     }

app/framework/Component/Console/Command/Command.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function __construct(string $name = null)
     {
-        if(!is_null($name))
+        if (!is_null($name))
             $this->setName($name);
 
         $this->definition = new InputDefinition();
@@ -152,7 +152,7 @@ 
 
         $replacements = array(
             $name,
-            $_SERVER['PHP_SELF'].' '.$name,
+            $_SERVER[ 'PHP_SELF' ].' '.$name,
         );
 
         return str_replace($placeholders, $replacements, $this->getHelp() ?: $this->getDescription());
@@ -170,9 +170,9 @@ 
      */
     public function setCode(callable $code)
     {
-        if($code instanceof \Closure) {
+        if ($code instanceof \Closure) {
             $r = new \ReflectionFunction($code);
-            if(null === $r->getClosureThis()) {
+            if (null === $r->getClosureThis()) {
                 $code = \Closure::bind($code, $this);
             }
         }
@@ -338,7 +338,7 @@ 
      */
     private function validateName($name)
     {
-        if(!preg_match('/^[^\:]++(\:[^\:]++)*$/', $name))
+        if (!preg_match('/^[^\:]++(\:[^\:]++)*$/', $name))
             throw new \InvalidArgumentException(sprintf('Command name "%s" is invalid.', $name));
     }
 }

Braces +9 added lines, -6 removed lines

@@ -37,8 +37,9 @@ 
      */
     public function __construct(string $name = null)
     {
-        if(!is_null($name))
-            $this->setName($name);
+        if(!is_null($name)) {
+                    $this->setName($name);
+        }
 
         $this->definition = new InputDefinition();
 
@@ -121,8 +122,9 @@ 
             }
         }
 
-        if ($input->isInteractive())
-            $this->interact($input);
+        if ($input->isInteractive()) {
+                    $this->interact($input);
+        }
 
         $input->validate();
 
@@ -338,7 +340,8 @@ 
      */
     private function validateName($name)
     {
-        if(!preg_match('/^[^\:]++(\:[^\:]++)*$/', $name))
-            throw new \InvalidArgumentException(sprintf('Command name "%s" is invalid.', $name));
+        if(!preg_match('/^[^\:]++(\:[^\:]++)*$/', $name)) {
+                    throw new \InvalidArgumentException(sprintf('Command name "%s" is invalid.', $name));
+        }
     }
 }

app/framework/Component/Console/Command/ListCommand.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 class ListCommand extends Command
 {
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     protected function configure()
     {
         $this

app/framework/Component/Console/Output/StreamOutput.php

Braces +6 added lines, -4 removed lines

@@ -36,14 +36,16 @@
      */
     public function __construct($stream, int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = null, OutputFormatterInterface $formatter = null)
     {
-        if (!is_resource($stream) || 'stream' !== get_resource_type($stream))
-            throw new \InvalidArgumentException('The StreamOutput class needs a stream as its first argument.');
+        if (!is_resource($stream) || 'stream' !== get_resource_type($stream)) {
+                    throw new \InvalidArgumentException('The StreamOutput class needs a stream as its first argument.');
+        }
 
 
         $this->stream = $stream;
 
-        if (null === $decorated)
-            $decorated = $this->hasColorSupport();
+        if (null === $decorated) {
+                    $decorated = $this->hasColorSupport();
+        }
 
 
         parent::__construct($verbosity, $decorated, $formatter);

app/framework/Component/Console/Output/Output.php

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
     private $formatter;
 
     /**
-    * @param int                           $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
-    * @param bool                          $decorated Whether to decorate messages
-    * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
+     * @param int                           $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
+     * @param bool                          $decorated Whether to decorate messages
+     * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
      */
     public function __construct(int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null)
     {

app/framework/Component/Console/Output/Descriptor/TextDescriptor.php

Spacing +22 added lines, -22 removed lines

@@ -35,7 +35,7 @@ 
             $default = '';
         }
 
-        $totalWidth = isset($options['total_width']) ? $options['total_width'] : Helper::strlen($argument->getName());
+        $totalWidth = isset($options[ 'total_width' ]) ? $options[ 'total_width' ] : Helper::strlen($argument->getName());
         $spacingWidth = $totalWidth - strlen($argument->getName());
 
         $this->writeText(sprintf('  <info>%s</info>  %s%s%s',
@@ -67,7 +67,7 @@ 
             }
         }
 
-        $totalWidth = isset($options['total_width']) ? $options['total_width'] : $this->calculateTotalWidthForOptions(array($option));
+        $totalWidth = isset($options[ 'total_width' ]) ? $options[ 'total_width' ] : $this->calculateTotalWidthForOptions(array($option));
 
         $synopsis = sprintf('%s%s',
             $option->getShortcut() ? sprintf('-%s, ', $option->getShortcut()) : '    ',
@@ -115,7 +115,7 @@ 
 
             foreach ($definition->getOptions() as $option) {
                 if (strlen($option->getShortcut()) > 1) {
-                    $laterOptions[] = $option;
+                    $laterOptions[ ] = $option;
                     continue;
                 }
 
@@ -178,10 +178,10 @@ 
      */
     protected function describeApplication(Kernel $kernel, array $options = array())
     {
-        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
+        $describedNamespace = isset($options[ 'namespace' ]) ? $options[ 'namespace' ] : null;
         $description = new ApplicationDescription($kernel, $describedNamespace);
 
-        if (isset($options['raw_text']) && $options['raw_text']) {
+        if (isset($options[ 'raw_text' ]) && $options[ 'raw_text' ]) {
             $width = $this->getColumnWidth($description->getCommands());
 
             foreach ($description->getCommands() as $command) {
@@ -205,15 +205,15 @@ 
                 // make sure all alias commands are included when describing a specific namespace
                 $describedNamespaceInfo = reset($namespaces);
 
-                foreach ($describedNamespaceInfo['commands'] as $name) {
-                    $commands[$name] = $description->getCommand($name);
+                foreach ($describedNamespaceInfo[ 'commands' ] as $name) {
+                    $commands[ $name ] = $description->getCommand($name);
                 }
             }
 
             // calculate max. width based on available commands per namespace
             //TODO: somehow this does not work as intended
-            $width = $this->getColumnWidth(call_user_func_array('array_merge', array_map(function ($namespace) use ($commands) {
-                return array_intersect($namespace['commands'], array_keys($commands));
+            $width = $this->getColumnWidth(call_user_func_array('array_merge', array_map(function($namespace) use ($commands) {
+                return array_intersect($namespace[ 'commands' ], array_keys($commands));
             }, $namespaces)));
 
             if ($describedNamespace) {
@@ -223,22 +223,22 @@ 
             }
 
             foreach ($namespaces as $namespace) {
-                $namespace['commands'] = array_filter($namespace['commands'], function ($name) use ($commands) {
-                    return isset($commands[$name]);
+                $namespace[ 'commands' ] = array_filter($namespace[ 'commands' ], function($name) use ($commands) {
+                    return isset($commands[ $name ]);
                 });
 
-                if (!$namespace['commands'])
+                if (!$namespace[ 'commands' ])
                     continue;
 
-                if (!$describedNamespace && ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
+                if (!$describedNamespace && ApplicationDescription::GLOBAL_NAMESPACE !== $namespace[ 'id' ]) {
                     $this->writeText("\n");
-                    $this->writeText(' <comment>'.$namespace['id'].'</comment>', $options);
+                    $this->writeText(' <comment>'.$namespace[ 'id' ].'</comment>', $options);
                 }
 
-                foreach ($namespace['commands'] as $name) {
+                foreach ($namespace[ 'commands' ] as $name) {
                     $this->writeText("\n");
                     $spacingWidth = $width - Helper::strlen($name);
-                    $command = $commands[$name];
+                    $command = $commands[ $name ];
                     $commandAliases = $name === $command->getName() ? $this->getCommandAliasesText($command) : '';
                     $this->writeText(sprintf('  <info>%s</info>%s%s', $name, str_repeat(' ', $spacingWidth), $commandAliases.$command->getDescription()), $options);
                 }
@@ -254,8 +254,8 @@ 
     private function writeText($content, array $options = array())
     {
         $this->write(
-            isset($options['raw_text']) && $options['raw_text'] ? strip_tags($content) : $content,
-            isset($options['raw_output']) ? !$options['raw_output'] : true
+            isset($options[ 'raw_text' ]) && $options[ 'raw_text' ] ? strip_tags($content) : $content,
+            isset($options[ 'raw_output' ]) ? !$options[ 'raw_output' ] : true
         );
     }
 
@@ -275,7 +275,7 @@ 
         } elseif (is_array($default)) {
             foreach ($default as $key => $value) {
                 if (is_string($value)) {
-                    $default[$key] = OutputFormatter::escape($value);
+                    $default[ $key ] = OutputFormatter::escape($value);
                 }
             }
         }
@@ -293,13 +293,13 @@ 
 
         foreach ($commands as $command) {
             if ($command instanceof Command) {
-                $widths[] = Helper::strlen($command->getName());
+                $widths[ ] = Helper::strlen($command->getName());
 
                 foreach ($command->getAliases() as $alias) {
-                    $widths[] = Helper::strlen($alias);
+                    $widths[ ] = Helper::strlen($alias);
                 }
             } else {
-                $widths[] = Helper::strlen($command);
+                $widths[ ] = Helper::strlen($command);
             }
         }
 

Braces +12 added lines, -8 removed lines

@@ -106,8 +106,9 @@ 
             }
         }
 
-        if ($definition->getArguments() && $definition->getOptions())
-            $this->writeText("\n");
+        if ($definition->getArguments() && $definition->getOptions()) {
+                    $this->writeText("\n");
+        }
 
         if ($definition->getOptions()) {
             $laterOptions = array();
@@ -189,8 +190,9 @@ 
                 $this->writeText("\n");
             }
         } else {
-            if ('' != $help = $kernel->getHelp())
-                $this->writeText("$help\n\n", $options);
+            if ('' != $help = $kernel->getHelp()) {
+                            $this->writeText("$help\n\n", $options);
+            }
 
             $this->writeText("<comment>Usage:</comment>\n", $options);
             $this->writeText("  command [options] [arguments]\n\n", $options);
@@ -227,8 +229,9 @@ 
                     return isset($commands[$name]);
                 });
 
-                if (!$namespace['commands'])
-                    continue;
+                if (!$namespace['commands']) {
+                                    continue;
+                }
 
                 if (!$describedNamespace && ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
                     $this->writeText("\n");
@@ -267,8 +270,9 @@ 
      */
     private function formatDefaultValue($default): string
     {
-        if (INF === $default)
-            return 'INF';
+        if (INF === $default) {
+                    return 'INF';
+        }
 
         if (is_string($default)) {
             $default = OutputFormatter::escape($default);

app/framework/Component/Console/Output/Descriptor/ApplicationDescription.php

Spacing +14 added lines, -14 removed lines

@@ -48,7 +48,7 @@ 
     public function getNamespaces()
     {
         //if (null === $this->namespaces) {
-        if ([] === $this->namespaces) {
+        if ([ ] === $this->namespaces) {
             $this->inspectApplication();
         }
 
@@ -76,21 +76,21 @@ 
      */
     public function getCommand($name)
     {
-        if (!isset($this->commands[$name]) && !isset($this->aliases[$name]))
+        if (!isset($this->commands[ $name ]) && !isset($this->aliases[ $name ]))
             throw new CommandNotFoundException(sprintf('Command %s does not exist.', $name));
 
-        return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name];
+        return isset($this->commands[ $name ]) ? $this->commands[ $name ] : $this->aliases[ $name ];
     }
 
     private function inspectApplication()
     {
-        $this->commands   = [];
-        $this->namespaces = [];
+        $this->commands   = [ ];
+        $this->namespaces = [ ];
         $all = $this->kernel->all($this->namespace ? $this->kernel->findNamespace($this->namespace) : null);
         //dd($this->kernel->findNamespace($this->namespace));
 
         foreach ($this->sortCommands($all) as $namespace => $commands) {
-            $names = [];
+            $names = [ ];
 
             /** @var Command $command */
             foreach ($commands as $name => $command) {
@@ -98,15 +98,15 @@ 
                     continue;
 
                 if ($command->getName() === $name) {
-                    $this->commands[$name] = $command;
+                    $this->commands[ $name ] = $command;
                 } else {
-                    $this->aliases[$name] = $command;
+                    $this->aliases[ $name ] = $command;
                 }
 
-                $names[] = $name;
+                $names[ ] = $name;
             }
 
-            $this->namespaces[$namespace] = ['id' => $namespace, 'commands' => $names];
+            $this->namespaces[ $namespace ] = [ 'id' => $namespace, 'commands' => $names ];
         }
     }
 
@@ -118,15 +118,15 @@ 
      */
     private function sortCommands(array $commands): array
     {
-        $namespacedCommands = [];
-        $globalCommands     = [];
+        $namespacedCommands = [ ];
+        $globalCommands     = [ ];
 
         foreach ($commands as $name => $command) {
             $key = $this->kernel->extractNamespace($name, 1);
             if (!$key) {
-                $globalCommands['_global'][$name] = $command;
+                $globalCommands[ '_global' ][ $name ] = $command;
             } else {
-                $namespacedCommands[$key][$name] = $command;
+                $namespacedCommands[ $key ][ $name ] = $command;
             }
         }
 

Braces +6 added lines, -4 removed lines

@@ -76,8 +76,9 @@ 
      */
     public function getCommand($name)
     {
-        if (!isset($this->commands[$name]) && !isset($this->aliases[$name]))
-            throw new CommandNotFoundException(sprintf('Command %s does not exist.', $name));
+        if (!isset($this->commands[$name]) && !isset($this->aliases[$name])) {
+                    throw new CommandNotFoundException(sprintf('Command %s does not exist.', $name));
+        }
 
         return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name];
     }
@@ -94,8 +95,9 @@ 
 
             /** @var Command $command */
             foreach ($commands as $name => $command) {
-                if (!$command->getName() || (!$this->showHidden && $command->isHidden()))
-                    continue;
+                if (!$command->getName() || (!$this->showHidden && $command->isHidden())) {
+                                    continue;
+                }
 
                 if ($command->getName() === $name) {
                     $this->commands[$name] = $command;

app/framework/Component/Console/Output/Formatter/OutputFormatter.php

Spacing +18 added lines, -18 removed lines

@@ -77,12 +77,12 @@ 
 
     public function setStyle($name, OutputFormatterStyleInterface $style)
     {
-        $this->styles[strtolower($name)] = $style;
+        $this->styles[ strtolower($name) ] = $style;
     }
 
     public function hasStyle($name)
     {
-        return isset($this->styles[strtolower($name)]);
+        return isset($this->styles[ strtolower($name) ]);
     }
 
     public function getStyle($name)
@@ -91,7 +91,7 @@ 
             throw new \InvalidArgumentException(sprintf('Undefined style: %s', $name));
         }
 
-        return $this->styles[strtolower($name)];
+        return $this->styles[ strtolower($name) ];
     }
 
     /**
@@ -105,11 +105,11 @@ 
         $tagRegex = '[a-z][a-z0-9,_=;-]*+';
         preg_match_all("#<(($tagRegex) | /($tagRegex)?)>#ix", $message, $matches, PREG_OFFSET_CAPTURE);
 
-        foreach ($matches[0] as $i => $match) {
-            $pos = $match[1];
-            $text = $match[0];
+        foreach ($matches[ 0 ] as $i => $match) {
+            $pos = $match[ 1 ];
+            $text = $match[ 0 ];
 
-            if (0 != $pos && '\\' == $message[$pos - 1])
+            if (0 != $pos && '\\' == $message[ $pos - 1 ])
                 continue;
 
             // add the text up to the next tag
@@ -117,10 +117,10 @@ 
             $offset = $pos + strlen($text);
 
             // opening tag?
-            if ($open = '/' != $text[1]) {
-                $tag = $matches[1][$i][0];
+            if ($open = '/' != $text[ 1 ]) {
+                $tag = $matches[ 1 ][ $i ][ 0 ];
             } else {
-                $tag = isset($matches[3][$i][0]) ? $matches[3][$i][0] : '';
+                $tag = isset($matches[ 3 ][ $i ][ 0 ]) ? $matches[ 3 ][ $i ][ 0 ] : '';
             }
 
             if (!$open && !$tag) {
@@ -150,8 +150,8 @@ 
      */
     private function createStyleFromString(string $string)
     {
-        if (isset($this->styles[$string]))
-            return $this->styles[$string];
+        if (isset($this->styles[ $string ]))
+            return $this->styles[ $string ];
 
         if (!preg_match_all('/([^=]+)=([^;]+)(;|$)/', $string, $matches, PREG_SET_ORDER))
             return false;
@@ -160,12 +160,12 @@ 
 
         foreach ($matches as $match) {
             array_shift($match);
-            if ('fg' == $match[0]) {
-                $style->setForeground($match[1]);
-            } elseif ('bg' == $match[0]) {
-                $style->setBackground($match[1]);
-            } elseif ('options' === $match[0]) {
-                preg_match_all('([^,;]+)', $match[1], $options);
+            if ('fg' == $match[ 0 ]) {
+                $style->setForeground($match[ 1 ]);
+            } elseif ('bg' == $match[ 0 ]) {
+                $style->setBackground($match[ 1 ]);
+            } elseif ('options' === $match[ 0 ]) {
+                preg_match_all('([^,;]+)', $match[ 1 ], $options);
                 $options = array_shift($options);
                 foreach ($options as $option) {
                     $style->setOption($option);

Braces +12 added lines, -8 removed lines

@@ -109,8 +109,9 @@ 
             $pos = $match[1];
             $text = $match[0];
 
-            if (0 != $pos && '\\' == $message[$pos - 1])
-                continue;
+            if (0 != $pos && '\\' == $message[$pos - 1]) {
+                            continue;
+            }
 
             // add the text up to the next tag
             $output .= $this->applyCurrentStyle(substr($message, $offset, $pos - $offset));
@@ -137,8 +138,9 @@ 
 
         $output .= $this->applyCurrentStyle(substr($message, $offset));
 
-        if (false !== strpos($output, "\0"))
-            return strtr($output, array("\0" => '\\', '\\<' => '<'));
+        if (false !== strpos($output, "\0")) {
+                    return strtr($output, array("\0" => '\\', '\\<' => '<'));
+        }
 
         return str_replace('\\<', '<', $output);
     }
@@ -150,11 +152,13 @@ 
      */
     private function createStyleFromString(string $string)
     {
-        if (isset($this->styles[$string]))
-            return $this->styles[$string];
+        if (isset($this->styles[$string])) {
+                    return $this->styles[$string];
+        }
 
-        if (!preg_match_all('/([^=]+)=([^;]+)(;|$)/', $string, $matches, PREG_SET_ORDER))
-            return false;
+        if (!preg_match_all('/([^=]+)=([^;]+)(;|$)/', $string, $matches, PREG_SET_ORDER)) {
+                    return false;
+        }
 
         $style = new OutputFormatterStyle();