@@ -34,7 +34,7 @@ |
||
| 34 | 34 | |
| 35 | 35 | public function getToken() : Mailcode_Parser_Statement_Tokenizer_Token_Variable |
| 36 | 36 | { |
| 37 | - if($this->token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) |
|
| 37 | + if ($this->token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) |
|
| 38 | 38 | { |
| 39 | 39 | return $this->token; |
| 40 | 40 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | */ |
| 99 | 99 | private $validated = false; |
| 100 | 100 | |
| 101 | - public function __construct(string $type='', string $paramsString='', string $matchedText='') |
|
| 101 | + public function __construct(string $type = '', string $paramsString = '', string $matchedText = '') |
|
| 102 | 102 | { |
| 103 | 103 | $this->type = $type; |
| 104 | 104 | $this->paramsString = html_entity_decode($paramsString); |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | { |
| 173 | 173 | $this->requireNonDummy(); |
| 174 | 174 | |
| 175 | - if($this->hash === '') { |
|
| 175 | + if ($this->hash === '') { |
|
| 176 | 176 | $this->hash = md5($this->matchedText); |
| 177 | 177 | } |
| 178 | 178 | |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | protected function requireNonDummy() : void |
| 183 | 183 | { |
| 184 | - if(!$this->isDummy()) |
|
| 184 | + if (!$this->isDummy()) |
|
| 185 | 185 | { |
| 186 | 186 | return; |
| 187 | 187 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | |
| 201 | 201 | protected function validate() : \AppUtils\OperationResult |
| 202 | 202 | { |
| 203 | - if(!$this->validated) |
|
| 203 | + if (!$this->validated) |
|
| 204 | 204 | { |
| 205 | 205 | $this->requireNonDummy(); |
| 206 | 206 | $this->validateSyntax(); |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | |
| 214 | 214 | public function getValidationResult() : \AppUtils\OperationResult |
| 215 | 215 | { |
| 216 | - if(isset($this->validationResult)) |
|
| 216 | + if (isset($this->validationResult)) |
|
| 217 | 217 | { |
| 218 | 218 | return $this->validationResult; |
| 219 | 219 | } |
@@ -229,10 +229,10 @@ discard block |
||
| 229 | 229 | { |
| 230 | 230 | $validations = array_merge($this->validations, $this->getValidations()); |
| 231 | 231 | |
| 232 | - foreach($validations as $validation) |
|
| 232 | + foreach ($validations as $validation) |
|
| 233 | 233 | { |
| 234 | 234 | // break off at the first validation issue |
| 235 | - if(!$this->validateSyntaxMethod($validation)) |
|
| 235 | + if (!$this->validateSyntaxMethod($validation)) |
|
| 236 | 236 | { |
| 237 | 237 | return; |
| 238 | 238 | } |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | { |
| 244 | 244 | $method = 'validateSyntax_'.$validation; |
| 245 | 245 | |
| 246 | - if(!method_exists($this, $method)) |
|
| 246 | + if (!method_exists($this, $method)) |
|
| 247 | 247 | { |
| 248 | 248 | throw new Mailcode_Exception( |
| 249 | 249 | 'Missing validation method ['.$validation.']', |
@@ -268,12 +268,12 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | protected function validateSyntax_params_empty() : void |
| 270 | 270 | { |
| 271 | - if(!$this->requiresParameters()) |
|
| 271 | + if (!$this->requiresParameters()) |
|
| 272 | 272 | { |
| 273 | 273 | return; |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | - if(empty($this->paramsString)) |
|
| 276 | + if (empty($this->paramsString)) |
|
| 277 | 277 | { |
| 278 | 278 | $this->validationResult->makeError( |
| 279 | 279 | t('Parameters have to be specified.'), |
@@ -285,14 +285,14 @@ discard block |
||
| 285 | 285 | |
| 286 | 286 | protected function validateSyntax_params_keywords() : void |
| 287 | 287 | { |
| 288 | - if(!$this->supportsLogicKeywords()) |
|
| 288 | + if (!$this->supportsLogicKeywords()) |
|
| 289 | 289 | { |
| 290 | 290 | return; |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | $this->logicKeywords = new Mailcode_Commands_LogicKeywords($this, $this->paramsString); |
| 294 | 294 | |
| 295 | - if(!$this->logicKeywords->isValid()) |
|
| 295 | + if (!$this->logicKeywords->isValid()) |
|
| 296 | 296 | { |
| 297 | 297 | $this->validationResult->makeError( |
| 298 | 298 | t('Invalid parameters:').' '.$this->logicKeywords->getErrorMessage(), |
@@ -307,14 +307,14 @@ discard block |
||
| 307 | 307 | |
| 308 | 308 | protected function validateSyntax_params_parse() : void |
| 309 | 309 | { |
| 310 | - if(!$this->requiresParameters()) |
|
| 310 | + if (!$this->requiresParameters()) |
|
| 311 | 311 | { |
| 312 | 312 | return; |
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | $this->params = $this->mailcode->getParser()->createStatement($this->paramsString); |
| 316 | 316 | |
| 317 | - if(!$this->params->isValid()) |
|
| 317 | + if (!$this->params->isValid()) |
|
| 318 | 318 | { |
| 319 | 319 | $error = $this->params->getValidationResult(); |
| 320 | 320 | |
@@ -331,14 +331,14 @@ discard block |
||
| 331 | 331 | |
| 332 | 332 | protected function validateSyntax_type_supported() : void |
| 333 | 333 | { |
| 334 | - if(!$this->supportsType() || empty($this->type)) |
|
| 334 | + if (!$this->supportsType() || empty($this->type)) |
|
| 335 | 335 | { |
| 336 | 336 | return; |
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | $types = $this->getSupportedTypes(); |
| 340 | 340 | |
| 341 | - if(!in_array($this->type, $types)) |
|
| 341 | + if (!in_array($this->type, $types)) |
|
| 342 | 342 | { |
| 343 | 343 | $this->validationResult->makeError( |
| 344 | 344 | t('The command addon %1$s is not supported.', $this->type).' '. |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | |
| 353 | 353 | protected function validateSyntax_type_unsupported() : void |
| 354 | 354 | { |
| 355 | - if($this->supportsType() || empty($this->type)) |
|
| 355 | + if ($this->supportsType() || empty($this->type)) |
|
| 356 | 356 | { |
| 357 | 357 | return; |
| 358 | 358 | } |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | |
| 371 | 371 | public function getType() : string |
| 372 | 372 | { |
| 373 | - if($this->supportsType()) |
|
| 373 | + if ($this->supportsType()) |
|
| 374 | 374 | { |
| 375 | 375 | return $this->type; |
| 376 | 376 | } |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | |
| 391 | 391 | public function getHighlighted() : string |
| 392 | 392 | { |
| 393 | - if(!$this->isValid()) |
|
| 393 | + if (!$this->isValid()) |
|
| 394 | 394 | { |
| 395 | 395 | return ''; |
| 396 | 396 | } |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | |
| 402 | 402 | public function getParamsString() : string |
| 403 | 403 | { |
| 404 | - if($this->requiresParameters()) |
|
| 404 | + if ($this->requiresParameters()) |
|
| 405 | 405 | { |
| 406 | 406 | return $this->paramsString; |
| 407 | 407 | } |
@@ -436,22 +436,22 @@ discard block |
||
| 436 | 436 | |
| 437 | 437 | public final function getCommandType() : string |
| 438 | 438 | { |
| 439 | - if($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
| 439 | + if ($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
| 440 | 440 | { |
| 441 | 441 | return 'Closing'; |
| 442 | 442 | } |
| 443 | 443 | |
| 444 | - if($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 444 | + if ($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 445 | 445 | { |
| 446 | 446 | return 'Opening'; |
| 447 | 447 | } |
| 448 | 448 | |
| 449 | - if($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
| 449 | + if ($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
| 450 | 450 | { |
| 451 | 451 | return 'Sibling'; |
| 452 | 452 | } |
| 453 | 453 | |
| 454 | - if($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
| 454 | + if ($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
| 455 | 455 | { |
| 456 | 456 | return 'Standalone'; |
| 457 | 457 | } |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | |
| 502 | 502 | public function getLogicKeywords() : Mailcode_Commands_LogicKeywords |
| 503 | 503 | { |
| 504 | - if($this->supportsLogicKeywords() && isset($this->logicKeywords)) |
|
| 504 | + if ($this->supportsLogicKeywords() && isset($this->logicKeywords)) |
|
| 505 | 505 | { |
| 506 | 506 | return $this->logicKeywords; |
| 507 | 507 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | { |
| 34 | 34 | $val = $this->validator->createStringLiteral(); |
| 35 | 35 | |
| 36 | - if($val->isValid()) |
|
| 36 | + if ($val->isValid()) |
|
| 37 | 37 | { |
| 38 | 38 | $this->searchTerm = $val->getToken(); |
| 39 | 39 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | public function getSearchTerm() : string |
| 50 | 50 | { |
| 51 | - if($this->searchTerm instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) |
|
| 51 | + if ($this->searchTerm instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) |
|
| 52 | 52 | { |
| 53 | 53 | return $this->searchTerm->getNormalized(); |
| 54 | 54 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | { |
| 34 | 34 | $var = $this->validator->createValue(); |
| 35 | 35 | |
| 36 | - if($var->isValid()) |
|
| 36 | + if ($var->isValid()) |
|
| 37 | 37 | { |
| 38 | 38 | $this->valueToken = $var->getToken(); |
| 39 | 39 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function getValue() : string |
| 55 | 55 | { |
| 56 | - if($this->valueToken instanceof Mailcode_Parser_Statement_Tokenizer_ValueInterface) |
|
| 56 | + if ($this->valueToken instanceof Mailcode_Parser_Statement_Tokenizer_ValueInterface) |
|
| 57 | 57 | { |
| 58 | 58 | return $this->valueToken->getValue(); |
| 59 | 59 | } |
@@ -39,9 +39,9 @@ discard block |
||
| 39 | 39 | { |
| 40 | 40 | $var = $this->validator->createOperand(); |
| 41 | 41 | |
| 42 | - if($var->isValid()) |
|
| 42 | + if ($var->isValid()) |
|
| 43 | 43 | { |
| 44 | - if(in_array($var->getSign(), $this->getAllowedOperands())) |
|
| 44 | + if (in_array($var->getSign(), $this->getAllowedOperands())) |
|
| 45 | 45 | { |
| 46 | 46 | $this->operandToken = $var->getToken(); |
| 47 | 47 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | public function getOperand() : Mailcode_Parser_Statement_Tokenizer_Token_Operand |
| 68 | 68 | { |
| 69 | - if($this->operandToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand) |
|
| 69 | + if ($this->operandToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand) |
|
| 70 | 70 | { |
| 71 | 71 | return $this->operandToken; |
| 72 | 72 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | { |
| 34 | 34 | $var = $this->validator->createVariable(); |
| 35 | 35 | |
| 36 | - if($var->isValid()) |
|
| 36 | + if ($var->isValid()) |
|
| 37 | 37 | { |
| 38 | 38 | $this->variableToken = $var->getToken(); |
| 39 | 39 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function getVariable() : Mailcode_Variables_Variable |
| 55 | 55 | { |
| 56 | - if($this->variableToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) |
|
| 56 | + if ($this->variableToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) |
|
| 57 | 57 | { |
| 58 | 58 | return $this->variableToken->getVariable(); |
| 59 | 59 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | { |
| 47 | 47 | $id = $token->getID(); |
| 48 | 48 | |
| 49 | - if(!in_array($id, $this->exclude)) |
|
| 49 | + if (!in_array($id, $this->exclude)) |
|
| 50 | 50 | { |
| 51 | 51 | $this->exclude[] = $id; |
| 52 | 52 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | public function limitByClassName(string $className) : Mailcode_Parser_Statement_Info_Pruner |
| 68 | 68 | { |
| 69 | - if(!in_array($className, $this->classNames)) |
|
| 69 | + if (!in_array($className, $this->classNames)) |
|
| 70 | 70 | { |
| 71 | 71 | $this->classNames[] = $className; |
| 72 | 72 | } |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | $tokens = $this->info->getTokens(); |
| 86 | 86 | $keep = array(); |
| 87 | 87 | |
| 88 | - foreach($tokens as $token) |
|
| 88 | + foreach ($tokens as $token) |
|
| 89 | 89 | { |
| 90 | - if(in_array($token->getID(), $this->exclude)) |
|
| 90 | + if (in_array($token->getID(), $this->exclude)) |
|
| 91 | 91 | { |
| 92 | 92 | continue; |
| 93 | 93 | } |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | { |
| 136 | 136 | $result = array(); |
| 137 | 137 | |
| 138 | - foreach($this->tokensOrdered as $token) |
|
| 138 | + foreach ($this->tokensOrdered as $token) |
|
| 139 | 139 | { |
| 140 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown) |
|
| 140 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown) |
|
| 141 | 141 | { |
| 142 | 142 | $result[] = $token; |
| 143 | 143 | } |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | { |
| 151 | 151 | $unknown = $this->getUnknown(); |
| 152 | 152 | |
| 153 | - if(!empty($unknown)) |
|
| 153 | + if (!empty($unknown)) |
|
| 154 | 154 | { |
| 155 | 155 | return array_shift($unknown); |
| 156 | 156 | } |
@@ -162,11 +162,11 @@ discard block |
||
| 162 | 162 | { |
| 163 | 163 | $parts = array(); |
| 164 | 164 | |
| 165 | - foreach($this->tokensOrdered as $token) |
|
| 165 | + foreach ($this->tokensOrdered as $token) |
|
| 166 | 166 | { |
| 167 | 167 | $string = $token->getNormalized(); |
| 168 | 168 | |
| 169 | - if($string != '') |
|
| 169 | + if ($string != '') |
|
| 170 | 170 | { |
| 171 | 171 | $parts[] = $string; |
| 172 | 172 | } |
@@ -179,11 +179,11 @@ discard block |
||
| 179 | 179 | { |
| 180 | 180 | $this->tokenized = trim($statement); |
| 181 | 181 | |
| 182 | - foreach($this->tokenCategories as $token) |
|
| 182 | + foreach ($this->tokenCategories as $token) |
|
| 183 | 183 | { |
| 184 | 184 | $method = 'tokenize_'.$token; |
| 185 | 185 | |
| 186 | - if(!method_exists($this, $method)) |
|
| 186 | + if (!method_exists($this, $method)) |
|
| 187 | 187 | { |
| 188 | 188 | throw new Mailcode_Exception( |
| 189 | 189 | 'Unknown statement token.', |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | * @param string $matchedText |
| 208 | 208 | * @param mixed $subject |
| 209 | 209 | */ |
| 210 | - protected function registerToken(string $type, string $matchedText, $subject=null) : void |
|
| 210 | + protected function registerToken(string $type, string $matchedText, $subject = null) : void |
|
| 211 | 211 | { |
| 212 | 212 | $tokenID = $this->generateID(); |
| 213 | 213 | |
@@ -224,9 +224,9 @@ discard block |
||
| 224 | 224 | |
| 225 | 225 | protected function getTokenByID(string $tokenID) : ?Mailcode_Parser_Statement_Tokenizer_Token |
| 226 | 226 | { |
| 227 | - foreach($this->tokensTemporary as $token) |
|
| 227 | + foreach ($this->tokensTemporary as $token) |
|
| 228 | 228 | { |
| 229 | - if($token->getID() === $tokenID) |
|
| 229 | + if ($token->getID() === $tokenID) |
|
| 230 | 230 | { |
| 231 | 231 | return $token; |
| 232 | 232 | } |
@@ -242,9 +242,9 @@ discard block |
||
| 242 | 242 | |
| 243 | 243 | protected function tokenize_keywords() : void |
| 244 | 244 | { |
| 245 | - foreach($this->keywords as $keyword) |
|
| 245 | + foreach ($this->keywords as $keyword) |
|
| 246 | 246 | { |
| 247 | - if(strstr($this->tokenized, $keyword)) |
|
| 247 | + if (strstr($this->tokenized, $keyword)) |
|
| 248 | 248 | { |
| 249 | 249 | $this->registerToken('Keyword', $keyword); |
| 250 | 250 | } |
@@ -258,12 +258,12 @@ discard block |
||
| 258 | 258 | // over that could not be tokenized. |
| 259 | 259 | $parts = \AppUtils\ConvertHelper::explodeTrim($this->delimiter, $this->tokenized); |
| 260 | 260 | |
| 261 | - foreach($parts as $part) |
|
| 261 | + foreach ($parts as $part) |
|
| 262 | 262 | { |
| 263 | 263 | $token = $this->getTokenByID($part); |
| 264 | 264 | |
| 265 | 265 | // if the entry is a token, simply add it. |
| 266 | - if($token) |
|
| 266 | + if ($token) |
|
| 267 | 267 | { |
| 268 | 268 | $this->tokensOrdered[] = $token; |
| 269 | 269 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | { |
| 280 | 280 | $vars = Mailcode::create()->findVariables($this->tokenized)->getGroupedByHash(); |
| 281 | 281 | |
| 282 | - foreach($vars as $var) |
|
| 282 | + foreach ($vars as $var) |
|
| 283 | 283 | { |
| 284 | 284 | $this->registerToken('Variable', $var->getMatchedText(), $var); |
| 285 | 285 | } |
@@ -287,9 +287,9 @@ discard block |
||
| 287 | 287 | |
| 288 | 288 | protected function tokenize_operands() : void |
| 289 | 289 | { |
| 290 | - foreach($this->operands as $operand) |
|
| 290 | + foreach ($this->operands as $operand) |
|
| 291 | 291 | { |
| 292 | - if(strstr($this->tokenized, $operand)) |
|
| 292 | + if (strstr($this->tokenized, $operand)) |
|
| 293 | 293 | { |
| 294 | 294 | $this->registerToken('Operand', $operand); |
| 295 | 295 | } |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | $matches = array(); |
| 302 | 302 | preg_match_all('/"(.*)"/sxU', $this->tokenized, $matches, PREG_PATTERN_ORDER); |
| 303 | 303 | |
| 304 | - foreach($matches[0] as $match) |
|
| 304 | + foreach ($matches[0] as $match) |
|
| 305 | 305 | { |
| 306 | 306 | $this->registerToken('StringLiteral', $match); |
| 307 | 307 | } |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | $matches = array(); |
| 313 | 313 | preg_match_all('/-*[0-9]+\s*[.,]\s*[0-9]+|-*[0-9]+/sx', $this->tokenized, $matches, PREG_PATTERN_ORDER); |
| 314 | 314 | |
| 315 | - foreach($matches[0] as $match) |
|
| 315 | + foreach ($matches[0] as $match) |
|
| 316 | 316 | { |
| 317 | 317 | $this->registerToken('Number', $match); |
| 318 | 318 | } |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | { |
| 330 | 330 | static $alphas; |
| 331 | 331 | |
| 332 | - if(!isset($alphas)) |
|
| 332 | + if (!isset($alphas)) |
|
| 333 | 333 | { |
| 334 | 334 | $alphas = range('A', 'Z'); |
| 335 | 335 | } |
@@ -338,12 +338,12 @@ discard block |
||
| 338 | 338 | |
| 339 | 339 | $result = ''; |
| 340 | 340 | |
| 341 | - for($i=0; $i < $amount; $i++) |
|
| 341 | + for ($i = 0; $i < $amount; $i++) |
|
| 342 | 342 | { |
| 343 | 343 | $result .= $alphas[array_rand($alphas)]; |
| 344 | 344 | } |
| 345 | 345 | |
| 346 | - if(!in_array($result, self::$ids)) |
|
| 346 | + if (!in_array($result, self::$ids)) |
|
| 347 | 347 | { |
| 348 | 348 | self::$ids[] = $result; |
| 349 | 349 | return $result; |
@@ -48,15 +48,15 @@ |
||
| 48 | 48 | ->limitToStringLiterals() |
| 49 | 49 | ->getTokens(); |
| 50 | 50 | |
| 51 | - foreach($tokens as $token) |
|
| 51 | + foreach ($tokens as $token) |
|
| 52 | 52 | { |
| 53 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) |
|
| 53 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) |
|
| 54 | 54 | { |
| 55 | 55 | $this->searchTerms[] = $token; |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - if(empty($this->searchTerms)) |
|
| 59 | + if (empty($this->searchTerms)) |
|
| 60 | 60 | { |
| 61 | 61 | $this->validationResult->makeError( |
| 62 | 62 | t('No search terms found:').' '. |