@@ -71,9 +71,9 @@ discard block |
||
71 | 71 | |
72 | 72 | private function parse() : void |
73 | 73 | { |
74 | - foreach($this->names as $name) |
|
74 | + foreach ($this->names as $name) |
|
75 | 75 | { |
76 | - if(!stristr($this->paramsString, $name)) |
|
76 | + if (!stristr($this->paramsString, $name)) |
|
77 | 77 | { |
78 | 78 | continue; |
79 | 79 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $names = $this->getDetectedNames(); |
91 | 91 | $amount = count($names); |
92 | 92 | |
93 | - if($amount > 1) |
|
93 | + if ($amount > 1) |
|
94 | 94 | { |
95 | 95 | $this->makeError( |
96 | 96 | t( |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | |
111 | 111 | private function splitParams() : void |
112 | 112 | { |
113 | - if(empty($this->keywords)) |
|
113 | + if (empty($this->keywords)) |
|
114 | 114 | { |
115 | 115 | $this->mainParams = $this->paramsString; |
116 | 116 | |
@@ -119,13 +119,13 @@ discard block |
||
119 | 119 | |
120 | 120 | $params = $this->detectParameters(); |
121 | 121 | |
122 | - foreach($this->keywords as $keyword) |
|
122 | + foreach ($this->keywords as $keyword) |
|
123 | 123 | { |
124 | 124 | $kParams = (string)array_shift($params); |
125 | 125 | |
126 | 126 | $keyword->setParamsString($kParams); |
127 | 127 | |
128 | - if(!$keyword->isValid()) |
|
128 | + if (!$keyword->isValid()) |
|
129 | 129 | { |
130 | 130 | $this->makeError( |
131 | 131 | t('Error #%1$s:', $keyword->getCode()).' '.$keyword->getErrorMessage(), |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | $params = $this->paramsString; |
146 | 146 | $stack = array(); |
147 | 147 | |
148 | - foreach($this->keywords as $keyword) |
|
148 | + foreach ($this->keywords as $keyword) |
|
149 | 149 | { |
150 | 150 | $params = $this->detectParamsKeyword($params, $keyword, $stack); |
151 | 151 | } |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $search = $keyword->getMatchedString(); |
170 | 170 | $pos = strpos($params, $search, 0); |
171 | 171 | |
172 | - if($pos === false) |
|
172 | + if ($pos === false) |
|
173 | 173 | { |
174 | 174 | throw new Mailcode_Exception( |
175 | 175 | 'Keyword matched string not found', |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | $length = strlen($search); |
182 | 182 | |
183 | 183 | $store = substr($params, 0, $pos); |
184 | - $params = trim(substr($params, $pos+$length)); |
|
184 | + $params = trim(substr($params, $pos + $length)); |
|
185 | 185 | |
186 | 186 | $stack[] = $store; |
187 | 187 | |
@@ -208,11 +208,11 @@ discard block |
||
208 | 208 | { |
209 | 209 | $names = array(); |
210 | 210 | |
211 | - foreach($this->keywords as $keyword) |
|
211 | + foreach ($this->keywords as $keyword) |
|
212 | 212 | { |
213 | 213 | $name = $keyword->getName(); |
214 | 214 | |
215 | - if(!in_array($name, $names)) |
|
215 | + if (!in_array($name, $names)) |
|
216 | 216 | { |
217 | 217 | $names[] = $name; |
218 | 218 | } |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | $matches = array(); |
246 | 246 | preg_match_all($regex, $this->paramsString, $matches, PREG_PATTERN_ORDER); |
247 | 247 | |
248 | - if(!isset($matches[0][0]) || empty($matches[0][0])) |
|
248 | + if (!isset($matches[0][0]) || empty($matches[0][0])) |
|
249 | 249 | { |
250 | 250 | return array(); |
251 | 251 | } |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | $amount = count($matches[0]); |
254 | 254 | $result = array(); |
255 | 255 | |
256 | - for($i=0; $i < $amount; $i++) |
|
256 | + for ($i = 0; $i < $amount; $i++) |
|
257 | 257 | { |
258 | 258 | $result[] = $this->createKeyword( |
259 | 259 | $name, |
@@ -270,22 +270,22 @@ discard block |
||
270 | 270 | return !empty($this->keywords); |
271 | 271 | } |
272 | 272 | |
273 | - public function appendAND(string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword |
|
273 | + public function appendAND(string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword |
|
274 | 274 | { |
275 | 275 | return $this->appendKeyword('and', $paramsString, $type); |
276 | 276 | } |
277 | 277 | |
278 | - public function appendOR(string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword |
|
278 | + public function appendOR(string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword |
|
279 | 279 | { |
280 | 280 | return $this->appendKeyword('or', $paramsString, $type); |
281 | 281 | } |
282 | 282 | |
283 | - public function appendKeyword(string $name, string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword |
|
283 | + public function appendKeyword(string $name, string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword |
|
284 | 284 | { |
285 | 285 | $keyword = $this->createKeyword($name, $type); |
286 | 286 | $keyword->setParamsString($paramsString); |
287 | 287 | |
288 | - if(!$keyword->isValid()) |
|
288 | + if (!$keyword->isValid()) |
|
289 | 289 | { |
290 | 290 | throw new Mailcode_Exception( |
291 | 291 | 'Cannot append invalid logic keyword', |
@@ -306,13 +306,13 @@ discard block |
||
306 | 306 | return $keyword; |
307 | 307 | } |
308 | 308 | |
309 | - private function createKeyword(string $name, string $type='', string $matchedString='') : Mailcode_Commands_LogicKeywords_Keyword |
|
309 | + private function createKeyword(string $name, string $type = '', string $matchedString = '') : Mailcode_Commands_LogicKeywords_Keyword |
|
310 | 310 | { |
311 | - if(empty($matchedString)) |
|
311 | + if (empty($matchedString)) |
|
312 | 312 | { |
313 | 313 | $matchedString = $name; |
314 | 314 | |
315 | - if(!empty($type)) |
|
315 | + if (!empty($type)) |
|
316 | 316 | { |
317 | 317 | $matchedString .= ' '.$type; |
318 | 318 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function addCommand(Mailcode_Commands_Command $command) : Mailcode_Collection |
47 | 47 | { |
48 | - if($this->finalized) |
|
48 | + if ($this->finalized) |
|
49 | 49 | { |
50 | 50 | throw new Mailcode_Exception( |
51 | 51 | 'Cannot add commands to a finalized collection', |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | { |
88 | 88 | $keep = array(); |
89 | 89 | |
90 | - foreach($this->commands as $existing) |
|
90 | + foreach ($this->commands as $existing) |
|
91 | 91 | { |
92 | - if($existing !== $command) |
|
92 | + if ($existing !== $command) |
|
93 | 93 | { |
94 | 94 | $keep[] = $existing; |
95 | 95 | } |
@@ -126,11 +126,11 @@ discard block |
||
126 | 126 | |
127 | 127 | $hashes = array(); |
128 | 128 | |
129 | - foreach($this->commands as $command) |
|
129 | + foreach ($this->commands as $command) |
|
130 | 130 | { |
131 | 131 | $hash = $command->getHash(); |
132 | 132 | |
133 | - if(!isset($hashes[$hash])) |
|
133 | + if (!isset($hashes[$hash])) |
|
134 | 134 | { |
135 | 135 | $hashes[$hash] = $command; |
136 | 136 | } |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | */ |
149 | 149 | public function addCommands(array $commands) : Mailcode_Collection |
150 | 150 | { |
151 | - foreach($commands as $command) |
|
151 | + foreach ($commands as $command) |
|
152 | 152 | { |
153 | 153 | $this->addCommand($command); |
154 | 154 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | |
172 | 172 | $collection = new Mailcode_Variables_Collection_Regular(); |
173 | 173 | |
174 | - foreach($this->commands as $command) |
|
174 | + foreach ($this->commands as $command) |
|
175 | 175 | { |
176 | 176 | $collection->mergeWith($command->getVariables()); |
177 | 177 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | { |
212 | 212 | $this->validate(); |
213 | 213 | |
214 | - if(isset($this->validationResult)) |
|
214 | + if (isset($this->validationResult)) |
|
215 | 215 | { |
216 | 216 | return $this->validationResult; |
217 | 217 | } |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | |
226 | 226 | private function validate() : void |
227 | 227 | { |
228 | - if(isset($this->validationResult) || $this->validating) |
|
228 | + if (isset($this->validationResult) || $this->validating) |
|
229 | 229 | { |
230 | 230 | return; |
231 | 231 | } |
@@ -245,9 +245,9 @@ discard block |
||
245 | 245 | { |
246 | 246 | $errors = $this->getErrors(); |
247 | 247 | |
248 | - foreach($errors as $error) |
|
248 | + foreach ($errors as $error) |
|
249 | 249 | { |
250 | - if($error->getCode() === $code) |
|
250 | + if ($error->getCode() === $code) |
|
251 | 251 | { |
252 | 252 | return true; |
253 | 253 | } |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | |
283 | 283 | $errors = $this->errors; |
284 | 284 | |
285 | - if(!$result->isValid()) |
|
285 | + if (!$result->isValid()) |
|
286 | 286 | { |
287 | 287 | $errors[] = new Mailcode_Collection_Error_Message( |
288 | 288 | '', |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | { |
299 | 299 | $errors = $this->getErrors(); |
300 | 300 | |
301 | - if(!empty($errors)) |
|
301 | + if (!empty($errors)) |
|
302 | 302 | { |
303 | 303 | return array_shift($errors); |
304 | 304 | } |
@@ -319,11 +319,11 @@ discard block |
||
319 | 319 | |
320 | 320 | private function validateNesting() : void |
321 | 321 | { |
322 | - foreach($this->commands as $command) |
|
322 | + foreach ($this->commands as $command) |
|
323 | 323 | { |
324 | 324 | $command->validateNesting(); |
325 | 325 | |
326 | - if(!$command->isValid()) { |
|
326 | + if (!$command->isValid()) { |
|
327 | 327 | $this->addInvalidCommand($command); |
328 | 328 | } |
329 | 329 | } |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | { |
401 | 401 | $commands = $this->getCommands(); |
402 | 402 | |
403 | - if(!empty($commands)) |
|
403 | + if (!empty($commands)) |
|
404 | 404 | { |
405 | 405 | return array_shift($commands); |
406 | 406 | } |
@@ -432,16 +432,16 @@ discard block |
||
432 | 432 | */ |
433 | 433 | private function pruneProtectedContentCommands() : void |
434 | 434 | { |
435 | - if(!$this->isValid()) |
|
435 | + if (!$this->isValid()) |
|
436 | 436 | { |
437 | 437 | return; |
438 | 438 | } |
439 | 439 | |
440 | 440 | $keep = array(); |
441 | 441 | |
442 | - foreach($this->commands as $command) |
|
442 | + foreach ($this->commands as $command) |
|
443 | 443 | { |
444 | - if(!$command->hasContentParent()) |
|
444 | + if (!$command->hasContentParent()) |
|
445 | 445 | { |
446 | 446 | $keep[] = $command; |
447 | 447 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | { |
9 | 9 | public const VALIDATION_NAME_NOHTML = 'nohtml'; |
10 | 10 | |
11 | - public function setHTMLEnabled(bool $enabled=true) : self; |
|
11 | + public function setHTMLEnabled(bool $enabled = true) : self; |
|
12 | 12 | |
13 | 13 | public function isHTMLEnabled() : bool; |
14 | 14 |