@@ -22,17 +22,17 @@ discard block |
||
| 22 | 22 | { |
| 23 | 23 | public function translate(Mailcode_Commands_Command_If $command): string |
| 24 | 24 | { |
| 25 | - if($command instanceof Mailcode_Commands_Command_If_Command) |
|
| 25 | + if ($command instanceof Mailcode_Commands_Command_If_Command) |
|
| 26 | 26 | { |
| 27 | 27 | return $this->translateCommand($command); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - if($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 30 | + if ($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 31 | 31 | { |
| 32 | 32 | return $this->translateVariable($command); |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - if($command instanceof Mailcode_Commands_Command_If_Contains) |
|
| 35 | + if ($command instanceof Mailcode_Commands_Command_If_Contains) |
|
| 36 | 36 | { |
| 37 | 37 | return $this->translateContains($command); |
| 38 | 38 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | { |
| 45 | 45 | $params = $command->getParams(); |
| 46 | 46 | |
| 47 | - if(!$params) |
|
| 47 | + if (!$params) |
|
| 48 | 48 | { |
| 49 | 49 | return ''; |
| 50 | 50 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | protected function translateContains(Mailcode_Commands_Command_If_Contains $command) : string |
| 69 | 69 | { |
| 70 | 70 | $opts = 's'; |
| 71 | - if($command->isCaseInsensitive()) |
|
| 71 | + if ($command->isCaseInsensitive()) |
|
| 72 | 72 | { |
| 73 | 73 | $opts = 'is'; |
| 74 | 74 | } |
@@ -22,17 +22,17 @@ discard block |
||
| 22 | 22 | { |
| 23 | 23 | public function translate(Mailcode_Commands_Command_ElseIf $command): string |
| 24 | 24 | { |
| 25 | - if($command instanceof Mailcode_Commands_Command_ElseIf_Command) |
|
| 25 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_Command) |
|
| 26 | 26 | { |
| 27 | 27 | return $this->translateCommand($command); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - if($command instanceof Mailcode_Commands_Command_ElseIf_Variable) |
|
| 30 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable) |
|
| 31 | 31 | { |
| 32 | 32 | return $this->translateVariable($command); |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - if($command instanceof Mailcode_Commands_Command_ElseIf_Contains) |
|
| 35 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_Contains) |
|
| 36 | 36 | { |
| 37 | 37 | return $this->translateContains($command); |
| 38 | 38 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | { |
| 45 | 45 | $params = $command->getParams(); |
| 46 | 46 | |
| 47 | - if(!$params) |
|
| 47 | + if (!$params) |
|
| 48 | 48 | { |
| 49 | 49 | return ''; |
| 50 | 50 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | protected function translateContains(Mailcode_Commands_Command_ElseIf_Contains $command) : string |
| 69 | 69 | { |
| 70 | 70 | $opts = 's'; |
| 71 | - if($command->isCaseInsensitive()) |
|
| 71 | + if ($command->isCaseInsensitive()) |
|
| 72 | 72 | { |
| 73 | 73 | $opts = 'is'; |
| 74 | 74 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $command->getID() |
| 65 | 65 | ); |
| 66 | 66 | |
| 67 | - if(!class_exists($class)) |
|
| 67 | + if (!class_exists($class)) |
|
| 68 | 68 | { |
| 69 | 69 | throw new Mailcode_Translator_Exception( |
| 70 | 70 | sprintf('Unknown command %s in translator', $command->getID()), |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | { |
| 93 | 93 | $subject = $safeguard->makeSafe(); |
| 94 | 94 | |
| 95 | - if(!$safeguard->hasPlaceholders()) |
|
| 95 | + if (!$safeguard->hasPlaceholders()) |
|
| 96 | 96 | { |
| 97 | 97 | return $subject; |
| 98 | 98 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | $replaces = array(); |
| 103 | 103 | |
| 104 | - foreach($placeholders as $placeholder) |
|
| 104 | + foreach ($placeholders as $placeholder) |
|
| 105 | 105 | { |
| 106 | 106 | $replaces[$placeholder->getReplacementText()] = $this->translateCommand($placeholder->getCommand()); |
| 107 | 107 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | { |
| 69 | 69 | $variable = $this->params->getInfo()->getVariableByIndex(0); |
| 70 | 70 | |
| 71 | - if($variable) |
|
| 71 | + if ($variable) |
|
| 72 | 72 | { |
| 73 | 73 | return $variable->getVariable(); |
| 74 | 74 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | protected function validateSyntax_assignment() : void |
| 98 | 98 | { |
| 99 | - if($this->params->getInfo()->isVariableAssignment()) |
|
| 99 | + if ($this->params->getInfo()->isVariableAssignment()) |
|
| 100 | 100 | { |
| 101 | 101 | return; |
| 102 | 102 | } |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | $value = $info->getTokenByIndex(2); |
| 115 | 115 | |
| 116 | - if($value instanceof Mailcode_Parser_Statement_Tokenizer_Type_Value) |
|
| 116 | + if ($value instanceof Mailcode_Parser_Statement_Tokenizer_Type_Value) |
|
| 117 | 117 | { |
| 118 | 118 | $this->value = $value; |
| 119 | 119 | return; |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | */ |
| 81 | 81 | protected $comment = ''; |
| 82 | 82 | |
| 83 | - public function __construct(string $type='', string $paramsString='', string $matchedText='') |
|
| 83 | + public function __construct(string $type = '', string $paramsString = '', string $matchedText = '') |
|
| 84 | 84 | { |
| 85 | 85 | $this->type = $type; |
| 86 | 86 | $this->paramsString = html_entity_decode($paramsString); |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | { |
| 154 | 154 | $this->requireNonDummy(); |
| 155 | 155 | |
| 156 | - if($this->hash === '') { |
|
| 156 | + if ($this->hash === '') { |
|
| 157 | 157 | $this->hash = md5($this->matchedText); |
| 158 | 158 | } |
| 159 | 159 | |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | protected function requireNonDummy() : void |
| 164 | 164 | { |
| 165 | - if(!$this->isDummy()) |
|
| 165 | + if (!$this->isDummy()) |
|
| 166 | 166 | { |
| 167 | 167 | return; |
| 168 | 168 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | { |
| 184 | 184 | $this->requireNonDummy(); |
| 185 | 185 | |
| 186 | - if(isset($this->validationResult)) |
|
| 186 | + if (isset($this->validationResult)) |
|
| 187 | 187 | { |
| 188 | 188 | return $this->validationResult; |
| 189 | 189 | } |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | |
| 198 | 198 | public function getValidationResult() : \AppUtils\OperationResult |
| 199 | 199 | { |
| 200 | - if(isset($this->validationResult)) |
|
| 200 | + if (isset($this->validationResult)) |
|
| 201 | 201 | { |
| 202 | 202 | return $this->validationResult; |
| 203 | 203 | } |
@@ -213,11 +213,11 @@ discard block |
||
| 213 | 213 | { |
| 214 | 214 | $validations = array_merge($this->validations, $this->getValidations()); |
| 215 | 215 | |
| 216 | - foreach($validations as $validation) |
|
| 216 | + foreach ($validations as $validation) |
|
| 217 | 217 | { |
| 218 | 218 | $method = 'validateSyntax_'.$validation; |
| 219 | 219 | |
| 220 | - if(!method_exists($this, $method)) |
|
| 220 | + if (!method_exists($this, $method)) |
|
| 221 | 221 | { |
| 222 | 222 | throw new Mailcode_Exception( |
| 223 | 223 | 'Missing validation method', |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | $this->$method(); |
| 234 | 234 | |
| 235 | 235 | // break off at the first validation issue |
| 236 | - if(!$this->validationResult->isValid()) |
|
| 236 | + if (!$this->validationResult->isValid()) |
|
| 237 | 237 | { |
| 238 | 238 | return; |
| 239 | 239 | } |
@@ -247,12 +247,12 @@ discard block |
||
| 247 | 247 | |
| 248 | 248 | protected function validateSyntax_params() : void |
| 249 | 249 | { |
| 250 | - if(!$this->requiresParameters()) |
|
| 250 | + if (!$this->requiresParameters()) |
|
| 251 | 251 | { |
| 252 | 252 | return; |
| 253 | 253 | } |
| 254 | 254 | |
| 255 | - if(empty($this->paramsString)) |
|
| 255 | + if (empty($this->paramsString)) |
|
| 256 | 256 | { |
| 257 | 257 | $this->validationResult->makeError( |
| 258 | 258 | t('Parameters have to be specified.'), |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | |
| 264 | 264 | $this->params = $this->mailcode->getParser()->createStatement($this->paramsString); |
| 265 | 265 | |
| 266 | - if(!$this->params->isValid()) |
|
| 266 | + if (!$this->params->isValid()) |
|
| 267 | 267 | { |
| 268 | 268 | $error = $this->params->getValidationResult(); |
| 269 | 269 | |
@@ -276,14 +276,14 @@ discard block |
||
| 276 | 276 | |
| 277 | 277 | protected function validateSyntax_type_supported() : void |
| 278 | 278 | { |
| 279 | - if(!$this->supportsType() || empty($this->type)) |
|
| 279 | + if (!$this->supportsType() || empty($this->type)) |
|
| 280 | 280 | { |
| 281 | 281 | return; |
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | $types = $this->getSupportedTypes(); |
| 285 | 285 | |
| 286 | - if(!in_array($this->type, $types)) |
|
| 286 | + if (!in_array($this->type, $types)) |
|
| 287 | 287 | { |
| 288 | 288 | $this->validationResult->makeError( |
| 289 | 289 | t('The command addon %1$s is not supported.', $this->type).' '. |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | |
| 298 | 298 | protected function validateSyntax_type_unsupported() : void |
| 299 | 299 | { |
| 300 | - if($this->supportsType() || empty($this->type)) |
|
| 300 | + if ($this->supportsType() || empty($this->type)) |
|
| 301 | 301 | { |
| 302 | 302 | return; |
| 303 | 303 | } |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | |
| 316 | 316 | public function getType() : string |
| 317 | 317 | { |
| 318 | - if($this->supportsType()) |
|
| 318 | + if ($this->supportsType()) |
|
| 319 | 319 | { |
| 320 | 320 | return $this->type; |
| 321 | 321 | } |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | |
| 336 | 336 | public function getHighlighted() : string |
| 337 | 337 | { |
| 338 | - if(!$this->isValid()) |
|
| 338 | + if (!$this->isValid()) |
|
| 339 | 339 | { |
| 340 | 340 | return ''; |
| 341 | 341 | } |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | |
| 347 | 347 | public function getParamsString() : string |
| 348 | 348 | { |
| 349 | - if($this->requiresParameters()) |
|
| 349 | + if ($this->requiresParameters()) |
|
| 350 | 350 | { |
| 351 | 351 | return $this->paramsString; |
| 352 | 352 | } |
@@ -373,22 +373,22 @@ discard block |
||
| 373 | 373 | |
| 374 | 374 | public final function getCommandType() : string |
| 375 | 375 | { |
| 376 | - if($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
| 376 | + if ($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
| 377 | 377 | { |
| 378 | 378 | return 'Closing'; |
| 379 | 379 | } |
| 380 | 380 | |
| 381 | - if($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 381 | + if ($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 382 | 382 | { |
| 383 | 383 | return 'Opening'; |
| 384 | 384 | } |
| 385 | 385 | |
| 386 | - if($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
| 386 | + if ($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
| 387 | 387 | { |
| 388 | 388 | return 'Sibling'; |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | - if($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
| 391 | + if ($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
| 392 | 392 | { |
| 393 | 393 | return 'Standalone'; |
| 394 | 394 | } |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | |
| 406 | 406 | public function getNormalized() : string |
| 407 | 407 | { |
| 408 | - if(!$this->isValid()) |
|
| 408 | + if (!$this->isValid()) |
|
| 409 | 409 | { |
| 410 | 410 | return ''; |
| 411 | 411 | } |
@@ -413,12 +413,12 @@ discard block |
||
| 413 | 413 | $parts = array(); |
| 414 | 414 | $parts[] = '{'.$this->getName(); |
| 415 | 415 | |
| 416 | - if($this->supportsType() && $this->hasType()) |
|
| 416 | + if ($this->supportsType() && $this->hasType()) |
|
| 417 | 417 | { |
| 418 | 418 | $parts[] = ' '.$this->getType(); |
| 419 | 419 | } |
| 420 | 420 | |
| 421 | - if($this->requiresParameters() && isset($this->params)) |
|
| 421 | + if ($this->requiresParameters() && isset($this->params)) |
|
| 422 | 422 | { |
| 423 | 423 | $parts[] = ': '; |
| 424 | 424 | $parts[] = $this->params->getNormalized(); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | $lastPos = 0; |
| 49 | 49 | $positions = array(); |
| 50 | 50 | |
| 51 | - while (($lastPos = mb_strpos($haystack, $needle, $lastPos))!== false) |
|
| 51 | + while (($lastPos = mb_strpos($haystack, $needle, $lastPos)) !== false) |
|
| 52 | 52 | { |
| 53 | 53 | $positions[] = $lastPos; |
| 54 | 54 | $lastPos = $lastPos + mb_strlen($needle); |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | { |
| 68 | 68 | $eol = ConvertHelper::detectEOLCharacter($subject); |
| 69 | 69 | |
| 70 | - if($eol) |
|
| 70 | + if ($eol) |
|
| 71 | 71 | { |
| 72 | 72 | return $eol->getCharacter(); |
| 73 | 73 | } |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | |
| 89 | 89 | $result = array(); |
| 90 | 90 | |
| 91 | - foreach($placeholders as $placeholder) |
|
| 91 | + foreach ($placeholders as $placeholder) |
|
| 92 | 92 | { |
| 93 | 93 | $result[] = $placeholder->getReplacementText(); |
| 94 | 94 | } |
@@ -90,21 +90,21 @@ discard block |
||
| 90 | 90 | protected function analyzePrepend(string $subject) : void |
| 91 | 91 | { |
| 92 | 92 | // we're at the beginning of the string |
| 93 | - if($this->position == 0) |
|
| 93 | + if ($this->position == 0) |
|
| 94 | 94 | { |
| 95 | 95 | return; |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | $prevPos = $this->position - $this->eolLength; |
| 99 | 99 | |
| 100 | - if($prevPos < 0) |
|
| 100 | + if ($prevPos < 0) |
|
| 101 | 101 | { |
| 102 | 102 | $prevPos = 0; |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | $prev = mb_substr($subject, $prevPos, $this->eolLength); |
| 106 | 106 | |
| 107 | - if($prev !== $this->formatter->getEOLChar()) |
|
| 107 | + if ($prev !== $this->formatter->getEOLChar()) |
|
| 108 | 108 | { |
| 109 | 109 | $this->prepend = true; |
| 110 | 110 | } |
@@ -117,21 +117,21 @@ discard block |
||
| 117 | 117 | $position = $this->position + $this->placeholderLength; |
| 118 | 118 | |
| 119 | 119 | // we're at the end of the string |
| 120 | - if($position >= $subjectLength) |
|
| 120 | + if ($position >= $subjectLength) |
|
| 121 | 121 | { |
| 122 | 122 | return; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | $nextPos = $position + $this->eolLength; |
| 126 | 126 | |
| 127 | - if($nextPos > $subjectLength) |
|
| 127 | + if ($nextPos > $subjectLength) |
|
| 128 | 128 | { |
| 129 | 129 | $nextPos = $subjectLength - $this->eolLength; |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | $next = mb_substr($subject, $nextPos, $this->eolLength); |
| 133 | 133 | |
| 134 | - if($next !== $this->formatter->getEOLChar()) |
|
| 134 | + if ($next !== $this->formatter->getEOLChar()) |
|
| 135 | 135 | { |
| 136 | 136 | $this->append = true; |
| 137 | 137 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | $total = count($placeholders); |
| 44 | 44 | |
| 45 | - for($i=0; $i < $total; $i++) |
|
| 45 | + for ($i = 0; $i < $total; $i++) |
|
| 46 | 46 | { |
| 47 | 47 | $subject = $this->process($placeholders[$i], $subject); |
| 48 | 48 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $phLength = mb_strlen($placeholder); |
| 67 | 67 | $offset = 0; |
| 68 | 68 | |
| 69 | - foreach($positions as $position) |
|
| 69 | + foreach ($positions as $position) |
|
| 70 | 70 | { |
| 71 | 71 | // adjust the position if previous changes made the subject longer |
| 72 | 72 | $position += $offset; |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | $position |
| 79 | 79 | ); |
| 80 | 80 | |
| 81 | - if(!$info->requiresAdjustment()) |
|
| 81 | + if (!$info->requiresAdjustment()) |
|
| 82 | 82 | { |
| 83 | 83 | continue; |
| 84 | 84 | } |
@@ -106,12 +106,12 @@ discard block |
||
| 106 | 106 | $prepend = ''; |
| 107 | 107 | $append = ''; |
| 108 | 108 | |
| 109 | - if($info->requiresPrepend()) |
|
| 109 | + if ($info->requiresPrepend()) |
|
| 110 | 110 | { |
| 111 | 111 | $prepend = $this->eol; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - if($info->requiresAppend()) |
|
| 114 | + if ($info->requiresAppend()) |
|
| 115 | 115 | { |
| 116 | 116 | $append = $this->eol; |
| 117 | 117 | } |
@@ -132,9 +132,9 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | $result = array(); |
| 134 | 134 | |
| 135 | - foreach($placeholders as $placeholder) |
|
| 135 | + foreach ($placeholders as $placeholder) |
|
| 136 | 136 | { |
| 137 | - if(!$placeholder->getCommand()->generatesContent()) |
|
| 137 | + if (!$placeholder->getCommand()->generatesContent()) |
|
| 138 | 138 | { |
| 139 | 139 | $result[] = $placeholder; |
| 140 | 140 | } |
@@ -56,9 +56,9 @@ |
||
| 56 | 56 | $chars = ConvertHelper::string2array($formatString); |
| 57 | 57 | $result = array(); |
| 58 | 58 | |
| 59 | - foreach($chars as $char) |
|
| 59 | + foreach ($chars as $char) |
|
| 60 | 60 | { |
| 61 | - if(!isset($this->charTable[$char])) |
|
| 61 | + if (!isset($this->charTable[$char])) |
|
| 62 | 62 | { |
| 63 | 63 | throw new Mailcode_Translator_Exception( |
| 64 | 64 | 'Unknown date format string character', |