| @@ -87,8 +87,9 @@ | ||
| 87 | 87 | $found = []; | 
| 88 | 88 |          foreach ($files as $file) { | 
| 89 | 89 | $ext = $file->extension(); | 
| 90 | - if (!in_array($ext, $supportedExtensions)) | |
| 91 | - continue; | |
| 90 | +            if (!in_array($ext, $supportedExtensions)) { | |
| 91 | + continue; | |
| 92 | + } | |
| 92 | 93 | $found[] = [ | 
| 93 | 94 | 'name' => substr($file->path(), $fsPathLength), | 
| 94 | 95 | 'extension' => $ext | 
| @@ -41,24 +41,27 @@ | ||
| 41 | 41 | |
| 42 | 42 | public function stdin(ReaderInterface $in = null) | 
| 43 | 43 |      { | 
| 44 | - if (null === $in) | |
| 45 | - return $this->in; | |
| 44 | +        if (null === $in) { | |
| 45 | + return $this->in; | |
| 46 | + } | |
| 46 | 47 | $this->in = $in; | 
| 47 | 48 | return $this; | 
| 48 | 49 | } | 
| 49 | 50 | |
| 50 | 51 | public function stdout(WriterInterface $out = null) | 
| 51 | 52 |      { | 
| 52 | - if (null === $out) | |
| 53 | - return $this->out; | |
| 53 | +        if (null === $out) { | |
| 54 | + return $this->out; | |
| 55 | + } | |
| 54 | 56 | $this->out = $out; | 
| 55 | 57 | return $this; | 
| 56 | 58 | } | 
| 57 | 59 | |
| 58 | 60 | public function stderr(WriterInterface $err = null) | 
| 59 | 61 |      { | 
| 60 | - if (null === $err) | |
| 61 | - return $this->err; | |
| 62 | +        if (null === $err) { | |
| 63 | + return $this->err; | |
| 64 | + } | |
| 62 | 65 | $this->err = $err; | 
| 63 | 66 | return $this; | 
| 64 | 67 | } | 
| @@ -7,7 +7,6 @@ | ||
| 7 | 7 | use Tarsana\IO\Interfaces\Resource\Writer as WriterInterface; | 
| 8 | 8 | use Tarsana\IO\Resource\Reader; | 
| 9 | 9 | use Tarsana\IO\Resource\Writer; | 
| 10 | -use Tarsana\Syntax\Syntax; | |
| 11 | 10 | |
| 12 | 11 |  class Console implements ConsoleInterface { | 
| 13 | 12 | |
| @@ -18,8 +18,9 @@ discard block | ||
| 18 | 18 | */ | 
| 19 | 19 | public function print(\Exception $e) : string | 
| 20 | 20 |      { | 
| 21 | - if ($e instanceof ParseException) | |
| 22 | - return $this->printParseException($e); | |
| 21 | +        if ($e instanceof ParseException) { | |
| 22 | + return $this->printParseException($e); | |
| 23 | + } | |
| 23 | 24 | |
| 24 | 25 |          return "<error>{$e}</error>"; | 
| 25 | 26 | } | 
| @@ -36,10 +37,12 @@ discard block | ||
| 36 | 37 | $error = ''; | 
| 37 | 38 |          if ($syntax instanceof ObjectSyntax) { | 
| 38 | 39 | $i = $e->extra(); | 
| 39 | - if ($i['type'] == 'invalid-field') | |
| 40 | -                $error = "{$i['field']} is invalid!"; | |
| 41 | - if ($i['type'] == 'missing-field') | |
| 42 | -                $error = "{$i['field']} is missing!"; | |
| 40 | +            if ($i['type'] == 'invalid-field') { | |
| 41 | +                            $error = "{$i['field']} is invalid!"; | |
| 42 | + } | |
| 43 | +            if ($i['type'] == 'missing-field') { | |
| 44 | +                            $error = "{$i['field']} is missing!"; | |
| 45 | + } | |
| 43 | 46 |              if ($i['type'] == 'additional-items') { | 
| 44 | 47 | $items = implode($syntax->separator(), $i['items']); | 
| 45 | 48 |                  $error = "additional items {$items}"; | 
| @@ -48,8 +51,9 @@ discard block | ||
| 48 | 51 | $syntax = $this->printSyntax($e->syntax()); | 
| 49 | 52 | |
| 50 | 53 |          $output = "<reset>Failed to parse <warn>'{$e->input()}'</warn> as <info>{$syntax}</info>"; | 
| 51 | -        if ('' != $error) | |
| 52 | -            $output .= " <error>{$error}</error>"; | |
| 54 | +        if ('' != $error) { | |
| 55 | +                    $output .= " <error>{$error}</error>"; | |
| 56 | + } | |
| 53 | 57 | |
| 54 | 58 | $previous = $e->previous(); | 
| 55 | 59 |          if ($previous) { | 
| @@ -62,11 +66,15 @@ discard block | ||
| 62 | 66 | protected function printSyntax(Syntax $s, bool $short = false) : string | 
| 63 | 67 |      { | 
| 64 | 68 |          if ($s instanceof ObjectSyntax) { | 
| 65 | - if ($short) return 'object'; | |
| 69 | +            if ($short) { | |
| 70 | + return 'object'; | |
| 71 | + } | |
| 66 | 72 | return implode($s->separator(), array_keys($s->fields())); | 
| 67 | 73 | } | 
| 68 | 74 |          if ($s instanceof ArraySyntax) { | 
| 69 | - if ($short) return 'array'; | |
| 75 | +            if ($short) { | |
| 76 | + return 'array'; | |
| 77 | + } | |
| 70 | 78 | return $this->printSyntax($s->syntax()).$s->separator().'...'; | 
| 71 | 79 | } | 
| 72 | 80 | return (string) $s; | 
| @@ -19,8 +19,9 @@ | ||
| 19 | 19 | protected function execute() | 
| 20 | 20 |      { | 
| 21 | 21 | $result = str_repeat($this->args->word, $this->args->count); | 
| 22 | -        if ($this->option('--upper')) | |
| 23 | - $result = strtoupper($result); | |
| 22 | +        if ($this->option('--upper')) { | |
| 23 | + $result = strtoupper($result); | |
| 24 | + } | |
| 24 | 25 | $this->console->line($result); | 
| 25 | 26 | } | 
| 26 | 27 | |
| @@ -36,8 +36,9 @@ discard block | ||
| 36 | 36 | |
| 37 | 37 |      public static function create(callable $action = null) { | 
| 38 | 38 | $command = new Command; | 
| 39 | - if (null !== $action) | |
| 40 | - $command->action($action); | |
| 39 | +        if (null !== $action) { | |
| 40 | + $command->action($action); | |
| 41 | + } | |
| 41 | 42 | return $command; | 
| 42 | 43 | } | 
| 43 | 44 | |
| @@ -123,8 +124,9 @@ discard block | ||
| 123 | 124 | */ | 
| 124 | 125 | public function syntax(string $syntax = null) | 
| 125 | 126 |      { | 
| 126 | - if (null === $syntax) | |
| 127 | - return $this->syntax; | |
| 127 | +        if (null === $syntax) { | |
| 128 | + return $this->syntax; | |
| 129 | + } | |
| 128 | 130 | |
| 129 | 131 |          $this->syntax = S::syntax()->parse("{{$syntax}| }"); | 
| 130 | 132 | return $this; | 
| @@ -143,8 +145,9 @@ discard block | ||
| 143 | 145 | } | 
| 144 | 146 | |
| 145 | 147 | $this->options = []; | 
| 146 | - foreach($options as $option) | |
| 147 | - $this->options[$option] = false; | |
| 148 | +        foreach($options as $option) { | |
| 149 | + $this->options[$option] = false; | |
| 150 | + } | |
| 148 | 151 | |
| 149 | 152 | return $this; | 
| 150 | 153 | } | 
| @@ -157,8 +160,9 @@ discard block | ||
| 157 | 160 | */ | 
| 158 | 161 | public function option(string $name) | 
| 159 | 162 |      { | 
| 160 | - if (!array_key_exists($name, $this->options)) | |
| 161 | -            throw new \InvalidArgumentException("Unknown option '{$name}'"); | |
| 163 | +        if (!array_key_exists($name, $this->options)) { | |
| 164 | +                    throw new \InvalidArgumentException("Unknown option '{$name}'"); | |
| 165 | + } | |
| 162 | 166 | return $this->options[$name]; | 
| 163 | 167 | } | 
| 164 | 168 | |
| @@ -206,8 +210,9 @@ discard block | ||
| 206 | 210 |          if (null === $value) { | 
| 207 | 211 | return $this->fs; | 
| 208 | 212 | } | 
| 209 | - if (is_string($value)) | |
| 210 | - $value = new Filesystem($value); | |
| 213 | +        if (is_string($value)) { | |
| 214 | + $value = new Filesystem($value); | |
| 215 | + } | |
| 211 | 216 | $this->fs = $value; | 
| 212 | 217 |          foreach ($this->commands as $name => $command) { | 
| 213 | 218 | $command->fs = $value; | 
| @@ -242,8 +247,9 @@ discard block | ||
| 242 | 247 | } | 
| 243 | 248 | |
| 244 | 249 |      public function template(string $name) { | 
| 245 | - if (null === $this->templatesLoader) | |
| 246 | -            throw new \Exception("Please initialize the templates loader before trying to load templates!"); | |
| 250 | +        if (null === $this->templatesLoader) { | |
| 251 | +                    throw new \Exception("Please initialize the templates loader before trying to load templates!"); | |
| 252 | + } | |
| 247 | 253 | return $this->templatesLoader->load($name); | 
| 248 | 254 | } | 
| 249 | 255 | |
| @@ -283,8 +289,9 @@ discard block | ||
| 283 | 289 | public function command(string $name, Command $command = null) | 
| 284 | 290 |      { | 
| 285 | 291 |          if (null === $command) { | 
| 286 | - if (!array_key_exists($name, $this->commands)) | |
| 287 | -                throw new \InvalidArgumentException("subcommand '{$name}' not found!"); | |
| 292 | +            if (!array_key_exists($name, $this->commands)) { | |
| 293 | +                            throw new \InvalidArgumentException("subcommand '{$name}' not found!"); | |
| 294 | + } | |
| 288 | 295 | return $this->commands[$name]; | 
| 289 | 296 | } | 
| 290 | 297 | $this->commands[$name] = $command; | 
| @@ -305,9 +312,10 @@ discard block | ||
| 305 | 312 | |
| 306 | 313 | public function describe(string $name, string $description = null) | 
| 307 | 314 |      { | 
| 308 | - if (null === $description) | |
| 309 | - return array_key_exists($name, $this->descriptions) | |
| 315 | +        if (null === $description) { | |
| 316 | + return array_key_exists($name, $this->descriptions) | |
| 310 | 317 | ? $this->descriptions[$name] : ''; | 
| 318 | + } | |
| 311 | 319 |          if (substr($name, 0, 2) == '--' && array_key_exists($name, $this->options())) { | 
| 312 | 320 | $this->descriptions[$name] = $description; | 
| 313 | 321 | return $this; | 
| @@ -343,8 +351,9 @@ discard block | ||
| 343 | 351 |              } else { | 
| 344 | 352 | $this->args = (object) $args; | 
| 345 | 353 |                  foreach ($options as $name) { | 
| 346 | - if (!array_key_exists($name, $this->options)) | |
| 347 | -                        throw new \Exception("Unknown option '{$name}'"); | |
| 354 | +                    if (!array_key_exists($name, $this->options)) { | |
| 355 | +                                            throw new \Exception("Unknown option '{$name}'"); | |
| 356 | + } | |
| 348 | 357 | $this->options[$name] = true; | 
| 349 | 358 | } | 
| 350 | 359 | } | 
| @@ -379,10 +388,11 @@ discard block | ||
| 379 | 388 | |
| 380 | 389 | $arguments = []; | 
| 381 | 390 |          foreach ($args as &$arg) { | 
| 382 | - if (array_key_exists($arg, $this->options)) | |
| 383 | - $this->options[$arg] = true; | |
| 384 | - else | |
| 385 | - $arguments[] = $arg; | |
| 391 | +            if (array_key_exists($arg, $this->options)) { | |
| 392 | + $this->options[$arg] = true; | |
| 393 | +            } else { | |
| 394 | + $arguments[] = $arg; | |
| 395 | + } | |
| 386 | 396 | } | 
| 387 | 397 | $arguments = T::join($arguments, ' '); | 
| 388 | 398 | $this->args = $this->syntax->parse($arguments); | 
| @@ -84,10 +84,11 @@ | ||
| 84 | 84 |      { | 
| 85 | 85 |          $tabs = str_repeat('<tab>', $level); | 
| 86 | 86 | $optional = ($s instanceof OptionalSyntax); | 
| 87 | - if ($optional) | |
| 88 | - $default = 'default: ' . json_encode($s->getDefault()); | |
| 89 | - else | |
| 90 | - $default = 'required'; | |
| 87 | +        if ($optional) { | |
| 88 | + $default = 'default: ' . json_encode($s->getDefault()); | |
| 89 | +        } else { | |
| 90 | + $default = 'required'; | |
| 91 | + } | |
| 91 | 92 | $description = $this->parent()->describe($prefix.$name); | 
| 92 | 93 | $syntax = $this->helper->asString($s); | 
| 93 | 94 |          $text   = "{$tabs}<warn>{$name}</warn> <success>{$syntax}</success>" | 
| @@ -9,8 +9,9 @@ discard block | ||
| 9 | 9 | |
| 10 | 10 | public static function instance() : SyntaxHelper | 
| 11 | 11 |      { | 
| 12 | - if (null === self::$instance) | |
| 13 | - self::$instance = new SyntaxHelper; | |
| 12 | +        if (null === self::$instance) { | |
| 13 | + self::$instance = new SyntaxHelper; | |
| 14 | + } | |
| 14 | 15 | return self::$instance; | 
| 15 | 16 | } | 
| 16 | 17 | |
| @@ -25,8 +26,9 @@ discard block | ||
| 25 | 26 | public function asString(Syntax $syntax) : string | 
| 26 | 27 |      { | 
| 27 | 28 | $type = $this->type($syntax); | 
| 28 | - if ($type == 'optional') | |
| 29 | - return $this->asString($syntax->syntax()); | |
| 29 | +        if ($type == 'optional') { | |
| 30 | + return $this->asString($syntax->syntax()); | |
| 31 | + } | |
| 30 | 32 |          switch ($type) { | 
| 31 | 33 | case 'object': | 
| 32 | 34 | return implode( | 
| @@ -104,8 +104,9 @@ discard block | ||
| 104 | 104 | protected function readObject(ObjectSyntax $syntax, string $prefix) | 
| 105 | 105 |      { | 
| 106 | 106 | $result = []; | 
| 107 | - if ($prefix != '') | |
| 108 | - $prefix .= '.'; | |
| 107 | +        if ($prefix != '') { | |
| 108 | + $prefix .= '.'; | |
| 109 | + } | |
| 109 | 110 |          foreach ($syntax->fields() as $name => $s) { | 
| 110 | 111 | $fullname = $prefix . $name; | 
| 111 | 112 | $result[$name] = $this->read($s, $fullname, true); | 
| @@ -132,8 +133,9 @@ discard block | ||
| 132 | 133 |          $this->console->out("<color:252>{$default}<column:1><reset>"); | 
| 133 | 134 | $n = ord($this->console->char()); | 
| 134 | 135 |          $this->console->out('<column:1><clearLine>'); | 
| 135 | - if (array_key_exists($n, static::KEYS) && static::KEYS[$n] == 'enter') | |
| 136 | - return $syntax->getDefault(); | |
| 136 | +        if (array_key_exists($n, static::KEYS) && static::KEYS[$n] == 'enter') { | |
| 137 | + return $syntax->getDefault(); | |
| 138 | + } | |
| 137 | 139 | return $this->read($syntax->syntax(), $prefix); | 
| 138 | 140 | } | 
| 139 | 141 | |
| @@ -175,8 +177,9 @@ discard block | ||
| 175 | 177 | protected function readChar() : string | 
| 176 | 178 |      { | 
| 177 | 179 | $c = $this->console->char(); | 
| 178 | - if (ctype_print($c)) | |
| 179 | - return $c; | |
| 180 | +        if (ctype_print($c)) { | |
| 181 | + return $c; | |
| 182 | + } | |
| 180 | 183 | $n = ord($c); | 
| 181 | 184 | if ( | 
| 182 | 185 | array_key_exists($n, static::KEYS) |