@@ -36,44 +36,44 @@ discard block |
||
36 | 36 | |
37 | 37 | const META_URL_ENCODING = 'url_encoding'; |
38 | 38 | |
39 | - /** |
|
40 | - * @var string |
|
41 | - */ |
|
39 | + /** |
|
40 | + * @var string |
|
41 | + */ |
|
42 | 42 | protected $type = ''; |
43 | 43 | |
44 | - /** |
|
45 | - * @var string |
|
46 | - */ |
|
44 | + /** |
|
45 | + * @var string |
|
46 | + */ |
|
47 | 47 | protected $paramsString = ''; |
48 | 48 | |
49 | - /** |
|
50 | - * @var string |
|
51 | - */ |
|
49 | + /** |
|
50 | + * @var string |
|
51 | + */ |
|
52 | 52 | protected $matchedText = ''; |
53 | 53 | |
54 | - /** |
|
55 | - * @var string |
|
56 | - */ |
|
54 | + /** |
|
55 | + * @var string |
|
56 | + */ |
|
57 | 57 | protected $hash = ''; |
58 | 58 | |
59 | - /** |
|
60 | - * @var OperationResult |
|
61 | - */ |
|
59 | + /** |
|
60 | + * @var OperationResult |
|
61 | + */ |
|
62 | 62 | protected $validationResult = null; |
63 | 63 | |
64 | - /** |
|
65 | - * @var \Mailcode\Mailcode |
|
66 | - */ |
|
64 | + /** |
|
65 | + * @var \Mailcode\Mailcode |
|
66 | + */ |
|
67 | 67 | protected $mailcode; |
68 | 68 | |
69 | - /** |
|
70 | - * @var \Mailcode\Mailcode_Parser_Statement |
|
71 | - */ |
|
69 | + /** |
|
70 | + * @var \Mailcode\Mailcode_Parser_Statement |
|
71 | + */ |
|
72 | 72 | protected $params; |
73 | 73 | |
74 | - /** |
|
75 | - * @var string[] |
|
76 | - */ |
|
74 | + /** |
|
75 | + * @var string[] |
|
76 | + */ |
|
77 | 77 | protected $validations = array( |
78 | 78 | 'params_empty', |
79 | 79 | 'params_keywords', |
@@ -82,24 +82,24 @@ discard block |
||
82 | 82 | 'type_unsupported' |
83 | 83 | ); |
84 | 84 | |
85 | - /** |
|
86 | - * @var string |
|
87 | - */ |
|
85 | + /** |
|
86 | + * @var string |
|
87 | + */ |
|
88 | 88 | protected $comment = ''; |
89 | 89 | |
90 | - /** |
|
91 | - * @var Mailcode_Commands_LogicKeywords|NULL |
|
92 | - */ |
|
90 | + /** |
|
91 | + * @var Mailcode_Commands_LogicKeywords|NULL |
|
92 | + */ |
|
93 | 93 | protected $logicKeywords; |
94 | 94 | |
95 | - /** |
|
96 | - * @var Mailcode_Parser_Statement_Validator |
|
97 | - */ |
|
95 | + /** |
|
96 | + * @var Mailcode_Parser_Statement_Validator |
|
97 | + */ |
|
98 | 98 | protected $validator; |
99 | 99 | |
100 | - /** |
|
101 | - * @var boolean |
|
102 | - */ |
|
100 | + /** |
|
101 | + * @var boolean |
|
102 | + */ |
|
103 | 103 | private $validated = false; |
104 | 104 | |
105 | 105 | /** |
@@ -134,13 +134,13 @@ discard block |
||
134 | 134 | |
135 | 135 | } |
136 | 136 | |
137 | - /** |
|
138 | - * Sets the command's parent opening command, if any. |
|
139 | - * NOTE: This is set automatically by the parser, and |
|
140 | - * should not be called manually. |
|
141 | - * |
|
142 | - * @param Mailcode_Commands_Command $command |
|
143 | - */ |
|
137 | + /** |
|
138 | + * Sets the command's parent opening command, if any. |
|
139 | + * NOTE: This is set automatically by the parser, and |
|
140 | + * should not be called manually. |
|
141 | + * |
|
142 | + * @param Mailcode_Commands_Command $command |
|
143 | + */ |
|
144 | 144 | public function setParent(Mailcode_Commands_Command $command) : void |
145 | 145 | { |
146 | 146 | $this->parent = $command; |
@@ -282,9 +282,9 @@ discard block |
||
282 | 282 | return $this->validationResult->isValid(); |
283 | 283 | } |
284 | 284 | |
285 | - /** |
|
286 | - * @return string[] |
|
287 | - */ |
|
285 | + /** |
|
286 | + * @return string[] |
|
287 | + */ |
|
288 | 288 | abstract protected function getValidations() : array; |
289 | 289 | |
290 | 290 | protected function _validateNesting() : void |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | */ |
119 | 119 | private $nestingValidated = false; |
120 | 120 | |
121 | - public function __construct(string $type='', string $paramsString='', string $matchedText='') |
|
121 | + public function __construct(string $type = '', string $paramsString = '', string $matchedText = '') |
|
122 | 122 | { |
123 | 123 | $this->type = $type; |
124 | 124 | $this->paramsString = html_entity_decode($paramsString); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | { |
186 | 186 | $this->requireNonDummy(); |
187 | 187 | |
188 | - if($this->hash === '') { |
|
188 | + if ($this->hash === '') { |
|
189 | 189 | $this->hash = md5($this->matchedText); |
190 | 190 | } |
191 | 191 | |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | |
195 | 195 | protected function requireNonDummy() : void |
196 | 196 | { |
197 | - if(!$this->isDummy()) |
|
197 | + if (!$this->isDummy()) |
|
198 | 198 | { |
199 | 199 | return; |
200 | 200 | } |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | |
214 | 214 | protected function validate() : OperationResult |
215 | 215 | { |
216 | - if(!$this->validated) |
|
216 | + if (!$this->validated) |
|
217 | 217 | { |
218 | 218 | $this->requireNonDummy(); |
219 | 219 | $this->validateSyntax(); |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | |
227 | 227 | public function getValidationResult() : OperationResult |
228 | 228 | { |
229 | - if(isset($this->validationResult)) |
|
229 | + if (isset($this->validationResult)) |
|
230 | 230 | { |
231 | 231 | return $this->validationResult; |
232 | 232 | } |
@@ -242,10 +242,10 @@ discard block |
||
242 | 242 | { |
243 | 243 | $validations = $this->resolveValidations(); |
244 | 244 | |
245 | - foreach($validations as $validation) |
|
245 | + foreach ($validations as $validation) |
|
246 | 246 | { |
247 | 247 | // break off at the first validation issue |
248 | - if(!$this->validateSyntaxMethod($validation)) |
|
248 | + if (!$this->validateSyntaxMethod($validation)) |
|
249 | 249 | { |
250 | 250 | return; |
251 | 251 | } |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | { |
265 | 265 | $method = 'validateSyntax_'.$validation; |
266 | 266 | |
267 | - if(!method_exists($this, $method)) |
|
267 | + if (!method_exists($this, $method)) |
|
268 | 268 | { |
269 | 269 | throw new Mailcode_Exception( |
270 | 270 | 'Missing validation method ['.$validation.']', |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | |
295 | 295 | public function validateNesting() : OperationResult |
296 | 296 | { |
297 | - if($this->nestingValidated) |
|
297 | + if ($this->nestingValidated) |
|
298 | 298 | { |
299 | 299 | return $this->validationResult; |
300 | 300 | } |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | |
319 | 319 | public function getType() : string |
320 | 320 | { |
321 | - if($this->supportsType()) |
|
321 | + if ($this->supportsType()) |
|
322 | 322 | { |
323 | 323 | return $this->type; |
324 | 324 | } |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | |
339 | 339 | public function getHighlighted() : string |
340 | 340 | { |
341 | - if(!$this->isValid()) |
|
341 | + if (!$this->isValid()) |
|
342 | 342 | { |
343 | 343 | return ''; |
344 | 344 | } |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | |
350 | 350 | public function getParamsString() : string |
351 | 351 | { |
352 | - if($this->requiresParameters()) |
|
352 | + if ($this->requiresParameters()) |
|
353 | 353 | { |
354 | 354 | return $this->paramsString; |
355 | 355 | } |
@@ -380,22 +380,22 @@ discard block |
||
380 | 380 | |
381 | 381 | public final function getCommandType() : string |
382 | 382 | { |
383 | - if($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
383 | + if ($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
384 | 384 | { |
385 | 385 | return 'Closing'; |
386 | 386 | } |
387 | 387 | |
388 | - if($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
388 | + if ($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
389 | 389 | { |
390 | 390 | return 'Opening'; |
391 | 391 | } |
392 | 392 | |
393 | - if($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
393 | + if ($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
394 | 394 | { |
395 | 395 | return 'Sibling'; |
396 | 396 | } |
397 | 397 | |
398 | - if($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
398 | + if ($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
399 | 399 | { |
400 | 400 | return 'Standalone'; |
401 | 401 | } |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | |
435 | 435 | public function getLogicKeywords() : Mailcode_Commands_LogicKeywords |
436 | 436 | { |
437 | - if($this->supportsLogicKeywords() && isset($this->logicKeywords)) |
|
437 | + if ($this->supportsLogicKeywords() && isset($this->logicKeywords)) |
|
438 | 438 | { |
439 | 439 | return $this->logicKeywords; |
440 | 440 | } |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | |
455 | 455 | public function getTranslationParam(string $name) |
456 | 456 | { |
457 | - if(isset($this->translationParams[$name])) |
|
457 | + if (isset($this->translationParams[$name])) |
|
458 | 458 | { |
459 | 459 | return $this->translationParams[$name]; |
460 | 460 | } |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | return null; |
463 | 463 | } |
464 | 464 | |
465 | - public function setURLEncoding(bool $encoding=true) |
|
465 | + public function setURLEncoding(bool $encoding = true) |
|
466 | 466 | { |
467 | 467 | $this->requireURLEncoding(); |
468 | 468 | |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | return $this; |
472 | 472 | } |
473 | 473 | |
474 | - public function setURLDecoding(bool $decode=true) |
|
474 | + public function setURLDecoding(bool $decode = true) |
|
475 | 475 | { |
476 | 476 | $this->requireURLEncoding(); |
477 | 477 | |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | |
483 | 483 | protected function requireURLEncoding() : void |
484 | 484 | { |
485 | - if($this->supportsURLEncoding()) { |
|
485 | + if ($this->supportsURLEncoding()) { |
|
486 | 486 | return; |
487 | 487 | } |
488 | 488 |
@@ -31,19 +31,19 @@ |
||
31 | 31 | const VALIDATION_VARIABLE_NAME_WITH_DOT = 49704; |
32 | 32 | const VALIDATION_LOOP_VARIABLE_NAME_WITH_DOT = 49705; |
33 | 33 | |
34 | - /** |
|
35 | - * @var Mailcode_Parser_Statement_Tokenizer_Token_Variable|NULL |
|
36 | - */ |
|
34 | + /** |
|
35 | + * @var Mailcode_Parser_Statement_Tokenizer_Token_Variable|NULL |
|
36 | + */ |
|
37 | 37 | private $loopVar; |
38 | 38 | |
39 | - /** |
|
40 | - * @var Mailcode_Parser_Statement_Tokenizer_Token_Variable|NULL |
|
41 | - */ |
|
39 | + /** |
|
40 | + * @var Mailcode_Parser_Statement_Tokenizer_Token_Variable|NULL |
|
41 | + */ |
|
42 | 42 | private $sourceVar; |
43 | 43 | |
44 | - /** |
|
45 | - * @var Mailcode_Parser_Statement_Tokenizer_Token_Keyword|NULL |
|
46 | - */ |
|
44 | + /** |
|
45 | + * @var Mailcode_Parser_Statement_Tokenizer_Token_Keyword|NULL |
|
46 | + */ |
|
47 | 47 | private $keyword; |
48 | 48 | |
49 | 49 | public function getName() : string |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | public function getSourceVariable() : Mailcode_Variables_Variable |
101 | 101 | { |
102 | - if(isset($this->sourceVar)) |
|
102 | + if (isset($this->sourceVar)) |
|
103 | 103 | { |
104 | 104 | return $this->sourceVar->getVariable(); |
105 | 105 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | public function getLoopVariable() : Mailcode_Variables_Variable |
115 | 115 | { |
116 | - if(isset($this->loopVar)) |
|
116 | + if (isset($this->loopVar)) |
|
117 | 117 | { |
118 | 118 | return $this->loopVar->getVariable(); |
119 | 119 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $this->keyword = $info->getKeywordByIndex(1); |
134 | 134 | $this->sourceVar = $info->getVariableByIndex(2); |
135 | 135 | |
136 | - if(!$this->loopVar || !$this->keyword || !$this->sourceVar) |
|
136 | + if (!$this->loopVar || !$this->keyword || !$this->sourceVar) |
|
137 | 137 | { |
138 | 138 | $this->validationResult->makeError( |
139 | 139 | t('Not a valid for loop.').' '.t('Is the %1$s keyword missing?', 'in:'), |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | protected function validateSyntax_keyword() : void |
148 | 148 | { |
149 | - if($this->keyword->isForIn()) |
|
149 | + if ($this->keyword->isForIn()) |
|
150 | 150 | { |
151 | 151 | return; |
152 | 152 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | |
160 | 160 | protected function validateSyntax_variable_names() : void |
161 | 161 | { |
162 | - if($this->sourceVar->getVariable()->getFullName() !== $this->loopVar->getVariable()->getFullName()) |
|
162 | + if ($this->sourceVar->getVariable()->getFullName() !== $this->loopVar->getVariable()->getFullName()) |
|
163 | 163 | { |
164 | 164 | return; |
165 | 165 | } |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | $parts = explode('.', $name); |
178 | 178 | |
179 | - if(count($parts) === 1) { |
|
179 | + if (count($parts) === 1) { |
|
180 | 180 | return; |
181 | 181 | } |
182 | 182 | |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | |
194 | 194 | $parts = explode('.', $name); |
195 | 195 | |
196 | - if(count($parts) === 1) { |
|
196 | + if (count($parts) === 1) { |
|
197 | 197 | return; |
198 | 198 | } |
199 | 199 |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | $locale |
41 | 41 | ); |
42 | 42 | |
43 | - if($command->isURLEncoded()) |
|
43 | + if ($command->isURLEncoded()) |
|
44 | 44 | { |
45 | 45 | return sprintf( |
46 | 46 | '${esc.url($%s)}', |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $dc = '_'; |
93 | 93 | } |
94 | 94 | |
95 | - $type = $th . $dc; |
|
95 | + $type = $th.$dc; |
|
96 | 96 | |
97 | 97 | if (isset($this->typeLocales[$type])) { |
98 | 98 | return $this->typeLocales[$type]; |
@@ -105,12 +105,12 @@ discard block |
||
105 | 105 | { |
106 | 106 | $result = '0'; |
107 | 107 | |
108 | - if($format->hasThousandsSeparator()) |
|
108 | + if ($format->hasThousandsSeparator()) |
|
109 | 109 | { |
110 | 110 | $result = '#,##0'; |
111 | 111 | } |
112 | 112 | |
113 | - if($format->hasDecimals()) |
|
113 | + if ($format->hasDecimals()) |
|
114 | 114 | { |
115 | 115 | $result .= '.'.str_repeat('0', $format->getDecimals()); |
116 | 116 | } |