@@ -35,44 +35,44 @@ discard block |
||
35 | 35 | |
36 | 36 | const META_URL_ENCODING = 'url_encoding'; |
37 | 37 | |
38 | - /** |
|
39 | - * @var string |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @var string |
|
40 | + */ |
|
41 | 41 | protected $type = ''; |
42 | 42 | |
43 | - /** |
|
44 | - * @var string |
|
45 | - */ |
|
43 | + /** |
|
44 | + * @var string |
|
45 | + */ |
|
46 | 46 | protected $paramsString = ''; |
47 | 47 | |
48 | - /** |
|
49 | - * @var string |
|
50 | - */ |
|
48 | + /** |
|
49 | + * @var string |
|
50 | + */ |
|
51 | 51 | protected $matchedText = ''; |
52 | 52 | |
53 | - /** |
|
54 | - * @var string |
|
55 | - */ |
|
53 | + /** |
|
54 | + * @var string |
|
55 | + */ |
|
56 | 56 | protected $hash = ''; |
57 | 57 | |
58 | - /** |
|
59 | - * @var \AppUtils\OperationResult |
|
60 | - */ |
|
58 | + /** |
|
59 | + * @var \AppUtils\OperationResult |
|
60 | + */ |
|
61 | 61 | protected $validationResult = null; |
62 | 62 | |
63 | - /** |
|
64 | - * @var \Mailcode\Mailcode |
|
65 | - */ |
|
63 | + /** |
|
64 | + * @var \Mailcode\Mailcode |
|
65 | + */ |
|
66 | 66 | protected $mailcode; |
67 | 67 | |
68 | - /** |
|
69 | - * @var \Mailcode\Mailcode_Parser_Statement |
|
70 | - */ |
|
68 | + /** |
|
69 | + * @var \Mailcode\Mailcode_Parser_Statement |
|
70 | + */ |
|
71 | 71 | protected $params; |
72 | 72 | |
73 | - /** |
|
74 | - * @var string[] |
|
75 | - */ |
|
73 | + /** |
|
74 | + * @var string[] |
|
75 | + */ |
|
76 | 76 | protected $validations = array( |
77 | 77 | 'params_empty', |
78 | 78 | 'params_keywords', |
@@ -81,24 +81,24 @@ discard block |
||
81 | 81 | 'type_unsupported' |
82 | 82 | ); |
83 | 83 | |
84 | - /** |
|
85 | - * @var string |
|
86 | - */ |
|
84 | + /** |
|
85 | + * @var string |
|
86 | + */ |
|
87 | 87 | protected $comment = ''; |
88 | 88 | |
89 | - /** |
|
90 | - * @var Mailcode_Commands_LogicKeywords|NULL |
|
91 | - */ |
|
89 | + /** |
|
90 | + * @var Mailcode_Commands_LogicKeywords|NULL |
|
91 | + */ |
|
92 | 92 | protected $logicKeywords; |
93 | 93 | |
94 | - /** |
|
95 | - * @var Mailcode_Parser_Statement_Validator |
|
96 | - */ |
|
94 | + /** |
|
95 | + * @var Mailcode_Parser_Statement_Validator |
|
96 | + */ |
|
97 | 97 | protected $validator; |
98 | 98 | |
99 | - /** |
|
100 | - * @var boolean |
|
101 | - */ |
|
99 | + /** |
|
100 | + * @var boolean |
|
101 | + */ |
|
102 | 102 | private $validated = false; |
103 | 103 | |
104 | 104 | /** |
@@ -133,13 +133,13 @@ discard block |
||
133 | 133 | |
134 | 134 | } |
135 | 135 | |
136 | - /** |
|
137 | - * Sets the command's parent opening command, if any. |
|
138 | - * NOTE: This is set automatically by the parser, and |
|
139 | - * should not be called manually. |
|
140 | - * |
|
141 | - * @param Mailcode_Commands_Command $command |
|
142 | - */ |
|
136 | + /** |
|
137 | + * Sets the command's parent opening command, if any. |
|
138 | + * NOTE: This is set automatically by the parser, and |
|
139 | + * should not be called manually. |
|
140 | + * |
|
141 | + * @param Mailcode_Commands_Command $command |
|
142 | + */ |
|
143 | 143 | public function setParent(Mailcode_Commands_Command $command) : void |
144 | 144 | { |
145 | 145 | $this->parent = $command; |
@@ -155,9 +155,9 @@ discard block |
||
155 | 155 | return $this->parent; |
156 | 156 | } |
157 | 157 | |
158 | - /** |
|
159 | - * @return string The ID of the command = the name of the command class file. |
|
160 | - */ |
|
158 | + /** |
|
159 | + * @return string The ID of the command = the name of the command class file. |
|
160 | + */ |
|
161 | 161 | public function getID() : string |
162 | 162 | { |
163 | 163 | // account for commands with types: If_Variable should still return If. |
@@ -166,14 +166,14 @@ discard block |
||
166 | 166 | return array_shift($tokens); |
167 | 167 | } |
168 | 168 | |
169 | - /** |
|
170 | - * Sets an optional comment that is not used anywhere, but |
|
171 | - * can be used by the application to track why a command is |
|
172 | - * used somewhere. |
|
173 | - * |
|
174 | - * @param string $comment |
|
175 | - * @return Mailcode_Commands_Command |
|
176 | - */ |
|
169 | + /** |
|
170 | + * Sets an optional comment that is not used anywhere, but |
|
171 | + * can be used by the application to track why a command is |
|
172 | + * used somewhere. |
|
173 | + * |
|
174 | + * @param string $comment |
|
175 | + * @return Mailcode_Commands_Command |
|
176 | + */ |
|
177 | 177 | public function setComment(string $comment) : Mailcode_Commands_Command |
178 | 178 | { |
179 | 179 | $this->comment = $comment; |
@@ -181,34 +181,34 @@ discard block |
||
181 | 181 | return $this; |
182 | 182 | } |
183 | 183 | |
184 | - /** |
|
185 | - * Retrieves the previously set comment, if any. |
|
186 | - * |
|
187 | - * @return string |
|
188 | - */ |
|
184 | + /** |
|
185 | + * Retrieves the previously set comment, if any. |
|
186 | + * |
|
187 | + * @return string |
|
188 | + */ |
|
189 | 189 | public function getComment() : string |
190 | 190 | { |
191 | 191 | return $this->comment; |
192 | 192 | } |
193 | 193 | |
194 | - /** |
|
195 | - * Checks whether this is a dummy command, which is only |
|
196 | - * used to access information on the command type. It cannot |
|
197 | - * be used as an actual live command. |
|
198 | - * |
|
199 | - * @return bool |
|
200 | - */ |
|
194 | + /** |
|
195 | + * Checks whether this is a dummy command, which is only |
|
196 | + * used to access information on the command type. It cannot |
|
197 | + * be used as an actual live command. |
|
198 | + * |
|
199 | + * @return bool |
|
200 | + */ |
|
201 | 201 | public function isDummy() : bool |
202 | 202 | { |
203 | 203 | return $this->type === '__dummy'; |
204 | 204 | } |
205 | 205 | |
206 | - /** |
|
207 | - * Retrieves a hash of the actual matched command string, |
|
208 | - * which is used in collections to detect duplicate commands. |
|
209 | - * |
|
210 | - * @return string |
|
211 | - */ |
|
206 | + /** |
|
207 | + * Retrieves a hash of the actual matched command string, |
|
208 | + * which is used in collections to detect duplicate commands. |
|
209 | + * |
|
210 | + * @return string |
|
211 | + */ |
|
212 | 212 | public function getHash() : string |
213 | 213 | { |
214 | 214 | $this->requireNonDummy(); |
@@ -302,9 +302,9 @@ discard block |
||
302 | 302 | return $this->validationResult->isValid(); |
303 | 303 | } |
304 | 304 | |
305 | - /** |
|
306 | - * @return string[] |
|
307 | - */ |
|
305 | + /** |
|
306 | + * @return string[] |
|
307 | + */ |
|
308 | 308 | abstract protected function getValidations() : array; |
309 | 309 | |
310 | 310 | protected function validateSyntax_params_empty() : void |
@@ -465,12 +465,12 @@ discard block |
||
465 | 465 | |
466 | 466 | abstract public function supportsURLEncoding() : bool; |
467 | 467 | |
468 | - /** |
|
469 | - * Whether the command allows using logic keywords like "and:" or "or:" |
|
470 | - * in the command parameters. |
|
471 | - * |
|
472 | - * @return bool |
|
473 | - */ |
|
468 | + /** |
|
469 | + * Whether the command allows using logic keywords like "and:" or "or:" |
|
470 | + * in the command parameters. |
|
471 | + * |
|
472 | + * @return bool |
|
473 | + */ |
|
474 | 474 | abstract public function supportsLogicKeywords() : bool; |
475 | 475 | |
476 | 476 | abstract public function generatesContent() : bool; |
@@ -516,22 +516,22 @@ discard block |
||
516 | 516 | return $normalizer->normalize(); |
517 | 517 | } |
518 | 518 | |
519 | - /** |
|
520 | - * Retrieves the names of all the command's supported types: the part |
|
521 | - * between the command name and the colon. Example: {command type: params}. |
|
522 | - * |
|
523 | - * @return string[] |
|
524 | - */ |
|
519 | + /** |
|
520 | + * Retrieves the names of all the command's supported types: the part |
|
521 | + * between the command name and the colon. Example: {command type: params}. |
|
522 | + * |
|
523 | + * @return string[] |
|
524 | + */ |
|
525 | 525 | public function getSupportedTypes() : array |
526 | 526 | { |
527 | 527 | return array(); |
528 | 528 | } |
529 | 529 | |
530 | - /** |
|
531 | - * Retrieves all variable names used in the command. |
|
532 | - * |
|
533 | - * @return Mailcode_Variables_Collection_Regular |
|
534 | - */ |
|
530 | + /** |
|
531 | + * Retrieves all variable names used in the command. |
|
532 | + * |
|
533 | + * @return Mailcode_Variables_Collection_Regular |
|
534 | + */ |
|
535 | 535 | public function getVariables() : Mailcode_Variables_Collection_Regular |
536 | 536 | { |
537 | 537 | return Mailcode::create()->findVariables($this->paramsString); |
@@ -556,26 +556,26 @@ discard block |
||
556 | 556 | ); |
557 | 557 | } |
558 | 558 | |
559 | - /** |
|
560 | - * Sets a parameter for the translation backend. The backend can use |
|
561 | - * these to allow command-specific configurations. |
|
562 | - * |
|
563 | - * @param string $name |
|
564 | - * @param mixed $value |
|
565 | - * @return $this |
|
566 | - */ |
|
559 | + /** |
|
560 | + * Sets a parameter for the translation backend. The backend can use |
|
561 | + * these to allow command-specific configurations. |
|
562 | + * |
|
563 | + * @param string $name |
|
564 | + * @param mixed $value |
|
565 | + * @return $this |
|
566 | + */ |
|
567 | 567 | public function setTranslationParam(string $name, $value) |
568 | 568 | { |
569 | 569 | $this->translationParams[$name] = $value; |
570 | 570 | return $this; |
571 | 571 | } |
572 | 572 | |
573 | - /** |
|
574 | - * Retrieves a previously set translation parameter. |
|
575 | - * |
|
576 | - * @param string $name |
|
577 | - * @return mixed |
|
578 | - */ |
|
573 | + /** |
|
574 | + * Retrieves a previously set translation parameter. |
|
575 | + * |
|
576 | + * @param string $name |
|
577 | + * @return mixed |
|
578 | + */ |
|
579 | 579 | public function getTranslationParam(string $name) |
580 | 580 | { |
581 | 581 | if(isset($this->translationParams[$name])) |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | */ |
118 | 118 | protected $meta; |
119 | 119 | |
120 | - public function __construct(string $type='', string $paramsString='', string $matchedText='') |
|
120 | + public function __construct(string $type = '', string $paramsString = '', string $matchedText = '') |
|
121 | 121 | { |
122 | 122 | $this->type = $type; |
123 | 123 | $this->paramsString = html_entity_decode($paramsString); |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | { |
214 | 214 | $this->requireNonDummy(); |
215 | 215 | |
216 | - if($this->hash === '') { |
|
216 | + if ($this->hash === '') { |
|
217 | 217 | $this->hash = md5($this->matchedText); |
218 | 218 | } |
219 | 219 | |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | |
223 | 223 | protected function requireNonDummy() : void |
224 | 224 | { |
225 | - if(!$this->isDummy()) |
|
225 | + if (!$this->isDummy()) |
|
226 | 226 | { |
227 | 227 | return; |
228 | 228 | } |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | |
242 | 242 | protected function validate() : \AppUtils\OperationResult |
243 | 243 | { |
244 | - if(!$this->validated) |
|
244 | + if (!$this->validated) |
|
245 | 245 | { |
246 | 246 | $this->requireNonDummy(); |
247 | 247 | $this->validateSyntax(); |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | |
255 | 255 | public function getValidationResult() : \AppUtils\OperationResult |
256 | 256 | { |
257 | - if(isset($this->validationResult)) |
|
257 | + if (isset($this->validationResult)) |
|
258 | 258 | { |
259 | 259 | return $this->validationResult; |
260 | 260 | } |
@@ -270,10 +270,10 @@ discard block |
||
270 | 270 | { |
271 | 271 | $validations = array_merge($this->validations, $this->getValidations()); |
272 | 272 | |
273 | - foreach($validations as $validation) |
|
273 | + foreach ($validations as $validation) |
|
274 | 274 | { |
275 | 275 | // break off at the first validation issue |
276 | - if(!$this->validateSyntaxMethod($validation)) |
|
276 | + if (!$this->validateSyntaxMethod($validation)) |
|
277 | 277 | { |
278 | 278 | return; |
279 | 279 | } |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | { |
285 | 285 | $method = 'validateSyntax_'.$validation; |
286 | 286 | |
287 | - if(!method_exists($this, $method)) |
|
287 | + if (!method_exists($this, $method)) |
|
288 | 288 | { |
289 | 289 | throw new Mailcode_Exception( |
290 | 290 | 'Missing validation method ['.$validation.']', |
@@ -309,12 +309,12 @@ discard block |
||
309 | 309 | |
310 | 310 | protected function validateSyntax_params_empty() : void |
311 | 311 | { |
312 | - if(!$this->requiresParameters()) |
|
312 | + if (!$this->requiresParameters()) |
|
313 | 313 | { |
314 | 314 | return; |
315 | 315 | } |
316 | 316 | |
317 | - if(empty($this->paramsString)) |
|
317 | + if (empty($this->paramsString)) |
|
318 | 318 | { |
319 | 319 | $this->validationResult->makeError( |
320 | 320 | t('Parameters have to be specified.'), |
@@ -326,14 +326,14 @@ discard block |
||
326 | 326 | |
327 | 327 | protected function validateSyntax_params_keywords() : void |
328 | 328 | { |
329 | - if(!$this->supportsLogicKeywords()) |
|
329 | + if (!$this->supportsLogicKeywords()) |
|
330 | 330 | { |
331 | 331 | return; |
332 | 332 | } |
333 | 333 | |
334 | 334 | $this->logicKeywords = new Mailcode_Commands_LogicKeywords($this, $this->paramsString); |
335 | 335 | |
336 | - if(!$this->logicKeywords->isValid()) |
|
336 | + if (!$this->logicKeywords->isValid()) |
|
337 | 337 | { |
338 | 338 | $this->validationResult->makeError( |
339 | 339 | t('Invalid parameters:').' '.$this->logicKeywords->getErrorMessage(), |
@@ -348,14 +348,14 @@ discard block |
||
348 | 348 | |
349 | 349 | protected function validateSyntax_params_parse() : void |
350 | 350 | { |
351 | - if(!$this->requiresParameters()) |
|
351 | + if (!$this->requiresParameters()) |
|
352 | 352 | { |
353 | 353 | return; |
354 | 354 | } |
355 | 355 | |
356 | 356 | $this->params = $this->mailcode->getParser()->createStatement($this->paramsString); |
357 | 357 | |
358 | - if(!$this->params->isValid()) |
|
358 | + if (!$this->params->isValid()) |
|
359 | 359 | { |
360 | 360 | $error = $this->params->getValidationResult(); |
361 | 361 | |
@@ -372,14 +372,14 @@ discard block |
||
372 | 372 | |
373 | 373 | protected function validateSyntax_type_supported() : void |
374 | 374 | { |
375 | - if(!$this->supportsType() || empty($this->type)) |
|
375 | + if (!$this->supportsType() || empty($this->type)) |
|
376 | 376 | { |
377 | 377 | return; |
378 | 378 | } |
379 | 379 | |
380 | 380 | $types = $this->getSupportedTypes(); |
381 | 381 | |
382 | - if(!in_array($this->type, $types)) |
|
382 | + if (!in_array($this->type, $types)) |
|
383 | 383 | { |
384 | 384 | $this->validationResult->makeError( |
385 | 385 | t('The command addon %1$s is not supported.', $this->type).' '. |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | |
394 | 394 | protected function validateSyntax_type_unsupported() : void |
395 | 395 | { |
396 | - if($this->supportsType() || empty($this->type)) |
|
396 | + if ($this->supportsType() || empty($this->type)) |
|
397 | 397 | { |
398 | 398 | return; |
399 | 399 | } |
@@ -411,7 +411,7 @@ discard block |
||
411 | 411 | |
412 | 412 | public function getType() : string |
413 | 413 | { |
414 | - if($this->supportsType()) |
|
414 | + if ($this->supportsType()) |
|
415 | 415 | { |
416 | 416 | return $this->type; |
417 | 417 | } |
@@ -431,7 +431,7 @@ discard block |
||
431 | 431 | |
432 | 432 | public function getHighlighted() : string |
433 | 433 | { |
434 | - if(!$this->isValid()) |
|
434 | + if (!$this->isValid()) |
|
435 | 435 | { |
436 | 436 | return ''; |
437 | 437 | } |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | |
443 | 443 | public function getParamsString() : string |
444 | 444 | { |
445 | - if($this->requiresParameters()) |
|
445 | + if ($this->requiresParameters()) |
|
446 | 446 | { |
447 | 447 | return $this->paramsString; |
448 | 448 | } |
@@ -479,22 +479,22 @@ discard block |
||
479 | 479 | |
480 | 480 | public final function getCommandType() : string |
481 | 481 | { |
482 | - if($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
482 | + if ($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
483 | 483 | { |
484 | 484 | return 'Closing'; |
485 | 485 | } |
486 | 486 | |
487 | - if($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
487 | + if ($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
488 | 488 | { |
489 | 489 | return 'Opening'; |
490 | 490 | } |
491 | 491 | |
492 | - if($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
492 | + if ($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
493 | 493 | { |
494 | 494 | return 'Sibling'; |
495 | 495 | } |
496 | 496 | |
497 | - if($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
497 | + if ($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
498 | 498 | { |
499 | 499 | return 'Standalone'; |
500 | 500 | } |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | |
545 | 545 | public function getLogicKeywords() : Mailcode_Commands_LogicKeywords |
546 | 546 | { |
547 | - if($this->supportsLogicKeywords() && isset($this->logicKeywords)) |
|
547 | + if ($this->supportsLogicKeywords() && isset($this->logicKeywords)) |
|
548 | 548 | { |
549 | 549 | return $this->logicKeywords; |
550 | 550 | } |
@@ -578,7 +578,7 @@ discard block |
||
578 | 578 | */ |
579 | 579 | public function getTranslationParam(string $name) |
580 | 580 | { |
581 | - if(isset($this->translationParams[$name])) |
|
581 | + if (isset($this->translationParams[$name])) |
|
582 | 582 | { |
583 | 583 | return $this->translationParams[$name]; |
584 | 584 | } |
@@ -603,7 +603,7 @@ discard block |
||
603 | 603 | */ |
604 | 604 | public function getMeta(string $name) |
605 | 605 | { |
606 | - if(isset($this->meta[$name])) |
|
606 | + if (isset($this->meta[$name])) |
|
607 | 607 | { |
608 | 608 | return $this->meta[$name]; |
609 | 609 | } |
@@ -615,9 +615,9 @@ discard block |
||
615 | 615 | * @param bool $encoding |
616 | 616 | * @return $this |
617 | 617 | */ |
618 | - public function setURLEncoding(bool $encoding=true) |
|
618 | + public function setURLEncoding(bool $encoding = true) |
|
619 | 619 | { |
620 | - if(!$this->supportsURLEncoding()) |
|
620 | + if (!$this->supportsURLEncoding()) |
|
621 | 621 | { |
622 | 622 | throw new Mailcode_Exception( |
623 | 623 | 'Command does not support URL encoding.', |
@@ -629,7 +629,7 @@ discard block |
||
629 | 629 | ); |
630 | 630 | } |
631 | 631 | |
632 | - if($encoding) |
|
632 | + if ($encoding) |
|
633 | 633 | { |
634 | 634 | $this->params->getInfo()->addURLEncoding(); |
635 | 635 | } |
@@ -632,8 +632,7 @@ |
||
632 | 632 | if($encoding) |
633 | 633 | { |
634 | 634 | $this->params->getInfo()->addURLEncoding(); |
635 | - } |
|
636 | - else |
|
635 | + } else |
|
637 | 636 | { |
638 | 637 | $this->params->getInfo()->removeURLEncoding(); |
639 | 638 | } |
@@ -47,12 +47,12 @@ |
||
47 | 47 | |
48 | 48 | $count = 1; |
49 | 49 | |
50 | - if(isset($this->urlencodeToken)) |
|
50 | + if (isset($this->urlencodeToken)) |
|
51 | 51 | { |
52 | 52 | $count = 2; |
53 | 53 | } |
54 | 54 | |
55 | - if(count($tokens) > $count) |
|
55 | + if (count($tokens) > $count) |
|
56 | 56 | { |
57 | 57 | $this->validationResult->makeError( |
58 | 58 | t('Unknown parameters found:').' '. |
@@ -22,15 +22,15 @@ discard block |
||
22 | 22 | { |
23 | 23 | const VALIDATION_NOT_A_FORMAT_STRING = 55401; |
24 | 24 | |
25 | - /** |
|
26 | - * The date format string. |
|
27 | - * @var string |
|
28 | - */ |
|
25 | + /** |
|
26 | + * The date format string. |
|
27 | + * @var string |
|
28 | + */ |
|
29 | 29 | private $formatString; |
30 | 30 | |
31 | - /** |
|
32 | - * @var Mailcode_Date_FormatInfo |
|
33 | - */ |
|
31 | + /** |
|
32 | + * @var Mailcode_Date_FormatInfo |
|
33 | + */ |
|
34 | 34 | private $formatInfo; |
35 | 35 | |
36 | 36 | public function getName() : string |
@@ -90,11 +90,11 @@ discard block |
||
90 | 90 | ); |
91 | 91 | } |
92 | 92 | |
93 | - /** |
|
94 | - * Retrieves the format string used to format the date. |
|
95 | - * |
|
96 | - * @return string A PHP compatible date format string. |
|
97 | - */ |
|
93 | + /** |
|
94 | + * Retrieves the format string used to format the date. |
|
95 | + * |
|
96 | + * @return string A PHP compatible date format string. |
|
97 | + */ |
|
98 | 98 | public function getFormatString() : string |
99 | 99 | { |
100 | 100 | return $this->formatString; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $tokens = $this->params->getInfo()->getStringLiterals(); |
66 | 66 | |
67 | 67 | // no format specified? Use the default one. |
68 | - if(empty($tokens)) |
|
68 | + if (empty($tokens)) |
|
69 | 69 | { |
70 | 70 | return; |
71 | 71 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | { |
79 | 79 | $result = $this->formatInfo->validateFormat($format); |
80 | 80 | |
81 | - if($result->isValid()) |
|
81 | + if ($result->isValid()) |
|
82 | 82 | { |
83 | 83 | $this->formatString = $format; |
84 | 84 | return; |
@@ -31,15 +31,15 @@ discard block |
||
31 | 31 | const VALIDATION_INVALID_DECIMAL_SEPARATOR = 72209; |
32 | 32 | const VALIDATION_SEPARATORS_SAME_CHARACTER = 72210; |
33 | 33 | |
34 | - /** |
|
35 | - * The default number format string. |
|
36 | - * @var string |
|
37 | - */ |
|
34 | + /** |
|
35 | + * The default number format string. |
|
36 | + * @var string |
|
37 | + */ |
|
38 | 38 | private $formatString = Mailcode_Number_Info::DEFAULT_FORMAT; |
39 | 39 | |
40 | - /** |
|
41 | - * @var Mailcode_Date_FormatInfo |
|
42 | - */ |
|
40 | + /** |
|
41 | + * @var Mailcode_Date_FormatInfo |
|
42 | + */ |
|
43 | 43 | private $formatInfo; |
44 | 44 | |
45 | 45 | public function getName() : string |
@@ -63,16 +63,16 @@ discard block |
||
63 | 63 | |
64 | 64 | protected function validateSyntax_check_format() : void |
65 | 65 | { |
66 | - $tokens = $this->params->getInfo()->getStringLiterals(); |
|
66 | + $tokens = $this->params->getInfo()->getStringLiterals(); |
|
67 | 67 | |
68 | - // no format specified? Use the default one. |
|
69 | - if(empty($tokens)) |
|
70 | - { |
|
71 | - return; |
|
72 | - } |
|
68 | + // no format specified? Use the default one. |
|
69 | + if(empty($tokens)) |
|
70 | + { |
|
71 | + return; |
|
72 | + } |
|
73 | 73 | |
74 | - $token = array_pop($tokens); |
|
75 | - $this->parseFormatString($token->getText()); |
|
74 | + $token = array_pop($tokens); |
|
75 | + $this->parseFormatString($token->getText()); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | private function parseFormatString(string $format) : void |
@@ -91,11 +91,11 @@ discard block |
||
91 | 91 | ); |
92 | 92 | } |
93 | 93 | |
94 | - /** |
|
95 | - * Retrieves the format string used to format the number. |
|
96 | - * |
|
97 | - * @return string |
|
98 | - */ |
|
94 | + /** |
|
95 | + * Retrieves the format string used to format the number. |
|
96 | + * |
|
97 | + * @return string |
|
98 | + */ |
|
99 | 99 | public function getFormatString() : string |
100 | 100 | { |
101 | 101 | return $this->formatString; |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $tokens = $this->params->getInfo()->getStringLiterals(); |
67 | 67 | |
68 | 68 | // no format specified? Use the default one. |
69 | - if(empty($tokens)) |
|
69 | + if (empty($tokens)) |
|
70 | 70 | { |
71 | 71 | return; |
72 | 72 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | { |
80 | 80 | $result = new Mailcode_Number_Info($format); |
81 | 81 | |
82 | - if($result->isValid()) |
|
82 | + if ($result->isValid()) |
|
83 | 83 | { |
84 | 84 | $this->formatString = $format; |
85 | 85 | return; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | { |
43 | 43 | $format = trim($format); |
44 | 44 | |
45 | - if(empty($format)) |
|
45 | + if (empty($format)) |
|
46 | 46 | { |
47 | 47 | $format = self::DEFAULT_FORMAT; |
48 | 48 | } |
@@ -108,15 +108,15 @@ discard block |
||
108 | 108 | { |
109 | 109 | $format = $this->format; |
110 | 110 | |
111 | - foreach($this->validations as $validation) |
|
111 | + foreach ($this->validations as $validation) |
|
112 | 112 | { |
113 | 113 | $method = 'parse_'.$validation; |
114 | 114 | |
115 | - if(method_exists($this, $method)) |
|
115 | + if (method_exists($this, $method)) |
|
116 | 116 | { |
117 | 117 | $format = $this->$method($format); |
118 | 118 | |
119 | - if(!$this->isValid()) |
|
119 | + if (!$this->isValid()) |
|
120 | 120 | { |
121 | 121 | return; |
122 | 122 | } |
@@ -138,13 +138,13 @@ discard block |
||
138 | 138 | |
139 | 139 | private function parse_padding(string $format) : string |
140 | 140 | { |
141 | - if(strstr($format, ':') === false) { |
|
141 | + if (strstr($format, ':') === false) { |
|
142 | 142 | return $format; |
143 | 143 | } |
144 | 144 | |
145 | 145 | $parts = ConvertHelper::explodeTrim(':', $this->format); |
146 | 146 | |
147 | - if(count($parts) !== 2) |
|
147 | + if (count($parts) !== 2) |
|
148 | 148 | { |
149 | 149 | $this->makeError( |
150 | 150 | t( |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | |
160 | 160 | $padding = $parts[1]; |
161 | 161 | |
162 | - if(!preg_match('/\A[#]+\z/x', $padding)) |
|
162 | + if (!preg_match('/\A[#]+\z/x', $padding)) |
|
163 | 163 | { |
164 | 164 | $this->makeError( |
165 | 165 | t('The padding may only contain hashes (%1$s given).', '<code>'.$padding.'</code>'), |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | private function parse_number(string $format) : string |
178 | 178 | { |
179 | - if($format[0] !== '1') |
|
179 | + if ($format[0] !== '1') |
|
180 | 180 | { |
181 | 181 | $this->makeError( |
182 | 182 | t('The first character of the format must be a %1$s.', '<code>1</code>'), |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | $base = str_replace(array('.', ',', ' '), '', $format); |
191 | 191 | $number = intval(substr($base, 0, 4)); |
192 | 192 | |
193 | - if($number === 1000) { |
|
193 | + if ($number === 1000) { |
|
194 | 194 | return $format; |
195 | 195 | } |
196 | 196 | |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | $separator = $format[1]; |
211 | 211 | |
212 | 212 | // No thousands separator |
213 | - if($separator === '0') |
|
213 | + if ($separator === '0') |
|
214 | 214 | { |
215 | 215 | return $format; |
216 | 216 | } |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | // Valid thousands separator |
219 | 219 | $validSeparators = array(' ', ',', '.'); |
220 | 220 | |
221 | - if(in_array($separator, $validSeparators)) |
|
221 | + if (in_array($separator, $validSeparators)) |
|
222 | 222 | { |
223 | 223 | $this->thousandsSeparator = $separator; |
224 | 224 | $format = str_replace('1'.$separator, '1', $format); |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | |
255 | 255 | private function parse_separators(string $format) : string |
256 | 256 | { |
257 | - if(!empty($this->thousandsSeparator) && !empty($this->decimalsSeparator) && $this->thousandsSeparator === $this->decimalsSeparator) |
|
257 | + if (!empty($this->thousandsSeparator) && !empty($this->decimalsSeparator) && $this->thousandsSeparator === $this->decimalsSeparator) |
|
258 | 258 | { |
259 | 259 | $this->makeError( |
260 | 260 | t( |
@@ -270,14 +270,14 @@ discard block |
||
270 | 270 | |
271 | 271 | private function parse_decimals(string $format) : string |
272 | 272 | { |
273 | - if(empty($this->decimalsSeparator)) |
|
273 | + if (empty($this->decimalsSeparator)) |
|
274 | 274 | { |
275 | 275 | return $format; |
276 | 276 | } |
277 | 277 | |
278 | 278 | $parts = ConvertHelper::explodeTrim($this->decimalsSeparator, $format); |
279 | 279 | |
280 | - if(!isset($parts[1])) |
|
280 | + if (!isset($parts[1])) |
|
281 | 281 | { |
282 | 282 | $this->makeError( |
283 | 283 | t('Cannot determine the amount of decimals.').' '. |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | return $format; |
294 | 294 | } |
295 | 295 | |
296 | - if($this->validateDecimals($parts[1])) |
|
296 | + if ($this->validateDecimals($parts[1])) |
|
297 | 297 | { |
298 | 298 | $this->decimals = strlen($parts[1]); |
299 | 299 | } |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | |
304 | 304 | private function validateDecimals(string $decimals) : bool |
305 | 305 | { |
306 | - if(preg_match('/\A[0]+\z/x', $decimals)) { |
|
306 | + if (preg_match('/\A[0]+\z/x', $decimals)) { |
|
307 | 307 | return true; |
308 | 308 | } |
309 | 309 | |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | { |
323 | 323 | $validSeparators = array('.', ','); |
324 | 324 | |
325 | - if(in_array($separator, $validSeparators)) { |
|
325 | + if (in_array($separator, $validSeparators)) { |
|
326 | 326 | return true; |
327 | 327 | } |
328 | 328 | |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | */ |
345 | 345 | private function parse_regex(string $format) : string |
346 | 346 | { |
347 | - if(preg_match('/1[ ,.]?000|1[ ,.]?000[.,][0]+/x', $format)) |
|
347 | + if (preg_match('/1[ ,.]?000|1[ ,.]?000[.,][0]+/x', $format)) |
|
348 | 348 | { |
349 | 349 | return $format; |
350 | 350 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | |
34 | 34 | $this->instantiator->checkCommand($cmd); |
35 | 35 | |
36 | - if($cmd instanceof Mailcode_Commands_Command_ShowVariable) |
|
36 | + if ($cmd instanceof Mailcode_Commands_Command_ShowVariable) |
|
37 | 37 | { |
38 | 38 | return $cmd; |
39 | 39 | } |
@@ -41,12 +41,12 @@ discard block |
||
41 | 41 | throw $this->instantiator->exceptionUnexpectedType('ShowVariable', $cmd); |
42 | 42 | } |
43 | 43 | |
44 | - public function showDate(string $variableName, string $formatString="") : Mailcode_Commands_Command_ShowDate |
|
44 | + public function showDate(string $variableName, string $formatString = "") : Mailcode_Commands_Command_ShowDate |
|
45 | 45 | { |
46 | 46 | $variableName = $this->instantiator->filterVariableName($variableName); |
47 | 47 | |
48 | 48 | $format = ''; |
49 | - if(!empty($formatString)) |
|
49 | + if (!empty($formatString)) |
|
50 | 50 | { |
51 | 51 | $format = sprintf( |
52 | 52 | ' "%s"', |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | $this->instantiator->checkCommand($cmd); |
69 | 69 | |
70 | - if($cmd instanceof Mailcode_Commands_Command_ShowDate) |
|
70 | + if ($cmd instanceof Mailcode_Commands_Command_ShowDate) |
|
71 | 71 | { |
72 | 72 | return $cmd; |
73 | 73 | } |
@@ -75,12 +75,12 @@ discard block |
||
75 | 75 | throw $this->instantiator->exceptionUnexpectedType('ShowDate', $cmd); |
76 | 76 | } |
77 | 77 | |
78 | - public function showNumber(string $variableName, string $formatString="") : Mailcode_Commands_Command_ShowNumber |
|
78 | + public function showNumber(string $variableName, string $formatString = "") : Mailcode_Commands_Command_ShowNumber |
|
79 | 79 | { |
80 | 80 | $variableName = $this->instantiator->filterVariableName($variableName); |
81 | 81 | |
82 | 82 | $format = ''; |
83 | - if(!empty($formatString)) |
|
83 | + if (!empty($formatString)) |
|
84 | 84 | { |
85 | 85 | $format = sprintf( |
86 | 86 | ' "%s"', |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | |
102 | 102 | $this->instantiator->checkCommand($cmd); |
103 | 103 | |
104 | - if($cmd instanceof Mailcode_Commands_Command_ShowNumber) |
|
104 | + if ($cmd instanceof Mailcode_Commands_Command_ShowNumber) |
|
105 | 105 | { |
106 | 106 | return $cmd; |
107 | 107 | } |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | |
123 | 123 | $this->instantiator->checkCommand($cmd); |
124 | 124 | |
125 | - if($cmd instanceof Mailcode_Commands_Command_ShowSnippet) |
|
125 | + if ($cmd instanceof Mailcode_Commands_Command_ShowSnippet) |
|
126 | 126 | { |
127 | 127 | return $cmd; |
128 | 128 | } |
@@ -34,9 +34,9 @@ |
||
34 | 34 | { |
35 | 35 | $keywords = $this->params->getInfo()->getKeywords(); |
36 | 36 | |
37 | - foreach($keywords as $keyword) |
|
37 | + foreach ($keywords as $keyword) |
|
38 | 38 | { |
39 | - if($keyword->isURLEncoded()) |
|
39 | + if ($keyword->isURLEncoded()) |
|
40 | 40 | { |
41 | 41 | $this->urlencodeToken = $keyword; |
42 | 42 |
@@ -50,7 +50,7 @@ |
||
50 | 50 | { |
51 | 51 | $value = $this->getRawNumber(); |
52 | 52 | |
53 | - if(!is_numeric($value)) |
|
53 | + if (!is_numeric($value)) |
|
54 | 54 | { |
55 | 55 | $this->validationResult->makeError( |
56 | 56 | t( |