@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | */ |
73 | 73 | private ?Mailcode_Commands_Command $command; |
74 | 74 | |
75 | - public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) |
|
75 | + public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) |
|
76 | 76 | { |
77 | 77 | $this->path = $path; |
78 | 78 | $this->name = $name; |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | public function getFullName() : string |
97 | 97 | { |
98 | - if(empty($this->path)) |
|
98 | + if (empty($this->path)) |
|
99 | 99 | { |
100 | 100 | return dollarize($this->name); |
101 | 101 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function getUniqueName() : string |
115 | 115 | { |
116 | - if(isset($this->command)) |
|
116 | + if (isset($this->command)) |
|
117 | 117 | { |
118 | 118 | return $this->getFullName().'/'.$this->command->getHash(); |
119 | 119 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | |
139 | 139 | public function getHash() : string |
140 | 140 | { |
141 | - if(empty($this->hash)) |
|
141 | + if (empty($this->hash)) |
|
142 | 142 | { |
143 | 143 | $this->hash = md5($this->matchedText); |
144 | 144 | } |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | */ |
158 | 158 | public function getValidationResult() : OperationResult |
159 | 159 | { |
160 | - if(isset($this->validationResult)) |
|
160 | + if (isset($this->validationResult)) |
|
161 | 161 | { |
162 | 162 | return $this->validationResult; |
163 | 163 | } |
@@ -171,11 +171,11 @@ discard block |
||
171 | 171 | |
172 | 172 | protected function validate(OperationResult $result) : void |
173 | 173 | { |
174 | - foreach($this->validations as $validation) |
|
174 | + foreach ($this->validations as $validation) |
|
175 | 175 | { |
176 | 176 | $method = 'validate_'.$validation; |
177 | 177 | |
178 | - if(!method_exists($this, $method)) |
|
178 | + if (!method_exists($this, $method)) |
|
179 | 179 | { |
180 | 180 | throw new Mailcode_Exception( |
181 | 181 | 'Unknown validation method', |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | |
221 | 221 | protected function validateNumber(string $value, int $errorCode) : void |
222 | 222 | { |
223 | - if(!is_numeric(substr($value, 0, 1))) |
|
223 | + if (!is_numeric(substr($value, 0, 1))) |
|
224 | 224 | { |
225 | 225 | return; |
226 | 226 | } |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | protected function validateUnderscore(string $value, int $errorCode) : void |
239 | 239 | { |
240 | 240 | // allow empty paths |
241 | - if(empty($value)) |
|
241 | + if (empty($value)) |
|
242 | 242 | { |
243 | 243 | return; |
244 | 244 | } |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | $length = strlen($value); |
247 | 247 | |
248 | 248 | // trimming underscores does not change the length: no underscores at start or end of string. |
249 | - if(strlen(trim($value, '_')) === $length) |
|
249 | + if (strlen(trim($value, '_')) === $length) |
|
250 | 250 | { |
251 | 251 | return; |
252 | 252 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function getSign() : string |
86 | 86 | { |
87 | - if($this->isNotContains()) |
|
87 | + if ($this->isNotContains()) |
|
88 | 88 | { |
89 | 89 | return '!'; |
90 | 90 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | public function getConnector() |
103 | 103 | { |
104 | - if($this->isNotContains()) |
|
104 | + if ($this->isNotContains()) |
|
105 | 105 | { |
106 | 106 | return '&&'; |
107 | 107 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | { |
118 | 118 | $parts = array(); |
119 | 119 | |
120 | - foreach($this->searchTerms as $token) |
|
120 | + foreach ($this->searchTerms as $token) |
|
121 | 121 | { |
122 | 122 | $parts[] = $this->renderCommand($token); |
123 | 123 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | */ |
133 | 133 | private function renderCommand(Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral $searchTerm) : string |
134 | 134 | { |
135 | - if($this->isList()) |
|
135 | + if ($this->isList()) |
|
136 | 136 | { |
137 | 137 | $command = $this->renderListCommand($searchTerm); |
138 | 138 | } |
@@ -173,14 +173,14 @@ discard block |
||
173 | 173 | private function renderRegex(Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral $searchTerm) : string |
174 | 174 | { |
175 | 175 | $opts = 's'; |
176 | - if($this->caseSensitive) |
|
176 | + if ($this->caseSensitive) |
|
177 | 177 | { |
178 | 178 | $opts = 'is'; |
179 | 179 | } |
180 | 180 | |
181 | 181 | $filtered = trim($searchTerm->getNormalized(), '"'); |
182 | 182 | |
183 | - if(!$this->regexEnabled) |
|
183 | + if (!$this->regexEnabled) |
|
184 | 184 | { |
185 | 185 | $filtered = $this->translator->filterRegexString($filtered); |
186 | 186 | $filtered = $this->addWildcards($filtered); |
@@ -203,17 +203,17 @@ discard block |
||
203 | 203 | */ |
204 | 204 | private function addWildcards(string $searchTerm) : string |
205 | 205 | { |
206 | - if($this->containsType === 'list-begins-with') |
|
206 | + if ($this->containsType === 'list-begins-with') |
|
207 | 207 | { |
208 | 208 | return $searchTerm.'.*'; |
209 | 209 | } |
210 | 210 | |
211 | - if($this->containsType === 'list-ends-with') |
|
211 | + if ($this->containsType === 'list-ends-with') |
|
212 | 212 | { |
213 | 213 | return '.*'.$searchTerm; |
214 | 214 | } |
215 | 215 | |
216 | - if($this->containsType === 'list-equals') |
|
216 | + if ($this->containsType === 'list-equals') |
|
217 | 217 | { |
218 | 218 | return '\\\A'.$searchTerm.'\\\Z'; |
219 | 219 | } |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | { |
230 | 230 | $tokens = explode('.', undollarize($this->variable->getFullName())); |
231 | 231 | |
232 | - if(count($tokens) === 2) |
|
232 | + if (count($tokens) === 2) |
|
233 | 233 | { |
234 | 234 | return array( |
235 | 235 | 'path' => $tokens[0], |
@@ -29,7 +29,7 @@ |
||
29 | 29 | { |
30 | 30 | $varName = undollarize($command->getVariableName()); |
31 | 31 | |
32 | - if($command->isHTMLEnabled()) |
|
32 | + if ($command->isHTMLEnabled()) |
|
33 | 33 | { |
34 | 34 | $statement = sprintf( |
35 | 35 | '%s.replaceAll($esc.newline, "<br/>")', |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | |
72 | 72 | // All other special characters have to be escaped |
73 | 73 | // with two backslashes. |
74 | - foreach($this->regexSpecialChars as $char) |
|
74 | + foreach ($this->regexSpecialChars as $char) |
|
75 | 75 | { |
76 | 76 | $string = str_replace($char, '\\'.$char, $string); |
77 | 77 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | { |
100 | 100 | $varName = dollarize($varName); |
101 | 101 | |
102 | - if($absolute) |
|
102 | + if ($absolute) |
|
103 | 103 | { |
104 | 104 | $varName = sprintf('${numeric.abs(%s)}', $varName); |
105 | 105 | } |
@@ -34,21 +34,21 @@ discard block |
||
34 | 34 | * @param Mailcode_Commands_Command|null $sourceCommand |
35 | 35 | * @return Mailcode_Variables_Collection_Regular |
36 | 36 | */ |
37 | - public function parseString(string $subject, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Variables_Collection_Regular |
|
37 | + public function parseString(string $subject, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Variables_Collection_Regular |
|
38 | 38 | { |
39 | 39 | $this->collection = new Mailcode_Variables_Collection_Regular(); |
40 | 40 | |
41 | 41 | $matches = array(); |
42 | 42 | preg_match_all(self::REGEX_VARIABLE_NAME, $subject, $matches, PREG_PATTERN_ORDER); |
43 | 43 | |
44 | - if(empty($matches[0])) |
|
44 | + if (empty($matches[0])) |
|
45 | 45 | { |
46 | 46 | return $this->collection; |
47 | 47 | } |
48 | 48 | |
49 | - foreach($matches[0] as $idx => $matchedText) |
|
49 | + foreach ($matches[0] as $idx => $matchedText) |
|
50 | 50 | { |
51 | - if(!empty($matches[3][$idx])) |
|
51 | + if (!empty($matches[3][$idx])) |
|
52 | 52 | { |
53 | 53 | $this->addSingle($matches[3][$idx], $matchedText, $sourceCommand); |
54 | 54 | } |
@@ -61,10 +61,10 @@ discard block |
||
61 | 61 | return $this->collection; |
62 | 62 | } |
63 | 63 | |
64 | - protected function addSingle(string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) : void |
|
64 | + protected function addSingle(string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) : void |
|
65 | 65 | { |
66 | 66 | // ignore US style numbers like $451 |
67 | - if(is_numeric($name)) |
|
67 | + if (is_numeric($name)) |
|
68 | 68 | { |
69 | 69 | return; |
70 | 70 | } |
@@ -72,10 +72,10 @@ discard block |
||
72 | 72 | $this->collection->add(new Mailcode_Variables_Variable('', $name, $matchedText, $sourceCommand)); |
73 | 73 | } |
74 | 74 | |
75 | - protected function addPathed(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) : void |
|
75 | + protected function addPathed(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) : void |
|
76 | 76 | { |
77 | 77 | // ignore US style numbers like $45.12 |
78 | - if(is_numeric($path.'.'.$name)) |
|
78 | + if (is_numeric($path.'.'.$name)) |
|
79 | 79 | { |
80 | 80 | return; |
81 | 81 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | // Split the variable name by the dot |
45 | 45 | $parts = explode('.', undollarize($var->getFullName())); |
46 | 46 | |
47 | - if(count($parts) !== 2) |
|
47 | + if (count($parts) !== 2) |
|
48 | 48 | { |
49 | 49 | $this->validationResult->makeError( |
50 | 50 | t('The variable %1$s is not a list property:', '<code>'.$var->getFullName().'</code>').' '. |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public function getListVariable() : Mailcode_Variables_Variable |
78 | 78 | { |
79 | - if(isset($this->listVariable)) |
|
79 | + if (isset($this->listVariable)) |
|
80 | 80 | { |
81 | 81 | return $this->listVariable; |
82 | 82 | } |
@@ -43,13 +43,13 @@ discard block |
||
43 | 43 | |
44 | 44 | $val = $this->validator->createKeyword(Mailcode_Commands_Keywords::TYPE_BREAK_AT); |
45 | 45 | |
46 | - $this->breakAtEnabled = $val->isValid() && $this->breakAtToken != null;; |
|
46 | + $this->breakAtEnabled = $val->isValid() && $this->breakAtToken != null; ; |
|
47 | 47 | |
48 | 48 | if ($this->breakAtEnabled) { |
49 | 49 | if (!$this->breakAtToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number && |
50 | 50 | !$this->breakAtToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) { |
51 | 51 | $this->validationResult->makeError( |
52 | - t('Invalid break-at type.' . ' ' . 'Expected Number or Variable.'), |
|
52 | + t('Invalid break-at type.'.' '.'Expected Number or Variable.'), |
|
53 | 53 | BreakAtInterface::VALIDATION_BREAK_AT_CODE_WRONG_TYPE |
54 | 54 | ); |
55 | 55 | return; |
@@ -73,19 +73,19 @@ discard block |
||
73 | 73 | public function getBreakAt() |
74 | 74 | { |
75 | 75 | $token = $this->getBreakAtToken(); |
76 | - if($token === null) { |
|
76 | + if ($token === null) { |
|
77 | 77 | return null; |
78 | 78 | } |
79 | 79 | |
80 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) { |
|
80 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) { |
|
81 | 81 | return $token->getVariable(); |
82 | 82 | } |
83 | 83 | |
84 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number) { |
|
84 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number) { |
|
85 | 85 | return (int)$token->getValue(); |
86 | 86 | } |
87 | 87 | |
88 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) { |
|
88 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) { |
|
89 | 89 | return (int)$token->getText(); |
90 | 90 | } |
91 | 91 |
@@ -59,12 +59,12 @@ |
||
59 | 59 | * @throws Mailcode_Exception |
60 | 60 | * @throws Mailcode_Factory_Exception |
61 | 61 | */ |
62 | - public function for(string $sourceVariable, string $loopVariable, $breakAtValue = ''): Mailcode_Commands_Command_For |
|
62 | + public function for (string $sourceVariable, string $loopVariable, $breakAtValue = ''): Mailcode_Commands_Command_For |
|
63 | 63 | { |
64 | 64 | $sourceVariable = dollarize($sourceVariable); |
65 | 65 | $loopVariable = dollarize($loopVariable); |
66 | 66 | |
67 | - if($breakAtValue instanceof Mailcode_Variables_Variable) { |
|
67 | + if ($breakAtValue instanceof Mailcode_Variables_Variable) { |
|
68 | 68 | $breakAtValue = $breakAtValue->getFullName(); |
69 | 69 | } |
70 | 70 |
@@ -28,13 +28,13 @@ |
||
28 | 28 | $commandID = ClassHelper::getClassTypeName(Mailcode_Commands_Command_SetVariable::class); |
29 | 29 | |
30 | 30 | if ($asCount) { |
31 | - $params = $variableName . ' count: ' . $value; |
|
31 | + $params = $variableName.' count: '.$value; |
|
32 | 32 | } else { |
33 | 33 | if ($quoteValue) { |
34 | 34 | $value = $this->instantiator->quoteString($value); |
35 | 35 | } |
36 | 36 | |
37 | - $params = $variableName . ' = ' . $value; |
|
37 | + $params = $variableName.' = '.$value; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $cmd = $this->commands->createCommand( |