@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | public function protectContent(string $string, Mailcode_Parser_Safeguard_Placeholder $open, Mailcode_Parser_Safeguard_Placeholder $end) : string |
| 35 | 35 | { |
| 36 | - if(!$end->getCommand() instanceof Mailcode_Commands_Command_End) |
|
| 36 | + if (!$end->getCommand() instanceof Mailcode_Commands_Command_End) |
|
| 37 | 37 | { |
| 38 | 38 | throw new Mailcode_Exception( |
| 39 | 39 | 'Invalid commands nesting', |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | $start = strpos($string, $open->getReplacementText()) + $open->getReplacementLength(); |
| 46 | 46 | $end = strpos($string, $end->getReplacementText()); |
| 47 | 47 | |
| 48 | - $content = substr($string, $start, ($end-$start)); |
|
| 48 | + $content = substr($string, $start, ($end - $start)); |
|
| 49 | 49 | |
| 50 | 50 | return $this->replaceContent($string, $content); |
| 51 | 51 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | private function validate() : OperationResult |
| 46 | 46 | { |
| 47 | - if(empty($this->delimiter)) |
|
| 47 | + if (empty($this->delimiter)) |
|
| 48 | 48 | { |
| 49 | 49 | return $this->makeError( |
| 50 | 50 | 'Delimiters may not be empty.', |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | ); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - if(strlen($this->delimiter) < 2) |
|
| 55 | + if (strlen($this->delimiter) < 2) |
|
| 56 | 56 | { |
| 57 | 57 | return $this->makeError( |
| 58 | 58 | 'The delimiter must have at least 2 characters in length.', |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $encoded = urlencode($this->delimiter); |
| 64 | 64 | |
| 65 | - if($encoded !== $this->delimiter) |
|
| 65 | + if ($encoded !== $this->delimiter) |
|
| 66 | 66 | { |
| 67 | 67 | return $this->makeError( |
| 68 | 68 | 'The delimiter is not URL encoding neutral: it must not be modified by a urlencode() call.', |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | public function throwExceptionIfInvalid() : void |
| 77 | 77 | { |
| 78 | - if($this->isValid()) { |
|
| 78 | + if ($this->isValid()) { |
|
| 79 | 79 | return; |
| 80 | 80 | } |
| 81 | 81 | |
@@ -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. |
@@ -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 | } |
@@ -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(), |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | |
| 31 | 31 | protected function validateSyntax_type_unsupported() : void |
| 32 | 32 | { |
| 33 | - if($this->supportsType() || empty($this->type)) |
|
| 33 | + if ($this->supportsType() || empty($this->type)) |
|
| 34 | 34 | { |
| 35 | 35 | return; |
| 36 | 36 | } |
@@ -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 date(string $variableName, string $formatString="") : Mailcode_Commands_Command_ShowDate |
|
| 44 | + public function date(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 number(string $variableName, string $formatString="") : Mailcode_Commands_Command_ShowNumber |
|
| 78 | + public function number(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 | } |