@@ -11,7 +11,7 @@ |
||
11 | 11 | $matches = array(); |
12 | 12 | preg_match_all('/-*[0-9]+\s*[.,]\s*[0-9]+|-*[0-9]+/sx', $this->tokenized, $matches, PREG_PATTERN_ORDER); |
13 | 13 | |
14 | - foreach($matches[0] as $match) |
|
14 | + foreach ($matches[0] as $match) |
|
15 | 15 | { |
16 | 16 | $this->registerToken('Number', $match); |
17 | 17 | } |
@@ -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. |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function addCommand(Mailcode_Commands_Command $command) : Mailcode_Collection |
55 | 55 | { |
56 | - if($this->finalized) |
|
56 | + if ($this->finalized) |
|
57 | 57 | { |
58 | 58 | throw new Mailcode_Exception( |
59 | 59 | 'Cannot add commands to a finalized collection', |
@@ -112,9 +112,9 @@ discard block |
||
112 | 112 | { |
113 | 113 | $keep = array(); |
114 | 114 | |
115 | - foreach($this->commands as $existing) |
|
115 | + foreach ($this->commands as $existing) |
|
116 | 116 | { |
117 | - if($existing !== $command) |
|
117 | + if ($existing !== $command) |
|
118 | 118 | { |
119 | 119 | $keep[] = $existing; |
120 | 120 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | $errors = $this->errors; |
134 | 134 | |
135 | - if(!$result->isValid()) |
|
135 | + if (!$result->isValid()) |
|
136 | 136 | { |
137 | 137 | $errors[] = new Mailcode_Collection_Error_Message( |
138 | 138 | '', |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | { |
149 | 149 | $errors = $this->getErrors(); |
150 | 150 | |
151 | - if(!empty($errors)) |
|
151 | + if (!empty($errors)) |
|
152 | 152 | { |
153 | 153 | return array_shift($errors); |
154 | 154 | } |
@@ -190,11 +190,11 @@ discard block |
||
190 | 190 | { |
191 | 191 | $hashes = array(); |
192 | 192 | |
193 | - foreach($this->commands as $command) |
|
193 | + foreach ($this->commands as $command) |
|
194 | 194 | { |
195 | 195 | $hash = $command->getHash(); |
196 | 196 | |
197 | - if(!isset($hashes[$hash])) |
|
197 | + if (!isset($hashes[$hash])) |
|
198 | 198 | { |
199 | 199 | $hashes[$hash] = $command; |
200 | 200 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | */ |
212 | 212 | public function addCommands(array $commands) : Mailcode_Collection |
213 | 213 | { |
214 | - foreach($commands as $command) |
|
214 | + foreach ($commands as $command) |
|
215 | 215 | { |
216 | 216 | $this->addCommand($command); |
217 | 217 | } |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | { |
233 | 233 | $collection = new Mailcode_Variables_Collection_Regular(); |
234 | 234 | |
235 | - foreach($this->commands as $command) |
|
235 | + foreach ($this->commands as $command) |
|
236 | 236 | { |
237 | 237 | $collection->mergeWith($command->getVariables()); |
238 | 238 | } |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | |
243 | 243 | public function getValidationResult() : OperationResult |
244 | 244 | { |
245 | - if($this->validationResult instanceof OperationResult) |
|
245 | + if ($this->validationResult instanceof OperationResult) |
|
246 | 246 | { |
247 | 247 | return $this->validationResult; |
248 | 248 | } |
@@ -258,9 +258,9 @@ discard block |
||
258 | 258 | { |
259 | 259 | $errors = $this->getErrors(); |
260 | 260 | |
261 | - foreach($errors as $error) |
|
261 | + foreach ($errors as $error) |
|
262 | 262 | { |
263 | - if($error->getCode() === $code) |
|
263 | + if ($error->getCode() === $code) |
|
264 | 264 | { |
265 | 265 | return true; |
266 | 266 | } |
@@ -316,9 +316,9 @@ discard block |
||
316 | 316 | { |
317 | 317 | $result = array(); |
318 | 318 | |
319 | - foreach($this->commands as $command) |
|
319 | + foreach ($this->commands as $command) |
|
320 | 320 | { |
321 | - if($command instanceof $className) |
|
321 | + if ($command instanceof $className) |
|
322 | 322 | { |
323 | 323 | $result[] = $command; |
324 | 324 | } |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | { |
332 | 332 | $commands = $this->getCommands(); |
333 | 333 | |
334 | - if(!empty($commands)) |
|
334 | + if (!empty($commands)) |
|
335 | 335 | { |
336 | 336 | return array_shift($commands); |
337 | 337 | } |
@@ -353,11 +353,11 @@ discard block |
||
353 | 353 | |
354 | 354 | private function validateNesting() : void |
355 | 355 | { |
356 | - foreach($this->commands as $command) |
|
356 | + foreach ($this->commands as $command) |
|
357 | 357 | { |
358 | 358 | $command->validateNesting(); |
359 | 359 | |
360 | - if(!$command->isValid()) { |
|
360 | + if (!$command->isValid()) { |
|
361 | 361 | $this->addInvalidCommand($command); |
362 | 362 | } |
363 | 363 | } |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | const ERROR_CANNOT_RETRIEVE_FIRST_ERROR = 52301; |
26 | 26 | const ERROR_CANNOT_MODIFY_FINALIZED = 52302; |
27 | 27 | |
28 | - /** |
|
29 | - * @var Mailcode_Commands_Command[] |
|
30 | - */ |
|
28 | + /** |
|
29 | + * @var Mailcode_Commands_Command[] |
|
30 | + */ |
|
31 | 31 | protected $commands = array(); |
32 | 32 | |
33 | 33 | /** |
@@ -35,9 +35,9 @@ discard block |
||
35 | 35 | */ |
36 | 36 | protected $errors = array(); |
37 | 37 | |
38 | - /** |
|
39 | - * @var OperationResult|NULL |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @var OperationResult|NULL |
|
40 | + */ |
|
41 | 41 | protected $validationResult; |
42 | 42 | |
43 | 43 | /** |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | private $finalized = false; |
47 | 47 | |
48 | 48 | /** |
49 | - * Adds a command to the collection. |
|
50 | - * |
|
51 | - * @param Mailcode_Commands_Command $command |
|
52 | - * @return Mailcode_Collection |
|
53 | - */ |
|
49 | + * Adds a command to the collection. |
|
50 | + * |
|
51 | + * @param Mailcode_Commands_Command $command |
|
52 | + * @return Mailcode_Collection |
|
53 | + */ |
|
54 | 54 | public function addCommand(Mailcode_Commands_Command $command) : Mailcode_Collection |
55 | 55 | { |
56 | 56 | if($this->finalized) |
@@ -71,21 +71,21 @@ discard block |
||
71 | 71 | return $this; |
72 | 72 | } |
73 | 73 | |
74 | - /** |
|
75 | - * Whether there are any commands in the collection. |
|
76 | - * |
|
77 | - * @return bool |
|
78 | - */ |
|
74 | + /** |
|
75 | + * Whether there are any commands in the collection. |
|
76 | + * |
|
77 | + * @return bool |
|
78 | + */ |
|
79 | 79 | public function hasCommands() : bool |
80 | 80 | { |
81 | 81 | return !empty($this->commands); |
82 | 82 | } |
83 | 83 | |
84 | - /** |
|
85 | - * Counts the amount of commands in the collection. |
|
86 | - * |
|
87 | - * @return int |
|
88 | - */ |
|
84 | + /** |
|
85 | + * Counts the amount of commands in the collection. |
|
86 | + * |
|
87 | + * @return int |
|
88 | + */ |
|
89 | 89 | public function countCommands() : int |
90 | 90 | { |
91 | 91 | return count($this->commands); |
@@ -123,9 +123,9 @@ discard block |
||
123 | 123 | $this->commands = $keep; |
124 | 124 | } |
125 | 125 | |
126 | - /** |
|
127 | - * @return Mailcode_Collection_Error[] |
|
128 | - */ |
|
126 | + /** |
|
127 | + * @return Mailcode_Collection_Error[] |
|
128 | + */ |
|
129 | 129 | public function getErrors() |
130 | 130 | { |
131 | 131 | $result = $this->getValidationResult(); |
@@ -167,25 +167,25 @@ discard block |
||
167 | 167 | return empty($errors); |
168 | 168 | } |
169 | 169 | |
170 | - /** |
|
171 | - * Retrieves all commands that were detected, in the exact order |
|
172 | - * they were found. |
|
173 | - * |
|
174 | - * @return \Mailcode\Mailcode_Commands_Command[] |
|
175 | - */ |
|
170 | + /** |
|
171 | + * Retrieves all commands that were detected, in the exact order |
|
172 | + * they were found. |
|
173 | + * |
|
174 | + * @return \Mailcode\Mailcode_Commands_Command[] |
|
175 | + */ |
|
176 | 176 | public function getCommands() |
177 | 177 | { |
178 | - return $this->commands; |
|
178 | + return $this->commands; |
|
179 | 179 | } |
180 | 180 | |
181 | - /** |
|
182 | - * Retrieves all unique commands by their matched |
|
183 | - * string hash: this ensures only commands that were |
|
184 | - * written the exact same way (including spacing) |
|
185 | - * are returned. |
|
186 | - * |
|
187 | - * @return \Mailcode\Mailcode_Commands_Command[] |
|
188 | - */ |
|
181 | + /** |
|
182 | + * Retrieves all unique commands by their matched |
|
183 | + * string hash: this ensures only commands that were |
|
184 | + * written the exact same way (including spacing) |
|
185 | + * are returned. |
|
186 | + * |
|
187 | + * @return \Mailcode\Mailcode_Commands_Command[] |
|
188 | + */ |
|
189 | 189 | public function getGroupedByHash() |
190 | 190 | { |
191 | 191 | $hashes = array(); |
@@ -203,12 +203,12 @@ discard block |
||
203 | 203 | return array_values($hashes); |
204 | 204 | } |
205 | 205 | |
206 | - /** |
|
207 | - * Adds several commands at once. |
|
208 | - * |
|
209 | - * @param Mailcode_Commands_Command[] $commands |
|
210 | - * @return Mailcode_Collection |
|
211 | - */ |
|
206 | + /** |
|
207 | + * Adds several commands at once. |
|
208 | + * |
|
209 | + * @param Mailcode_Commands_Command[] $commands |
|
210 | + * @return Mailcode_Collection |
|
211 | + */ |
|
212 | 212 | public function addCommands(array $commands) : Mailcode_Collection |
213 | 213 | { |
214 | 214 | foreach($commands as $command) |
@@ -293,10 +293,10 @@ discard block |
||
293 | 293 | } |
294 | 294 | |
295 | 295 | /** |
296 | - * Retrieves only show variable commands in the collection, if any. |
|
297 | - * |
|
298 | - * @return Mailcode_Commands_Command_ShowVariable[] |
|
299 | - */ |
|
296 | + * Retrieves only show variable commands in the collection, if any. |
|
297 | + * |
|
298 | + * @return Mailcode_Commands_Command_ShowVariable[] |
|
299 | + */ |
|
300 | 300 | public function getShowVariableCommands(): array |
301 | 301 | { |
302 | 302 | return $this->getCommandsByClass(Mailcode_Commands_Command_ShowVariable::class); |
@@ -310,11 +310,11 @@ discard block |
||
310 | 310 | return $this->getCommandsByClass(Mailcode_Commands_Command_For::class); |
311 | 311 | } |
312 | 312 | |
313 | - /** |
|
314 | - * Retrieves only show date commands in the collection, if any. |
|
315 | - * |
|
316 | - * @return Mailcode_Commands_Command_ShowDate[] |
|
317 | - */ |
|
313 | + /** |
|
314 | + * Retrieves only show date commands in the collection, if any. |
|
315 | + * |
|
316 | + * @return Mailcode_Commands_Command_ShowDate[] |
|
317 | + */ |
|
318 | 318 | public function getShowDateCommands() : array |
319 | 319 | { |
320 | 320 | return $this->getCommandsByClass(Mailcode_Commands_Command_ShowDate::class); |
@@ -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 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | $this->instantiator->checkCommand($cmd); |
36 | 36 | |
37 | - if($cmd instanceof Mailcode_Commands_Command_Comment) |
|
37 | + if ($cmd instanceof Mailcode_Commands_Command_Comment) |
|
38 | 38 | { |
39 | 39 | return $cmd; |
40 | 40 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | throw $this->instantiator->exceptionUnexpectedType('Comment', $cmd); |
43 | 43 | } |
44 | 44 | |
45 | - public function for(string $sourceVariable, string $loopVariable) : Mailcode_Commands_Command_For |
|
45 | + public function for (string $sourceVariable, string $loopVariable) : Mailcode_Commands_Command_For |
|
46 | 46 | { |
47 | 47 | $sourceVariable = '$'.ltrim($sourceVariable, '$'); |
48 | 48 | $loopVariable = '$'.ltrim($loopVariable, '$'); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | $this->instantiator->checkCommand($cmd); |
66 | 66 | |
67 | - if($cmd instanceof Mailcode_Commands_Command_For) |
|
67 | + if ($cmd instanceof Mailcode_Commands_Command_For) |
|
68 | 68 | { |
69 | 69 | return $cmd; |
70 | 70 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | $this->instantiator->checkCommand($cmd); |
85 | 85 | |
86 | - if($cmd instanceof Mailcode_Commands_Command_Break) |
|
86 | + if ($cmd instanceof Mailcode_Commands_Command_Break) |
|
87 | 87 | { |
88 | 88 | return $cmd; |
89 | 89 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | $this->instantiator->checkCommand($cmd); |
110 | 110 | |
111 | - if($cmd instanceof Mailcode_Commands_Command_Code) |
|
111 | + if ($cmd instanceof Mailcode_Commands_Command_Code) |
|
112 | 112 | { |
113 | 113 | return $cmd; |
114 | 114 | } |
@@ -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).' '. |