@@ -69,7 +69,7 @@ |
||
69 | 69 | |
70 | 70 | // All other special characters have to be escaped |
71 | 71 | // with two backslashes. |
72 | - foreach($this->regexSpecialChars as $char) |
|
72 | + foreach ($this->regexSpecialChars as $char) |
|
73 | 73 | { |
74 | 74 | $string = str_replace($char, '\\'.$char, $string); |
75 | 75 | } |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | */ |
21 | 21 | abstract class Mailcode_Translator_Syntax_ApacheVelocity extends Mailcode_Translator_Command |
22 | 22 | { |
23 | - /** |
|
24 | - * @var string[] |
|
25 | - */ |
|
23 | + /** |
|
24 | + * @var string[] |
|
25 | + */ |
|
26 | 26 | private $regexSpecialChars = array( |
27 | 27 | '?', |
28 | 28 | '.', |
@@ -47,15 +47,15 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | - * Filters the string for use in an Apache Velocity (Java) |
|
51 | - * regex string: escapes all special characters. |
|
52 | - * |
|
53 | - * Velocity does its own escaping, so no need to escape special |
|
54 | - * characters as if they were a javascript string. |
|
55 | - * |
|
56 | - * @param string $string |
|
57 | - * @return string |
|
58 | - */ |
|
50 | + * Filters the string for use in an Apache Velocity (Java) |
|
51 | + * regex string: escapes all special characters. |
|
52 | + * |
|
53 | + * Velocity does its own escaping, so no need to escape special |
|
54 | + * characters as if they were a javascript string. |
|
55 | + * |
|
56 | + * @param string $string |
|
57 | + * @return string |
|
58 | + */ |
|
59 | 59 | public function filterRegexString(string $string) : string |
60 | 60 | { |
61 | 61 | // Special case: previously escaped quotes. |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | const ERROR_CANNOT_RETRIEVE_FIRST_ERROR = 52301; |
26 | 26 | const ERROR_CANNOT_MODIFY_FINALIZED = 52302; |
27 | 27 | |
28 | - /** |
|
29 | - * @var Mailcode_Commands_Command[] |
|
30 | - */ |
|
28 | + /** |
|
29 | + * @var Mailcode_Commands_Command[] |
|
30 | + */ |
|
31 | 31 | protected $commands = array(); |
32 | 32 | |
33 | 33 | /** |
@@ -35,9 +35,9 @@ discard block |
||
35 | 35 | */ |
36 | 36 | protected $errors = array(); |
37 | 37 | |
38 | - /** |
|
39 | - * @var OperationResult|NULL |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @var OperationResult|NULL |
|
40 | + */ |
|
41 | 41 | protected $validationResult; |
42 | 42 | |
43 | 43 | /** |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | private $finalized = false; |
47 | 47 | |
48 | 48 | /** |
49 | - * Adds a command to the collection. |
|
50 | - * |
|
51 | - * @param Mailcode_Commands_Command $command |
|
52 | - * @return Mailcode_Collection |
|
53 | - */ |
|
49 | + * Adds a command to the collection. |
|
50 | + * |
|
51 | + * @param Mailcode_Commands_Command $command |
|
52 | + * @return Mailcode_Collection |
|
53 | + */ |
|
54 | 54 | public function addCommand(Mailcode_Commands_Command $command) : Mailcode_Collection |
55 | 55 | { |
56 | 56 | if($this->finalized) |
@@ -71,21 +71,21 @@ discard block |
||
71 | 71 | return $this; |
72 | 72 | } |
73 | 73 | |
74 | - /** |
|
75 | - * Whether there are any commands in the collection. |
|
76 | - * |
|
77 | - * @return bool |
|
78 | - */ |
|
74 | + /** |
|
75 | + * Whether there are any commands in the collection. |
|
76 | + * |
|
77 | + * @return bool |
|
78 | + */ |
|
79 | 79 | public function hasCommands() : bool |
80 | 80 | { |
81 | 81 | return !empty($this->commands); |
82 | 82 | } |
83 | 83 | |
84 | - /** |
|
85 | - * Counts the amount of commands in the collection. |
|
86 | - * |
|
87 | - * @return int |
|
88 | - */ |
|
84 | + /** |
|
85 | + * Counts the amount of commands in the collection. |
|
86 | + * |
|
87 | + * @return int |
|
88 | + */ |
|
89 | 89 | public function countCommands() : int |
90 | 90 | { |
91 | 91 | return count($this->commands); |
@@ -123,9 +123,9 @@ discard block |
||
123 | 123 | $this->commands = $keep; |
124 | 124 | } |
125 | 125 | |
126 | - /** |
|
127 | - * @return Mailcode_Collection_Error[] |
|
128 | - */ |
|
126 | + /** |
|
127 | + * @return Mailcode_Collection_Error[] |
|
128 | + */ |
|
129 | 129 | public function getErrors() |
130 | 130 | { |
131 | 131 | $result = $this->getValidationResult(); |
@@ -167,25 +167,25 @@ discard block |
||
167 | 167 | return empty($errors); |
168 | 168 | } |
169 | 169 | |
170 | - /** |
|
171 | - * Retrieves all commands that were detected, in the exact order |
|
172 | - * they were found. |
|
173 | - * |
|
174 | - * @return \Mailcode\Mailcode_Commands_Command[] |
|
175 | - */ |
|
170 | + /** |
|
171 | + * Retrieves all commands that were detected, in the exact order |
|
172 | + * they were found. |
|
173 | + * |
|
174 | + * @return \Mailcode\Mailcode_Commands_Command[] |
|
175 | + */ |
|
176 | 176 | public function getCommands() |
177 | 177 | { |
178 | - return $this->commands; |
|
178 | + return $this->commands; |
|
179 | 179 | } |
180 | 180 | |
181 | - /** |
|
182 | - * Retrieves all unique commands by their matched |
|
183 | - * string hash: this ensures only commands that were |
|
184 | - * written the exact same way (including spacing) |
|
185 | - * are returned. |
|
186 | - * |
|
187 | - * @return \Mailcode\Mailcode_Commands_Command[] |
|
188 | - */ |
|
181 | + /** |
|
182 | + * Retrieves all unique commands by their matched |
|
183 | + * string hash: this ensures only commands that were |
|
184 | + * written the exact same way (including spacing) |
|
185 | + * are returned. |
|
186 | + * |
|
187 | + * @return \Mailcode\Mailcode_Commands_Command[] |
|
188 | + */ |
|
189 | 189 | public function getGroupedByHash() |
190 | 190 | { |
191 | 191 | $hashes = array(); |
@@ -203,12 +203,12 @@ discard block |
||
203 | 203 | return array_values($hashes); |
204 | 204 | } |
205 | 205 | |
206 | - /** |
|
207 | - * Adds several commands at once. |
|
208 | - * |
|
209 | - * @param Mailcode_Commands_Command[] $commands |
|
210 | - * @return Mailcode_Collection |
|
211 | - */ |
|
206 | + /** |
|
207 | + * Adds several commands at once. |
|
208 | + * |
|
209 | + * @param Mailcode_Commands_Command[] $commands |
|
210 | + * @return Mailcode_Collection |
|
211 | + */ |
|
212 | 212 | public function addCommands(array $commands) : Mailcode_Collection |
213 | 213 | { |
214 | 214 | foreach($commands as $command) |
@@ -281,10 +281,10 @@ discard block |
||
281 | 281 | } |
282 | 282 | |
283 | 283 | /** |
284 | - * Retrieves only show variable commands in the collection, if any. |
|
285 | - * |
|
286 | - * @return Mailcode_Commands_Command_ShowVariable[] |
|
287 | - */ |
|
284 | + * Retrieves only show variable commands in the collection, if any. |
|
285 | + * |
|
286 | + * @return Mailcode_Commands_Command_ShowVariable[] |
|
287 | + */ |
|
288 | 288 | public function getShowVariableCommands() |
289 | 289 | { |
290 | 290 | return $this->getCommandsByClass(Mailcode_Commands_Command_ShowVariable::class); |
@@ -298,11 +298,11 @@ discard block |
||
298 | 298 | return $this->getCommandsByClass(Mailcode_Commands_Command_For::class); |
299 | 299 | } |
300 | 300 | |
301 | - /** |
|
302 | - * Retrieves only show date commands in the collection, if any. |
|
303 | - * |
|
304 | - * @return Mailcode_Commands_Command_ShowDate[] |
|
305 | - */ |
|
301 | + /** |
|
302 | + * Retrieves only show date commands in the collection, if any. |
|
303 | + * |
|
304 | + * @return Mailcode_Commands_Command_ShowDate[] |
|
305 | + */ |
|
306 | 306 | public function getShowDateCommands() : array |
307 | 307 | { |
308 | 308 | return $this->getCommandsByClass(Mailcode_Commands_Command_ShowDate::class); |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function addCommand(Mailcode_Commands_Command $command) : Mailcode_Collection |
55 | 55 | { |
56 | - if($this->finalized) |
|
56 | + if ($this->finalized) |
|
57 | 57 | { |
58 | 58 | throw new Mailcode_Exception( |
59 | 59 | 'Cannot add commands to a finalized collection', |
@@ -112,9 +112,9 @@ discard block |
||
112 | 112 | { |
113 | 113 | $keep = array(); |
114 | 114 | |
115 | - foreach($this->commands as $existing) |
|
115 | + foreach ($this->commands as $existing) |
|
116 | 116 | { |
117 | - if($existing !== $command) |
|
117 | + if ($existing !== $command) |
|
118 | 118 | { |
119 | 119 | $keep[] = $existing; |
120 | 120 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | $errors = $this->errors; |
134 | 134 | |
135 | - if(!$result->isValid()) |
|
135 | + if (!$result->isValid()) |
|
136 | 136 | { |
137 | 137 | $errors[] = new Mailcode_Collection_Error_Message( |
138 | 138 | '', |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | { |
149 | 149 | $errors = $this->getErrors(); |
150 | 150 | |
151 | - if(!empty($errors)) |
|
151 | + if (!empty($errors)) |
|
152 | 152 | { |
153 | 153 | return array_shift($errors); |
154 | 154 | } |
@@ -190,11 +190,11 @@ discard block |
||
190 | 190 | { |
191 | 191 | $hashes = array(); |
192 | 192 | |
193 | - foreach($this->commands as $command) |
|
193 | + foreach ($this->commands as $command) |
|
194 | 194 | { |
195 | 195 | $hash = $command->getHash(); |
196 | 196 | |
197 | - if(!isset($hashes[$hash])) |
|
197 | + if (!isset($hashes[$hash])) |
|
198 | 198 | { |
199 | 199 | $hashes[$hash] = $command; |
200 | 200 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | */ |
212 | 212 | public function addCommands(array $commands) : Mailcode_Collection |
213 | 213 | { |
214 | - foreach($commands as $command) |
|
214 | + foreach ($commands as $command) |
|
215 | 215 | { |
216 | 216 | $this->addCommand($command); |
217 | 217 | } |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | { |
233 | 233 | $collection = new Mailcode_Variables_Collection_Regular(); |
234 | 234 | |
235 | - foreach($this->commands as $command) |
|
235 | + foreach ($this->commands as $command) |
|
236 | 236 | { |
237 | 237 | $collection->mergeWith($command->getVariables()); |
238 | 238 | } |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | |
243 | 243 | public function getValidationResult() : OperationResult |
244 | 244 | { |
245 | - if($this->validationResult instanceof OperationResult) |
|
245 | + if ($this->validationResult instanceof OperationResult) |
|
246 | 246 | { |
247 | 247 | return $this->validationResult; |
248 | 248 | } |
@@ -258,9 +258,9 @@ discard block |
||
258 | 258 | { |
259 | 259 | $errors = $this->getErrors(); |
260 | 260 | |
261 | - foreach($errors as $error) |
|
261 | + foreach ($errors as $error) |
|
262 | 262 | { |
263 | - if($error->getCode() === $code) |
|
263 | + if ($error->getCode() === $code) |
|
264 | 264 | { |
265 | 265 | return true; |
266 | 266 | } |
@@ -316,9 +316,9 @@ discard block |
||
316 | 316 | { |
317 | 317 | $result = array(); |
318 | 318 | |
319 | - foreach($this->commands as $command) |
|
319 | + foreach ($this->commands as $command) |
|
320 | 320 | { |
321 | - if($command instanceof $className) |
|
321 | + if ($command instanceof $className) |
|
322 | 322 | { |
323 | 323 | $result[] = $command; |
324 | 324 | } |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | { |
332 | 332 | $commands = $this->getCommands(); |
333 | 333 | |
334 | - if(!empty($commands)) |
|
334 | + if (!empty($commands)) |
|
335 | 335 | { |
336 | 336 | return array_shift($commands); |
337 | 337 | } |
@@ -353,11 +353,11 @@ discard block |
||
353 | 353 | |
354 | 354 | private function validateNesting() : void |
355 | 355 | { |
356 | - foreach($this->commands as $command) |
|
356 | + foreach ($this->commands as $command) |
|
357 | 357 | { |
358 | 358 | $command->validateNesting(); |
359 | 359 | |
360 | - if(!$command->isValid()) { |
|
360 | + if (!$command->isValid()) { |
|
361 | 361 | $this->addInvalidCommand($command); |
362 | 362 | } |
363 | 363 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | */ |
131 | 131 | private $nestingValidated = false; |
132 | 132 | |
133 | - public function __construct(string $type='', string $paramsString='', string $matchedText='') |
|
133 | + public function __construct(string $type = '', string $paramsString = '', string $matchedText = '') |
|
134 | 134 | { |
135 | 135 | $this->type = $type; |
136 | 136 | $this->paramsString = html_entity_decode($paramsString); |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | { |
227 | 227 | $this->requireNonDummy(); |
228 | 228 | |
229 | - if($this->hash === '') { |
|
229 | + if ($this->hash === '') { |
|
230 | 230 | $this->hash = md5($this->matchedText); |
231 | 231 | } |
232 | 232 | |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | |
236 | 236 | protected function requireNonDummy() : void |
237 | 237 | { |
238 | - if(!$this->isDummy()) |
|
238 | + if (!$this->isDummy()) |
|
239 | 239 | { |
240 | 240 | return; |
241 | 241 | } |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | |
255 | 255 | protected function validate() : OperationResult |
256 | 256 | { |
257 | - if(!$this->validated) |
|
257 | + if (!$this->validated) |
|
258 | 258 | { |
259 | 259 | $this->requireNonDummy(); |
260 | 260 | $this->validateSyntax(); |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | |
268 | 268 | public function getValidationResult() : OperationResult |
269 | 269 | { |
270 | - if(isset($this->validationResult)) |
|
270 | + if (isset($this->validationResult)) |
|
271 | 271 | { |
272 | 272 | return $this->validationResult; |
273 | 273 | } |
@@ -283,10 +283,10 @@ discard block |
||
283 | 283 | { |
284 | 284 | $validations = $this->resolveValidations(); |
285 | 285 | |
286 | - foreach($validations as $validation) |
|
286 | + foreach ($validations as $validation) |
|
287 | 287 | { |
288 | 288 | // break off at the first validation issue |
289 | - if(!$this->validateSyntaxMethod($validation)) |
|
289 | + if (!$this->validateSyntaxMethod($validation)) |
|
290 | 290 | { |
291 | 291 | return; |
292 | 292 | } |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | { |
306 | 306 | $method = 'validateSyntax_'.$validation; |
307 | 307 | |
308 | - if(!method_exists($this, $method)) |
|
308 | + if (!method_exists($this, $method)) |
|
309 | 309 | { |
310 | 310 | throw new Mailcode_Exception( |
311 | 311 | 'Missing validation method ['.$validation.']', |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | |
336 | 336 | public function validateNesting() : OperationResult |
337 | 337 | { |
338 | - if($this->nestingValidated) |
|
338 | + if ($this->nestingValidated) |
|
339 | 339 | { |
340 | 340 | return $this->validationResult; |
341 | 341 | } |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | |
360 | 360 | public function getType() : string |
361 | 361 | { |
362 | - if($this->supportsType()) |
|
362 | + if ($this->supportsType()) |
|
363 | 363 | { |
364 | 364 | return $this->type; |
365 | 365 | } |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | |
380 | 380 | public function getHighlighted() : string |
381 | 381 | { |
382 | - if(!$this->isValid()) |
|
382 | + if (!$this->isValid()) |
|
383 | 383 | { |
384 | 384 | return ''; |
385 | 385 | } |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | |
391 | 391 | public function getParamsString() : string |
392 | 392 | { |
393 | - if($this->requiresParameters()) |
|
393 | + if ($this->requiresParameters()) |
|
394 | 394 | { |
395 | 395 | return $this->paramsString; |
396 | 396 | } |
@@ -427,22 +427,22 @@ discard block |
||
427 | 427 | |
428 | 428 | public final function getCommandType() : string |
429 | 429 | { |
430 | - if($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
430 | + if ($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
431 | 431 | { |
432 | 432 | return 'Closing'; |
433 | 433 | } |
434 | 434 | |
435 | - if($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
435 | + if ($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
436 | 436 | { |
437 | 437 | return 'Opening'; |
438 | 438 | } |
439 | 439 | |
440 | - if($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
440 | + if ($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
441 | 441 | { |
442 | 442 | return 'Sibling'; |
443 | 443 | } |
444 | 444 | |
445 | - if($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
445 | + if ($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
446 | 446 | { |
447 | 447 | return 'Standalone'; |
448 | 448 | } |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | |
493 | 493 | public function getLogicKeywords() : Mailcode_Commands_LogicKeywords |
494 | 494 | { |
495 | - if($this->supportsLogicKeywords() && isset($this->logicKeywords)) |
|
495 | + if ($this->supportsLogicKeywords() && isset($this->logicKeywords)) |
|
496 | 496 | { |
497 | 497 | return $this->logicKeywords; |
498 | 498 | } |
@@ -526,7 +526,7 @@ discard block |
||
526 | 526 | */ |
527 | 527 | public function getTranslationParam(string $name) |
528 | 528 | { |
529 | - if(isset($this->translationParams[$name])) |
|
529 | + if (isset($this->translationParams[$name])) |
|
530 | 530 | { |
531 | 531 | return $this->translationParams[$name]; |
532 | 532 | } |
@@ -538,7 +538,7 @@ discard block |
||
538 | 538 | * @param bool $encoding |
539 | 539 | * @return $this |
540 | 540 | */ |
541 | - public function setURLEncoding(bool $encoding=true) |
|
541 | + public function setURLEncoding(bool $encoding = true) |
|
542 | 542 | { |
543 | 543 | $this->requireURLEncoding(); |
544 | 544 | |
@@ -554,7 +554,7 @@ discard block |
||
554 | 554 | * @return $this |
555 | 555 | * @throws Mailcode_Exception |
556 | 556 | */ |
557 | - public function setURLDecoding(bool $decode=true) |
|
557 | + public function setURLDecoding(bool $decode = true) |
|
558 | 558 | { |
559 | 559 | $this->requireURLEncoding(); |
560 | 560 | |
@@ -565,7 +565,7 @@ discard block |
||
565 | 565 | |
566 | 566 | protected function requireURLEncoding() : void |
567 | 567 | { |
568 | - if($this->supportsURLEncoding()) { |
|
568 | + if ($this->supportsURLEncoding()) { |
|
569 | 569 | return; |
570 | 570 | } |
571 | 571 |
@@ -43,44 +43,44 @@ discard block |
||
43 | 43 | |
44 | 44 | const META_URL_ENCODING = 'url_encoding'; |
45 | 45 | |
46 | - /** |
|
47 | - * @var string |
|
48 | - */ |
|
46 | + /** |
|
47 | + * @var string |
|
48 | + */ |
|
49 | 49 | protected $type = ''; |
50 | 50 | |
51 | - /** |
|
52 | - * @var string |
|
53 | - */ |
|
51 | + /** |
|
52 | + * @var string |
|
53 | + */ |
|
54 | 54 | protected $paramsString = ''; |
55 | 55 | |
56 | - /** |
|
57 | - * @var string |
|
58 | - */ |
|
56 | + /** |
|
57 | + * @var string |
|
58 | + */ |
|
59 | 59 | protected $matchedText = ''; |
60 | 60 | |
61 | - /** |
|
62 | - * @var string |
|
63 | - */ |
|
61 | + /** |
|
62 | + * @var string |
|
63 | + */ |
|
64 | 64 | protected $hash = ''; |
65 | 65 | |
66 | - /** |
|
67 | - * @var OperationResult |
|
68 | - */ |
|
66 | + /** |
|
67 | + * @var OperationResult |
|
68 | + */ |
|
69 | 69 | protected $validationResult = null; |
70 | 70 | |
71 | - /** |
|
72 | - * @var \Mailcode\Mailcode |
|
73 | - */ |
|
71 | + /** |
|
72 | + * @var \Mailcode\Mailcode |
|
73 | + */ |
|
74 | 74 | protected $mailcode; |
75 | 75 | |
76 | - /** |
|
77 | - * @var \Mailcode\Mailcode_Parser_Statement |
|
78 | - */ |
|
76 | + /** |
|
77 | + * @var \Mailcode\Mailcode_Parser_Statement |
|
78 | + */ |
|
79 | 79 | protected $params; |
80 | 80 | |
81 | - /** |
|
82 | - * @var string[] |
|
83 | - */ |
|
81 | + /** |
|
82 | + * @var string[] |
|
83 | + */ |
|
84 | 84 | protected $validations = array( |
85 | 85 | 'params_empty', |
86 | 86 | 'params_keywords', |
@@ -89,24 +89,24 @@ discard block |
||
89 | 89 | 'type_unsupported' |
90 | 90 | ); |
91 | 91 | |
92 | - /** |
|
93 | - * @var string |
|
94 | - */ |
|
92 | + /** |
|
93 | + * @var string |
|
94 | + */ |
|
95 | 95 | protected $comment = ''; |
96 | 96 | |
97 | - /** |
|
98 | - * @var Mailcode_Commands_LogicKeywords|NULL |
|
99 | - */ |
|
97 | + /** |
|
98 | + * @var Mailcode_Commands_LogicKeywords|NULL |
|
99 | + */ |
|
100 | 100 | protected $logicKeywords; |
101 | 101 | |
102 | - /** |
|
103 | - * @var Mailcode_Parser_Statement_Validator |
|
104 | - */ |
|
102 | + /** |
|
103 | + * @var Mailcode_Parser_Statement_Validator |
|
104 | + */ |
|
105 | 105 | protected $validator; |
106 | 106 | |
107 | - /** |
|
108 | - * @var boolean |
|
109 | - */ |
|
107 | + /** |
|
108 | + * @var boolean |
|
109 | + */ |
|
110 | 110 | private $validated = false; |
111 | 111 | |
112 | 112 | /** |
@@ -141,13 +141,13 @@ discard block |
||
141 | 141 | |
142 | 142 | } |
143 | 143 | |
144 | - /** |
|
145 | - * Sets the command's parent opening command, if any. |
|
146 | - * NOTE: This is set automatically by the parser, and |
|
147 | - * should not be called manually. |
|
148 | - * |
|
149 | - * @param Mailcode_Commands_Command $command |
|
150 | - */ |
|
144 | + /** |
|
145 | + * Sets the command's parent opening command, if any. |
|
146 | + * NOTE: This is set automatically by the parser, and |
|
147 | + * should not be called manually. |
|
148 | + * |
|
149 | + * @param Mailcode_Commands_Command $command |
|
150 | + */ |
|
151 | 151 | public function setParent(Mailcode_Commands_Command $command) : void |
152 | 152 | { |
153 | 153 | $this->parent = $command; |
@@ -163,9 +163,9 @@ discard block |
||
163 | 163 | return $this->parent; |
164 | 164 | } |
165 | 165 | |
166 | - /** |
|
167 | - * @return string The ID of the command = the name of the command class file. |
|
168 | - */ |
|
166 | + /** |
|
167 | + * @return string The ID of the command = the name of the command class file. |
|
168 | + */ |
|
169 | 169 | public function getID() : string |
170 | 170 | { |
171 | 171 | // account for commands with types: If_Variable should still return If. |
@@ -174,14 +174,14 @@ discard block |
||
174 | 174 | return array_shift($tokens); |
175 | 175 | } |
176 | 176 | |
177 | - /** |
|
178 | - * Sets an optional comment that is not used anywhere, but |
|
179 | - * can be used by the application to track why a command is |
|
180 | - * used somewhere. |
|
181 | - * |
|
182 | - * @param string $comment |
|
183 | - * @return Mailcode_Commands_Command |
|
184 | - */ |
|
177 | + /** |
|
178 | + * Sets an optional comment that is not used anywhere, but |
|
179 | + * can be used by the application to track why a command is |
|
180 | + * used somewhere. |
|
181 | + * |
|
182 | + * @param string $comment |
|
183 | + * @return Mailcode_Commands_Command |
|
184 | + */ |
|
185 | 185 | public function setComment(string $comment) : Mailcode_Commands_Command |
186 | 186 | { |
187 | 187 | $this->comment = $comment; |
@@ -189,23 +189,23 @@ discard block |
||
189 | 189 | return $this; |
190 | 190 | } |
191 | 191 | |
192 | - /** |
|
193 | - * Retrieves the previously set comment, if any. |
|
194 | - * |
|
195 | - * @return string |
|
196 | - */ |
|
192 | + /** |
|
193 | + * Retrieves the previously set comment, if any. |
|
194 | + * |
|
195 | + * @return string |
|
196 | + */ |
|
197 | 197 | public function getComment() : string |
198 | 198 | { |
199 | 199 | return $this->comment; |
200 | 200 | } |
201 | 201 | |
202 | - /** |
|
203 | - * Checks whether this is a dummy command, which is only |
|
204 | - * used to access information on the command type. It cannot |
|
205 | - * be used as an actual live command. |
|
206 | - * |
|
207 | - * @return bool |
|
208 | - */ |
|
202 | + /** |
|
203 | + * Checks whether this is a dummy command, which is only |
|
204 | + * used to access information on the command type. It cannot |
|
205 | + * be used as an actual live command. |
|
206 | + * |
|
207 | + * @return bool |
|
208 | + */ |
|
209 | 209 | public function isDummy() : bool |
210 | 210 | { |
211 | 211 | return $this->type === '__dummy'; |
@@ -319,9 +319,9 @@ discard block |
||
319 | 319 | return $this->validationResult->isValid(); |
320 | 320 | } |
321 | 321 | |
322 | - /** |
|
323 | - * @return string[] |
|
324 | - */ |
|
322 | + /** |
|
323 | + * @return string[] |
|
324 | + */ |
|
325 | 325 | abstract protected function getValidations() : array; |
326 | 326 | |
327 | 327 | protected function _validateNesting() : void |
@@ -409,12 +409,12 @@ discard block |
||
409 | 409 | |
410 | 410 | abstract public function supportsURLEncoding() : bool; |
411 | 411 | |
412 | - /** |
|
413 | - * Whether the command allows using logic keywords like "and:" or "or:" |
|
414 | - * in the command parameters. |
|
415 | - * |
|
416 | - * @return bool |
|
417 | - */ |
|
412 | + /** |
|
413 | + * Whether the command allows using logic keywords like "and:" or "or:" |
|
414 | + * in the command parameters. |
|
415 | + * |
|
416 | + * @return bool |
|
417 | + */ |
|
418 | 418 | abstract public function supportsLogicKeywords() : bool; |
419 | 419 | |
420 | 420 | abstract public function generatesContent() : bool; |
@@ -460,22 +460,22 @@ discard block |
||
460 | 460 | return $normalizer->normalize(); |
461 | 461 | } |
462 | 462 | |
463 | - /** |
|
464 | - * Retrieves the names of all the command's supported types: the part |
|
465 | - * between the command name and the colon. Example: {command type: params}. |
|
466 | - * |
|
467 | - * @return string[] |
|
468 | - */ |
|
463 | + /** |
|
464 | + * Retrieves the names of all the command's supported types: the part |
|
465 | + * between the command name and the colon. Example: {command type: params}. |
|
466 | + * |
|
467 | + * @return string[] |
|
468 | + */ |
|
469 | 469 | public function getSupportedTypes() : array |
470 | 470 | { |
471 | 471 | return array(); |
472 | 472 | } |
473 | 473 | |
474 | - /** |
|
475 | - * Retrieves all variable names used in the command. |
|
476 | - * |
|
477 | - * @return Mailcode_Variables_Collection_Regular |
|
478 | - */ |
|
474 | + /** |
|
475 | + * Retrieves all variable names used in the command. |
|
476 | + * |
|
477 | + * @return Mailcode_Variables_Collection_Regular |
|
478 | + */ |
|
479 | 479 | public function getVariables() : Mailcode_Variables_Collection_Regular |
480 | 480 | { |
481 | 481 | return Mailcode::create()->findVariables($this->paramsString, $this); |
@@ -500,26 +500,26 @@ discard block |
||
500 | 500 | ); |
501 | 501 | } |
502 | 502 | |
503 | - /** |
|
504 | - * Sets a parameter for the translation backend. The backend can use |
|
505 | - * these to allow command-specific configurations. |
|
506 | - * |
|
507 | - * @param string $name |
|
508 | - * @param mixed $value |
|
509 | - * @return $this |
|
510 | - */ |
|
503 | + /** |
|
504 | + * Sets a parameter for the translation backend. The backend can use |
|
505 | + * these to allow command-specific configurations. |
|
506 | + * |
|
507 | + * @param string $name |
|
508 | + * @param mixed $value |
|
509 | + * @return $this |
|
510 | + */ |
|
511 | 511 | public function setTranslationParam(string $name, $value) |
512 | 512 | { |
513 | 513 | $this->translationParams[$name] = $value; |
514 | 514 | return $this; |
515 | 515 | } |
516 | 516 | |
517 | - /** |
|
518 | - * Retrieves a previously set translation parameter. |
|
519 | - * |
|
520 | - * @param string $name |
|
521 | - * @return mixed |
|
522 | - */ |
|
517 | + /** |
|
518 | + * Retrieves a previously set translation parameter. |
|
519 | + * |
|
520 | + * @param string $name |
|
521 | + * @return mixed |
|
522 | + */ |
|
523 | 523 | public function getTranslationParam(string $name) |
524 | 524 | { |
525 | 525 | if(isset($this->translationParams[$name])) |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | protected function _validateNesting() : void |
71 | 71 | { |
72 | - if($this->findParentFor($this)) |
|
72 | + if ($this->findParentFor($this)) |
|
73 | 73 | { |
74 | 74 | return; |
75 | 75 | } |
@@ -84,12 +84,12 @@ discard block |
||
84 | 84 | { |
85 | 85 | $parent = $command->getParent(); |
86 | 86 | |
87 | - if($parent === null) |
|
87 | + if ($parent === null) |
|
88 | 88 | { |
89 | 89 | return false; |
90 | 90 | } |
91 | 91 | |
92 | - if($parent instanceof Mailcode_Commands_Command_For) |
|
92 | + if ($parent instanceof Mailcode_Commands_Command_For) |
|
93 | 93 | { |
94 | 94 | return true; |
95 | 95 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | $this->instantiator->checkCommand($cmd); |
36 | 36 | |
37 | - if($cmd instanceof Mailcode_Commands_Command_Comment) |
|
37 | + if ($cmd instanceof Mailcode_Commands_Command_Comment) |
|
38 | 38 | { |
39 | 39 | return $cmd; |
40 | 40 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | throw $this->instantiator->exceptionUnexpectedType('Comment', $cmd); |
43 | 43 | } |
44 | 44 | |
45 | - public function for(string $sourceVariable, string $loopVariable) : Mailcode_Commands_Command_For |
|
45 | + public function for (string $sourceVariable, string $loopVariable) : Mailcode_Commands_Command_For |
|
46 | 46 | { |
47 | 47 | $sourceVariable = '$'.ltrim($sourceVariable, '$'); |
48 | 48 | $loopVariable = '$'.ltrim($loopVariable, '$'); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | $this->instantiator->checkCommand($cmd); |
66 | 66 | |
67 | - if($cmd instanceof Mailcode_Commands_Command_For) |
|
67 | + if ($cmd instanceof Mailcode_Commands_Command_For) |
|
68 | 68 | { |
69 | 69 | return $cmd; |
70 | 70 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | $this->instantiator->checkCommand($cmd); |
85 | 85 | |
86 | - if($cmd instanceof Mailcode_Commands_Command_Break) |
|
86 | + if ($cmd instanceof Mailcode_Commands_Command_Break) |
|
87 | 87 | { |
88 | 88 | return $cmd; |
89 | 89 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | $this->instantiator->checkCommand($cmd); |
110 | 110 | |
111 | - if($cmd instanceof Mailcode_Commands_Command_Code) |
|
111 | + if ($cmd instanceof Mailcode_Commands_Command_Code) |
|
112 | 112 | { |
113 | 113 | return $cmd; |
114 | 114 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | |
34 | 34 | protected function validateSyntax_params_parse() : void |
35 | 35 | { |
36 | - if(!$this->requiresParameters()) |
|
36 | + if (!$this->requiresParameters()) |
|
37 | 37 | { |
38 | 38 | return; |
39 | 39 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $this->hasFreeformParameters() |
44 | 44 | ); |
45 | 45 | |
46 | - if(!$this->params->isValid()) |
|
46 | + if (!$this->params->isValid()) |
|
47 | 47 | { |
48 | 48 | $error = $this->params->getValidationResult(); |
49 | 49 |
@@ -29,12 +29,12 @@ |
||
29 | 29 | |
30 | 30 | protected function validateSyntax_params_empty() : void |
31 | 31 | { |
32 | - if(!$this->requiresParameters()) |
|
32 | + if (!$this->requiresParameters()) |
|
33 | 33 | { |
34 | 34 | return; |
35 | 35 | } |
36 | 36 | |
37 | - if(empty($this->paramsString)) |
|
37 | + if (empty($this->paramsString)) |
|
38 | 38 | { |
39 | 39 | $this->validationResult->makeError( |
40 | 40 | t('Parameters have to be specified.'), |
@@ -35,14 +35,14 @@ |
||
35 | 35 | |
36 | 36 | protected function validateSyntax_type_supported() : void |
37 | 37 | { |
38 | - if(!$this->supportsType() || empty($this->type)) |
|
38 | + if (!$this->supportsType() || empty($this->type)) |
|
39 | 39 | { |
40 | 40 | return; |
41 | 41 | } |
42 | 42 | |
43 | 43 | $types = $this->getSupportedTypes(); |
44 | 44 | |
45 | - if(!in_array($this->type, $types)) |
|
45 | + if (!in_array($this->type, $types)) |
|
46 | 46 | { |
47 | 47 | $this->validationResult->makeError( |
48 | 48 | t('The command addon %1$s is not supported.', $this->type).' '. |
@@ -31,14 +31,14 @@ |
||
31 | 31 | |
32 | 32 | protected function validateSyntax_params_keywords() : void |
33 | 33 | { |
34 | - if(!$this->supportsLogicKeywords()) |
|
34 | + if (!$this->supportsLogicKeywords()) |
|
35 | 35 | { |
36 | 36 | return; |
37 | 37 | } |
38 | 38 | |
39 | 39 | $this->logicKeywords = new Mailcode_Commands_LogicKeywords($this, $this->paramsString); |
40 | 40 | |
41 | - if(!$this->logicKeywords->isValid()) |
|
41 | + if (!$this->logicKeywords->isValid()) |
|
42 | 42 | { |
43 | 43 | $this->validationResult->makeError( |
44 | 44 | t('Invalid parameters:').' '.$this->logicKeywords->getErrorMessage(), |