@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | /** |
24 | 24 | * A constructor alias; If you don't like the 'new' keyword. |
25 | 25 | * @param string|Tarsana\Syntax\ObjectSyntax $syntax |
26 | - * @return Tarsana\Command\Syntax\SyntaxBuilder |
|
26 | + * @return SyntaxBuilder |
|
27 | 27 | * @throws Tarsana\Command\Exceptions\SyntaxBuilderException |
28 | 28 | */ |
29 | 29 | public static function of($syntax) |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | * @param string $name |
89 | 89 | * @param string $description |
90 | 90 | * @param mixed $default |
91 | - * @return Tarsana\Command\Syntax\SyntaxBuilder |
|
91 | + * @return SyntaxBuilder |
|
92 | 92 | */ |
93 | 93 | public function describe($name, $description, $default = null) |
94 | 94 | { |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | /** |
105 | 105 | * Gets a field or subfield from an Syntax. |
106 | 106 | * |
107 | - * @param Tarsana\Syntax\Syntax $syntax |
|
107 | + * @param Syntax $syntax |
|
108 | 108 | * @param array $names |
109 | 109 | * @return Tarsana\Syntax\Syntax |
110 | 110 | * @throws Tarsana\Command\Exceptions\SyntaxBuilderException |
@@ -122,8 +122,8 @@ discard block |
||
122 | 122 | * Ensures that `$syntax` is an ObjectSyntax or an ArraySyntax of ObjectSyntaxes, |
123 | 123 | * and returns the ObjectSyntax or throws a SyntaxBuilderException. |
124 | 124 | * |
125 | - * @param Tarsana\Syntax\Syntax $syntax |
|
126 | - * @return Tarsana\Syntax\Syntax |
|
125 | + * @param Syntax $syntax |
|
126 | + * @return ObjectSyntax |
|
127 | 127 | * @throws Tarsana\Command\Exceptions\SyntaxBuilderException |
128 | 128 | */ |
129 | 129 | protected function ensureObject(Syntax $syntax) |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | { |
42 | 42 | if (is_string($syntax)) { |
43 | 43 | $syntax = self::syntaxFromString($syntax); |
44 | - } else if (! ($syntax instanceof ObjectSyntax)) { |
|
44 | + } else if (!($syntax instanceof ObjectSyntax)) { |
|
45 | 45 | throw new SyntaxBuilderException("The command syntax should be an insatnce of ObjectSyntax"); |
46 | 46 | } |
47 | 47 | |
@@ -65,11 +65,11 @@ discard block |
||
65 | 65 | * @return Tarsana\Syntax\Syntax |
66 | 66 | * @throws Tarsana\Command\Exceptions\SyntaxBuilderException |
67 | 67 | */ |
68 | - protected static function syntaxFromString ($value) |
|
68 | + protected static function syntaxFromString($value) |
|
69 | 69 | { |
70 | 70 | $syntax = F\s($value)->then( // "first name" [#age] |
71 | - F\chunks('(){}[]""', ' '), // ["first name", [#age]] |
|
72 | - F\join(','), // "first name",[#age] |
|
71 | + F\chunks('(){}[]""', ' '), // ["first name", [#age]] |
|
72 | + F\join(','), // "first name",[#age] |
|
73 | 73 | F\prepend('{ ,'), F\append('}') // { ,"first name",[#age]} |
74 | 74 | )->get(); |
75 | 75 | |
@@ -111,8 +111,7 @@ discard block |
||
111 | 111 | */ |
112 | 112 | protected function field(Syntax $syntax, $names) |
113 | 113 | { |
114 | - return empty($names) ? $syntax : |
|
115 | - $this->field( |
|
114 | + return empty($names) ? $syntax : $this->field( |
|
116 | 115 | $this->ensureObject($syntax)->field(F\head($names)), |
117 | 116 | F\tail($names) |
118 | 117 | ); |
@@ -131,7 +130,7 @@ discard block |
||
131 | 130 | while ($syntax instanceof ArraySyntax) { |
132 | 131 | $syntax = $syntax->itemSyntax(); |
133 | 132 | } |
134 | - if (! ($syntax instanceof ObjectSyntax)) { |
|
133 | + if (!($syntax instanceof ObjectSyntax)) { |
|
135 | 134 | throw new SyntaxBuilderException("Could not retreive field of non object syntax '{$syntax}'"); |
136 | 135 | } |
137 | 136 | return $syntax; |
@@ -75,8 +75,9 @@ |
||
75 | 75 | |
76 | 76 | $ss = S::syntax(); |
77 | 77 | |
78 | - if (!$ss->canParse($syntax)) |
|
79 | - throw new SyntaxBuilderException("Invalid Syntax: '{$syntax}'"); |
|
78 | + if (!$ss->canParse($syntax)) { |
|
79 | + throw new SyntaxBuilderException("Invalid Syntax: '{$syntax}'"); |
|
80 | + } |
|
80 | 81 | |
81 | 82 | return $ss->parse($syntax); |
82 | 83 | } |
@@ -58,7 +58,7 @@ |
||
58 | 58 | /** |
59 | 59 | * Filesystem getter and setter. |
60 | 60 | * |
61 | - * @param Tarsana\IO\Filesystem|void $value |
|
61 | + * @param null|Filesystem $value |
|
62 | 62 | * @return Tarsana\IO\Filesystem|self |
63 | 63 | */ |
64 | 64 | public function fs (Filesystem $value = null) |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | * @param Tarsana\IO\Filesystem|void $value |
62 | 62 | * @return Tarsana\IO\Filesystem|self |
63 | 63 | */ |
64 | - public function fs (Filesystem $value = null) |
|
64 | + public function fs(Filesystem $value = null) |
|
65 | 65 | { |
66 | 66 | if (null === $value) |
67 | 67 | return $this->fs; |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | * @throws Tarsana\Command\Exceptions\TemplateNotFound |
82 | 82 | * @throws Tarsana\Command\Exceptions\TemplateNameConflict |
83 | 83 | */ |
84 | - public function load ($name) |
|
84 | + public function load($name) |
|
85 | 85 | { |
86 | 86 | $suportedExtensions = array_keys(self::$providers); |
87 | 87 |
@@ -63,8 +63,9 @@ |
||
63 | 63 | */ |
64 | 64 | public function fs (Filesystem $value = null) |
65 | 65 | { |
66 | - if (null === $value) |
|
67 | - return $this->fs; |
|
66 | + if (null === $value) { |
|
67 | + return $this->fs; |
|
68 | + } |
|
68 | 69 | $this->fs = $value; |
69 | 70 | return $this; |
70 | 71 | } |
@@ -38,7 +38,7 @@ |
||
38 | 38 | * Loads a template. |
39 | 39 | * |
40 | 40 | * @param string $name |
41 | - * @return Tarsana\Command\Templates\TwigTemplate |
|
41 | + * @return TwigTemplate |
|
42 | 42 | */ |
43 | 43 | public function load($name) |
44 | 44 | { |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | protected $data; |
23 | 23 | |
24 | - public function __construct (\Twig_TemplateInterface $twig) |
|
24 | + public function __construct(\Twig_TemplateInterface $twig) |
|
25 | 25 | { |
26 | 26 | $this->twig = $twig; |
27 | 27 | $this->data = []; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @param array $data |
34 | 34 | * @return self |
35 | 35 | */ |
36 | - public function bind ($data) |
|
36 | + public function bind($data) |
|
37 | 37 | { |
38 | 38 | $this->data = array_merge($this->data, $data); |
39 | 39 | return $this; |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | * |
58 | 58 | * @return self |
59 | 59 | */ |
60 | - public function clean () |
|
60 | + public function clean() |
|
61 | 61 | { |
62 | 62 | $this->data = []; |
63 | 63 | } |
@@ -73,7 +73,7 @@ |
||
73 | 73 | public function command($name, $value = null) |
74 | 74 | { |
75 | 75 | if (null === $value) { |
76 | - if (! $this->hasCommand($name)) { |
|
76 | + if (!$this->hasCommand($name)) { |
|
77 | 77 | throw new EnvironmentException("Unable to find the command '{$name}'"); |
78 | 78 | } |
79 | 79 | return $this->store->get($name); |
@@ -19,8 +19,8 @@ |
||
19 | 19 | { |
20 | 20 | $c = $this->parent(); |
21 | 21 | $this->console |
22 | - ->green()->inline($c->name()) |
|
23 | - ->white()->inline(' version ') |
|
24 | - ->yellow()->out($c->version()); |
|
22 | + ->green()->inline($c->name()) |
|
23 | + ->white()->inline(' version ') |
|
24 | + ->yellow()->out($c->version()); |
|
25 | 25 | } |
26 | 26 | } |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | class VersionCommand extends SubCommand { |
9 | 9 | |
10 | - protected function init () |
|
10 | + protected function init() |
|
11 | 11 | { |
12 | 12 | $this |
13 | 13 | ->name('Version') |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | ->description('Shows the version of the command'); |
16 | 16 | } |
17 | 17 | |
18 | - protected function execute () |
|
18 | + protected function execute() |
|
19 | 19 | { |
20 | 20 | $c = $this->parent(); |
21 | 21 | $this->console |
@@ -35,15 +35,15 @@ discard block |
||
35 | 35 | $c = $this->console(); |
36 | 36 | |
37 | 37 | $c->br() |
38 | - ->green() |
|
39 | - ->inline($command->name() . ' ') |
|
40 | - ->yellow() |
|
41 | - ->out($command->version()) |
|
42 | - ->br() |
|
43 | - ->out($command->description()) |
|
44 | - ->br() |
|
45 | - ->yellow() |
|
46 | - ->inline('Arguments: '); |
|
38 | + ->green() |
|
39 | + ->inline($command->name() . ' ') |
|
40 | + ->yellow() |
|
41 | + ->out($command->version()) |
|
42 | + ->br() |
|
43 | + ->out($command->description()) |
|
44 | + ->br() |
|
45 | + ->yellow() |
|
46 | + ->inline('Arguments: '); |
|
47 | 47 | |
48 | 48 | $args = F\s(array_keys($command->syntax()->fields())) |
49 | 49 | ->then(F\join(' ')) |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | ->get() * 2; |
68 | 68 | foreach ($command->subCommands() as $name => $cmd) { |
69 | 69 | $c->tab() |
70 | - ->padding($padding)->char(' ') |
|
71 | - ->label("<green>{$name}</green>") |
|
72 | - ->result($cmd->description()); |
|
70 | + ->padding($padding)->char(' ') |
|
71 | + ->label("<green>{$name}</green>") |
|
72 | + ->result($cmd->description()); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | } |
@@ -86,8 +86,8 @@ discard block |
||
86 | 86 | $c->out("(Required)"); |
87 | 87 | } else { |
88 | 88 | $c->inline("(default: ") |
89 | - ->white()->inline(json_encode($syntax->getDefault())) |
|
90 | - ->yellow()->out(" )"); |
|
89 | + ->white()->inline(json_encode($syntax->getDefault())) |
|
90 | + ->yellow()->out(" )"); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | if ($syntax instanceof ArraySyntax) { |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | class HelpCommand extends SubCommand { |
14 | 14 | |
15 | - protected function init () |
|
15 | + protected function init() |
|
16 | 16 | { |
17 | 17 | $this |
18 | 18 | ->name('Help') |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | ->syntax('[command]'); |
22 | 22 | } |
23 | 23 | |
24 | - protected function execute () |
|
24 | + protected function execute() |
|
25 | 25 | { |
26 | 26 | $command = trim($this->args->command); |
27 | 27 | if (empty($command) || !$this->parent()->hasCommand($command)) |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | $this->showHelpOf($this->parent->command($command)); |
31 | 31 | } |
32 | 32 | |
33 | - protected function showHelpOf (Command $command) |
|
33 | + protected function showHelpOf(Command $command) |
|
34 | 34 | { |
35 | 35 | $c = $this->console(); |
36 | 36 |
@@ -24,10 +24,11 @@ |
||
24 | 24 | protected function execute () |
25 | 25 | { |
26 | 26 | $command = trim($this->args->command); |
27 | - if (empty($command) || !$this->parent()->hasCommand($command)) |
|
28 | - $this->showHelpOf($this->parent); |
|
29 | - else |
|
30 | - $this->showHelpOf($this->parent->command($command)); |
|
27 | + if (empty($command) || !$this->parent()->hasCommand($command)) { |
|
28 | + $this->showHelpOf($this->parent); |
|
29 | + } else { |
|
30 | + $this->showHelpOf($this->parent->command($command)); |
|
31 | + } |
|
31 | 32 | } |
32 | 33 | |
33 | 34 | protected function showHelpOf (Command $command) |
@@ -87,7 +87,7 @@ |
||
87 | 87 | * Shows the syntax description of a part of arguments. |
88 | 88 | * |
89 | 89 | * @param string $name |
90 | - * @param Tarsana\Syntax\Syntax $syntax |
|
90 | + * @param Syntax $syntax |
|
91 | 91 | * @param int $level |
92 | 92 | * @return void |
93 | 93 | */ |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | public function store($name, $value) |
72 | 72 | { |
73 | 73 | // Validates the name |
74 | - if (! is_string($name)) { |
|
74 | + if (!is_string($name)) { |
|
75 | 75 | $this->error('The name must be a string'); |
76 | 76 | } |
77 | 77 | if ($this->contains($name)) { |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | // Validates the value |
82 | 82 | if (is_string($value)) { |
83 | - if (! class_exists($value)) { |
|
83 | + if (!class_exists($value)) { |
|
84 | 84 | $this->error("Trying to store an unknow class '{$value}'"); |
85 | 85 | } |
86 | 86 | if ($value != $this->type && !is_subclass_of($value, $this->type)) { |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | public function get($name) |
122 | 122 | { |
123 | - if (! $this->contains($name)) { |
|
123 | + if (!$this->contains($name)) { |
|
124 | 124 | $this->error("The element with name '{$name}' is missing"); |
125 | 125 | } |
126 | 126 |
@@ -328,7 +328,7 @@ |
||
328 | 328 | |
329 | 329 | else |
330 | 330 | $this->args($this->syntax()->parse($args)) |
331 | - ->execute(); |
|
331 | + ->execute(); |
|
332 | 332 | } |
333 | 333 | } catch (\Exception $e) { |
334 | 334 | $this->error( |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | * adds/overrides or gets a sub command. |
212 | 212 | * |
213 | 213 | * @param string $name |
214 | - * @param Tarsana\Command\Command|null $cmd |
|
214 | + * @param null|Command $cmd |
|
215 | 215 | * @return Tarsana\Command\Command |
216 | 216 | * @throws Tarsana\Command\Exceptions\CommandNotFound |
217 | 217 | */ |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | * Runs the command. |
300 | 300 | * |
301 | 301 | * @param string|null $args |
302 | - * @param League\CLImate\CLImate|null $console |
|
302 | + * @param null|CLImate $console |
|
303 | 303 | * @return void |
304 | 304 | */ |
305 | 305 | public function run($args = null, CLImate $console = null) |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | $this->command($firstArg)->run($args, $console); |
318 | 318 | } else { |
319 | 319 | $this->console($console); |
320 | - if (! $this->syntax()->canParse($args)) { |
|
320 | + if (!$this->syntax()->canParse($args)) { |
|
321 | 321 | $errors = F\s($this->syntax()->checkParse($args)) |
322 | 322 | ->then(F\append("Invalid arguments: '{$args}' for command '{$this->name}'")) |
323 | 323 | ->then(F\join(PHP_EOL)) |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | */ |
376 | 376 | protected function addDefaultSubCommands() |
377 | 377 | { |
378 | - if (! ($this instanceof HelpCommand) && ! ($this instanceof VersionCommand)) { |
|
378 | + if (!($this instanceof HelpCommand) && !($this instanceof VersionCommand)) { |
|
379 | 379 | $this->command('--version', new VersionCommand($this)); |
380 | 380 | $this->command('--help', new HelpCommand($this)); |
381 | 381 | } |
@@ -108,8 +108,9 @@ discard block |
||
108 | 108 | */ |
109 | 109 | public function name($value = null) |
110 | 110 | { |
111 | - if (null === $value) |
|
112 | - return $this->name; |
|
111 | + if (null === $value) { |
|
112 | + return $this->name; |
|
113 | + } |
|
113 | 114 | |
114 | 115 | $this->name = $value; |
115 | 116 | return $this; |
@@ -123,8 +124,9 @@ discard block |
||
123 | 124 | */ |
124 | 125 | public function description($value = null) |
125 | 126 | { |
126 | - if (null === $value) |
|
127 | - return $this->description; |
|
127 | + if (null === $value) { |
|
128 | + return $this->description; |
|
129 | + } |
|
128 | 130 | |
129 | 131 | $this->description = $value; |
130 | 132 | return $this; |
@@ -138,8 +140,9 @@ discard block |
||
138 | 140 | */ |
139 | 141 | public function version($value = null) |
140 | 142 | { |
141 | - if (null === $value) |
|
142 | - return $this->version; |
|
143 | + if (null === $value) { |
|
144 | + return $this->version; |
|
145 | + } |
|
143 | 146 | |
144 | 147 | $this->version = $value; |
145 | 148 | return $this; |
@@ -153,8 +156,9 @@ discard block |
||
153 | 156 | */ |
154 | 157 | public function console($value = null) |
155 | 158 | { |
156 | - if (null === $value) |
|
157 | - return $this->console; |
|
159 | + if (null === $value) { |
|
160 | + return $this->console; |
|
161 | + } |
|
158 | 162 | |
159 | 163 | $this->console = $value; |
160 | 164 | return $this; |
@@ -169,8 +173,9 @@ discard block |
||
169 | 173 | */ |
170 | 174 | public function syntax($value = null) |
171 | 175 | { |
172 | - if (null === $value) |
|
173 | - return $this->syntaxBuilder->get(); |
|
176 | + if (null === $value) { |
|
177 | + return $this->syntaxBuilder->get(); |
|
178 | + } |
|
174 | 179 | |
175 | 180 | $this->syntaxBuilder = SyntaxBuilder::of($value); |
176 | 181 | |
@@ -218,8 +223,9 @@ discard block |
||
218 | 223 | public function command($name, Command $cmd = null) |
219 | 224 | { |
220 | 225 | if (null === $cmd) { |
221 | - if (!$this->hasCommand($name)) |
|
222 | - throw new CommandNotFound("Command '{$this->name}' has no subcommand '{$name}'"); |
|
226 | + if (!$this->hasCommand($name)) { |
|
227 | + throw new CommandNotFound("Command '{$this->name}' has no subcommand '{$name}'"); |
|
228 | + } |
|
223 | 229 | return $this->subCommands[$name]; |
224 | 230 | } |
225 | 231 | |
@@ -245,8 +251,9 @@ discard block |
||
245 | 251 | */ |
246 | 252 | public function args($value = null) |
247 | 253 | { |
248 | - if (null === $value) |
|
249 | - return $this->args; |
|
254 | + if (null === $value) { |
|
255 | + return $this->args; |
|
256 | + } |
|
250 | 257 | |
251 | 258 | $this->args = $value; |
252 | 259 | return $this; |
@@ -346,8 +353,9 @@ discard block |
||
346 | 353 | */ |
347 | 354 | protected function template($name) |
348 | 355 | { |
349 | - if (null === $this->templateLoader) |
|
350 | - throw new NullPropertyAccess("The templatesLoader is not initialized; Please set it before trying to load a template !"); |
|
356 | + if (null === $this->templateLoader) { |
|
357 | + throw new NullPropertyAccess("The templatesLoader is not initialized; Please set it before trying to load a template !"); |
|
358 | + } |
|
351 | 359 | |
352 | 360 | return $this->templateLoader->load($name); |
353 | 361 | } |