@@ -12,7 +12,7 @@ |
||
12 | 12 | $autoload = realpath($root.'/../vendor/autoload.php'); |
13 | 13 | |
14 | 14 | // we need the autoloader to be present |
15 | - if($autoload === false) |
|
15 | + if ($autoload === false) |
|
16 | 16 | { |
17 | 17 | die('<b>ERROR:</b> Autoloader not present. Run composer update first.'); |
18 | 18 | } |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | public function getReplacementText() : string |
66 | 66 | { |
67 | - if(!empty($this->replacement)) |
|
67 | + if (!empty($this->replacement)) |
|
68 | 68 | { |
69 | 69 | return $this->replacement; |
70 | 70 | } |
@@ -82,13 +82,13 @@ discard block |
||
82 | 82 | // to total amount of zeroes to pad with to obtain the total length |
83 | 83 | $padLength = $this->getLength() - $length; |
84 | 84 | |
85 | - if($padLength < 0) |
|
85 | + if ($padLength < 0) |
|
86 | 86 | { |
87 | 87 | $padLength = 0; |
88 | 88 | } |
89 | 89 | |
90 | 90 | // create the zero-padded ID to fill the format string with |
91 | - $paddedID = str_pad((string)$this->id, $padLength, '0'); |
|
91 | + $paddedID = str_pad((string)$this->id, $padLength, '0'); |
|
92 | 92 | |
93 | 93 | $this->replacement = sprintf($format, $paddedID); |
94 | 94 |
@@ -141,13 +141,11 @@ |
||
141 | 141 | if(!empty($matches[1][$index])) |
142 | 142 | { |
143 | 143 | $name = $matches[1][$index]; |
144 | - } |
|
145 | - else if(!empty($matches[2][$index])) |
|
144 | + } else if(!empty($matches[2][$index])) |
|
146 | 145 | { |
147 | 146 | $name = $matches[2][$index]; |
148 | 147 | $params = $matches[3][$index]; |
149 | - } |
|
150 | - else if(!empty($matches[4][$index])) |
|
148 | + } else if(!empty($matches[4][$index])) |
|
151 | 149 | { |
152 | 150 | $name = $matches[4][$index]; |
153 | 151 | $type = $matches[5][$index]; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | |
74 | 74 | $total = count($matches[0]); |
75 | 75 | |
76 | - for($i=0; $i < $total; $i++) |
|
76 | + for ($i = 0; $i < $total; $i++) |
|
77 | 77 | { |
78 | 78 | $match = $this->parseMatch($matches, $i); |
79 | 79 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | protected function prepareString(string $subject) : string |
87 | 87 | { |
88 | - if(!ConvertHelper::isStringHTML($subject)) |
|
88 | + if (!ConvertHelper::isStringHTML($subject)) |
|
89 | 89 | { |
90 | 90 | return $subject; |
91 | 91 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | { |
107 | 107 | $name = $match->getName(); |
108 | 108 | |
109 | - if(!$this->commands->nameExists($name)) |
|
109 | + if (!$this->commands->nameExists($name)) |
|
110 | 110 | { |
111 | 111 | $collection->addErrorMessage( |
112 | 112 | $match->getMatchedString(), |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $match->getMatchedString() |
124 | 124 | ); |
125 | 125 | |
126 | - if($cmd->isValid()) |
|
126 | + if ($cmd->isValid()) |
|
127 | 127 | { |
128 | 128 | $collection->addCommand($cmd); |
129 | 129 | return; |
@@ -153,16 +153,16 @@ discard block |
||
153 | 153 | // 5 = parameter type command, type |
154 | 154 | // 6 = parameter type command, params |
155 | 155 | |
156 | - if(!empty($matches[1][$index])) |
|
156 | + if (!empty($matches[1][$index])) |
|
157 | 157 | { |
158 | 158 | $name = $matches[1][$index]; |
159 | 159 | } |
160 | - else if(!empty($matches[2][$index])) |
|
160 | + else if (!empty($matches[2][$index])) |
|
161 | 161 | { |
162 | 162 | $name = $matches[2][$index]; |
163 | 163 | $params = $matches[3][$index]; |
164 | 164 | } |
165 | - else if(!empty($matches[4][$index])) |
|
165 | + else if (!empty($matches[4][$index])) |
|
166 | 166 | { |
167 | 167 | $name = $matches[4][$index]; |
168 | 168 | $type = $matches[5][$index]; |
@@ -158,8 +158,7 @@ |
||
158 | 158 | if($highlighted) |
159 | 159 | { |
160 | 160 | $replace = $placeholder->getHighlightedText(); |
161 | - } |
|
162 | - else |
|
161 | + } else |
|
163 | 162 | { |
164 | 163 | $replace = $placeholder->getOriginalText(); |
165 | 164 | } |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | */ |
135 | 135 | public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard |
136 | 136 | { |
137 | - if(empty($delimiter)) |
|
137 | + if (empty($delimiter)) |
|
138 | 138 | { |
139 | 139 | throw new Mailcode_Exception( |
140 | 140 | 'Empty delimiter', |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | $safe = str_replace(array_values($replaces), array_keys($replaces), $this->originalString); |
172 | 172 | |
173 | 173 | // If a formatter has been selected, let it modify the string. |
174 | - if(isset($this->formatter)) |
|
174 | + if (isset($this->formatter)) |
|
175 | 175 | { |
176 | 176 | $safe = $this->formatter->format($safe); |
177 | 177 | } |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | { |
184 | 184 | $class = 'Mailcode\Mailcode_Parser_Safeguard_Formatter_'.$formatterID; |
185 | 185 | |
186 | - if(class_exists($class)) |
|
186 | + if (class_exists($class)) |
|
187 | 187 | { |
188 | 188 | $this->formatter = new $class($this); |
189 | 189 | |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | { |
210 | 210 | $formatter = $this->selectFormatter('SingleLines'); |
211 | 211 | |
212 | - if($formatter instanceof Mailcode_Parser_Safeguard_Formatter_SingleLines) |
|
212 | + if ($formatter instanceof Mailcode_Parser_Safeguard_Formatter_SingleLines) |
|
213 | 213 | { |
214 | 214 | return $formatter; |
215 | 215 | } |
@@ -231,17 +231,17 @@ discard block |
||
231 | 231 | * @param bool $highlighted |
232 | 232 | * @return string[]string |
233 | 233 | */ |
234 | - protected function getReplaces(bool $highlighted=false) : array |
|
234 | + protected function getReplaces(bool $highlighted = false) : array |
|
235 | 235 | { |
236 | 236 | $placeholders = $this->getPlaceholders(); |
237 | 237 | |
238 | 238 | $replaces = array(); |
239 | 239 | |
240 | - foreach($placeholders as $placeholder) |
|
240 | + foreach ($placeholders as $placeholder) |
|
241 | 241 | { |
242 | 242 | $replace = ''; |
243 | 243 | |
244 | - if($highlighted) |
|
244 | + if ($highlighted) |
|
245 | 245 | { |
246 | 246 | $replace = $placeholder->getHighlightedText(); |
247 | 247 | } |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | */ |
266 | 266 | public function getPlaceholders() |
267 | 267 | { |
268 | - if(isset($this->placeholders)) |
|
268 | + if (isset($this->placeholders)) |
|
269 | 269 | { |
270 | 270 | return $this->placeholders; |
271 | 271 | } |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | |
275 | 275 | $cmds = $this->getCollection()->getGroupedByHash(); |
276 | 276 | |
277 | - foreach($cmds as $command) |
|
277 | + foreach ($cmds as $command) |
|
278 | 278 | { |
279 | 279 | self::$counter++; |
280 | 280 | |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | return $this->placeholders; |
289 | 289 | } |
290 | 290 | |
291 | - protected function restore(string $string, bool $partial=false, bool $highlighted=false) : string |
|
291 | + protected function restore(string $string, bool $partial = false, bool $highlighted = false) : string |
|
292 | 292 | { |
293 | 293 | $this->requireValidCollection(); |
294 | 294 | |
@@ -296,9 +296,9 @@ discard block |
||
296 | 296 | |
297 | 297 | $placeholderStrings = array_keys($replaces); |
298 | 298 | |
299 | - foreach($placeholderStrings as $search) |
|
299 | + foreach ($placeholderStrings as $search) |
|
300 | 300 | { |
301 | - if(!$partial && !strstr($string, $search)) |
|
301 | + if (!$partial && !strstr($string, $search)) |
|
302 | 302 | { |
303 | 303 | throw new Mailcode_Exception( |
304 | 304 | 'Command placeholder not found', |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | */ |
401 | 401 | public function getCollection() : Mailcode_Collection |
402 | 402 | { |
403 | - if(isset($this->collection)) |
|
403 | + if (isset($this->collection)) |
|
404 | 404 | { |
405 | 405 | return $this->collection; |
406 | 406 | } |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | */ |
423 | 423 | protected function requireValidCollection() : void |
424 | 424 | { |
425 | - if($this->getCollection()->isValid()) |
|
425 | + if ($this->getCollection()->isValid()) |
|
426 | 426 | { |
427 | 427 | return; |
428 | 428 | } |
@@ -445,7 +445,7 @@ discard block |
||
445 | 445 | */ |
446 | 446 | public function getPlaceholderStrings() : array |
447 | 447 | { |
448 | - if(is_array($this->placeholderStrings)) |
|
448 | + if (is_array($this->placeholderStrings)) |
|
449 | 449 | { |
450 | 450 | return $this->placeholderStrings; |
451 | 451 | } |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | |
455 | 455 | $this->placeholderStrings = array(); |
456 | 456 | |
457 | - foreach($placeholders as $placeholder) |
|
457 | + foreach ($placeholders as $placeholder) |
|
458 | 458 | { |
459 | 459 | $this->placeholderStrings[] = $placeholder->getReplacementText(); |
460 | 460 | } |
@@ -480,9 +480,9 @@ discard block |
||
480 | 480 | { |
481 | 481 | $placeholders = $this->getPlaceholders(); |
482 | 482 | |
483 | - foreach($placeholders as $placeholder) |
|
483 | + foreach ($placeholders as $placeholder) |
|
484 | 484 | { |
485 | - if($placeholder->getID() === $id) |
|
485 | + if ($placeholder->getID() === $id) |
|
486 | 486 | { |
487 | 487 | return $placeholder; |
488 | 488 | } |
@@ -509,9 +509,9 @@ discard block |
||
509 | 509 | { |
510 | 510 | $placeholders = $this->getPlaceholders(); |
511 | 511 | |
512 | - foreach($placeholders as $placeholder) |
|
512 | + foreach ($placeholders as $placeholder) |
|
513 | 513 | { |
514 | - if($placeholder->getReplacementText() === $string) |
|
514 | + if ($placeholder->getReplacementText() === $string) |
|
515 | 515 | { |
516 | 516 | return $placeholder; |
517 | 517 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection |
34 | 34 | { |
35 | - if(!$variable->isValid()) |
|
35 | + if (!$variable->isValid()) |
|
36 | 36 | { |
37 | 37 | return $this->addInvalid($variable); |
38 | 38 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | parent::mergeWith($collection); |
77 | 77 | |
78 | 78 | // also inherit any invalid variables |
79 | - if($collection instanceof Mailcode_Variables_Collection_Regular) |
|
79 | + if ($collection instanceof Mailcode_Variables_Collection_Regular) |
|
80 | 80 | { |
81 | 81 | $invalid = $collection->getInvalid(); |
82 | 82 |
@@ -24,7 +24,7 @@ |
||
24 | 24 | { |
25 | 25 | public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection |
26 | 26 | { |
27 | - if($variable->isValid()) |
|
27 | + if ($variable->isValid()) |
|
28 | 28 | { |
29 | 29 | return $this; |
30 | 30 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | */ |
24 | 24 | function init() : void |
25 | 25 | { |
26 | - if(!class_exists('\AppLocalize\Localization')) { |
|
26 | + if (!class_exists('\AppLocalize\Localization')) { |
|
27 | 27 | return; |
28 | 28 | } |
29 | 29 |
@@ -60,11 +60,11 @@ discard block |
||
60 | 60 | |
61 | 61 | $commands = $this->collection->getCommands(); |
62 | 62 | |
63 | - foreach($commands as $command) |
|
63 | + foreach ($commands as $command) |
|
64 | 64 | { |
65 | 65 | $method = 'validate_'.$command->getCommandType(); |
66 | 66 | |
67 | - if(!method_exists($this, $method)) |
|
67 | + if (!method_exists($this, $method)) |
|
68 | 68 | { |
69 | 69 | throw new Mailcode_Exception( |
70 | 70 | 'Unknown command type validation method.', |
@@ -79,13 +79,13 @@ discard block |
||
79 | 79 | |
80 | 80 | $this->$method($command); |
81 | 81 | |
82 | - if(!$this->validationResult->isValid()) |
|
82 | + if (!$this->validationResult->isValid()) |
|
83 | 83 | { |
84 | 84 | break; |
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
88 | - if($this->validationResult->isValid()) |
|
88 | + if ($this->validationResult->isValid()) |
|
89 | 89 | { |
90 | 90 | $this->validate_Unclosed(); |
91 | 91 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | { |
98 | 98 | $leftover = $this->getOpenCommand(); |
99 | 99 | |
100 | - if($leftover === null) |
|
100 | + if ($leftover === null) |
|
101 | 101 | { |
102 | 102 | return; |
103 | 103 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | protected function getOpenCommand() : ?Mailcode_Commands_Command_Type_Opening |
115 | 115 | { |
116 | - if(empty($this->stack)) |
|
116 | + if (empty($this->stack)) |
|
117 | 117 | { |
118 | 118 | return null; |
119 | 119 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | |
125 | 125 | $cmd = $this->stack[$idx]; |
126 | 126 | |
127 | - if($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
|
127 | + if ($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
|
128 | 128 | { |
129 | 129 | return $cmd; |
130 | 130 | } |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | { |
149 | 149 | $parent = $this->getOpenCommand(); |
150 | 150 | |
151 | - if($parent === null) |
|
151 | + if ($parent === null) |
|
152 | 152 | { |
153 | 153 | $this->validationResult->makeError( |
154 | 154 | t( |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | return; |
163 | 163 | } |
164 | 164 | |
165 | - if($parent->getName() !== $command->getParentName()) |
|
165 | + if ($parent->getName() !== $command->getParentName()) |
|
166 | 166 | { |
167 | 167 | $this->validationResult->makeError( |
168 | 168 | t( |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | |
182 | 182 | protected function validate_Closing(Mailcode_Commands_Command_Type_Closing $command) : void |
183 | 183 | { |
184 | - if(empty($this->stack)) |
|
184 | + if (empty($this->stack)) |
|
185 | 185 | { |
186 | 186 | $this->validationResult->makeError( |
187 | 187 | t('All open commands have already been ended.'), |
@@ -62,7 +62,7 @@ |
||
62 | 62 | $keyword = $info->getKeywordByIndex(1); |
63 | 63 | $container = $info->getVariableByIndex(2); |
64 | 64 | |
65 | - if($variable && $keyword && $container && $keyword->isForIn()) |
|
65 | + if ($variable && $keyword && $container && $keyword->isForIn()) |
|
66 | 66 | { |
67 | 67 | return; |
68 | 68 | } |