@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | { |
30 | 30 | $locations = $this->resolveLocations(); |
31 | 31 | |
32 | - foreach($locations as $location) |
|
32 | + foreach ($locations as $location) |
|
33 | 33 | { |
34 | 34 | $location->replaceWith($this->resolveReplacement($location)); |
35 | 35 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | private function resolveReplacement(Mailcode_Parser_Safeguard_Formatter_Location $location) : string |
48 | 48 | { |
49 | - if($location->requiresAdjustment()) |
|
49 | + if ($location->requiresAdjustment()) |
|
50 | 50 | { |
51 | 51 | return $this->getReplaceString($location); |
52 | 52 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | $instance = new $class($this, $placeholder); |
79 | 79 | |
80 | - if($instance instanceof Mailcode_Parser_Safeguard_Formatter_Location) |
|
80 | + if ($instance instanceof Mailcode_Parser_Safeguard_Formatter_Location) |
|
81 | 81 | { |
82 | 82 | return $instance; |
83 | 83 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | $result = array(); |
107 | 107 | |
108 | - foreach($placeholders as $placeholder) |
|
108 | + foreach ($placeholders as $placeholder) |
|
109 | 109 | { |
110 | 110 | $result[] = $this->createLocation($placeholder); |
111 | 111 | } |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | { |
124 | 124 | $eol = ConvertHelper::detectEOLCharacter($subject); |
125 | 125 | |
126 | - if($eol) |
|
126 | + if ($eol) |
|
127 | 127 | { |
128 | 128 | $this->log(sprintf( |
129 | 129 | 'Detected EOL character: %s.', |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $position = $this->getStartPosition(); |
56 | 56 | |
57 | 57 | // we're at the beginning of the string |
58 | - if($position === false || $position === 0) |
|
58 | + if ($position === false || $position === 0) |
|
59 | 59 | { |
60 | 60 | $this->log(sprintf( |
61 | 61 | 'Prepend: NO | Position: [%s] | Not found, or at beginning of string.', |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | $prevPos = $position - $this->eolLength; |
69 | 69 | |
70 | - if($prevPos < 0) |
|
70 | + if ($prevPos < 0) |
|
71 | 71 | { |
72 | 72 | $prevPos = 0; |
73 | 73 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | protected function checkPreviousPosition(int $prevPos) : void |
79 | 79 | { |
80 | - if($this->isWithinCommand($prevPos)) |
|
80 | + if ($this->isWithinCommand($prevPos)) |
|
81 | 81 | { |
82 | 82 | $this->log(sprintf( |
83 | 83 | 'Prepend: NO | Position: [%s] | Is within a mailcode command.', |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | $match = $this->subject->getSubstr($prevPos, $this->eolLength); |
91 | 91 | |
92 | - if($match !== $this->formatter->getEOLChar()) |
|
92 | + if ($match !== $this->formatter->getEOLChar()) |
|
93 | 93 | { |
94 | 94 | $this->log(sprintf( |
95 | 95 | 'Prepend: YES | Position: [%s] | Characters: [%s] | Do not match the EOL character.', |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | $position = $this->getEndPosition(); |
109 | 109 | |
110 | 110 | // we're at the end of the string |
111 | - if($position === false || $position >= $subjectLength) |
|
111 | + if ($position === false || $position >= $subjectLength) |
|
112 | 112 | { |
113 | 113 | $this->log(sprintf( |
114 | 114 | 'Append: NO | Position: [%s] | End of string, or too long | Subject length: [%s]', |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | $nextPos = $position + $this->eolLength; |
123 | 123 | |
124 | - if($nextPos > $subjectLength) |
|
124 | + if ($nextPos > $subjectLength) |
|
125 | 125 | { |
126 | 126 | $nextPos = $subjectLength - $this->eolLength; |
127 | 127 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | |
132 | 132 | protected function checkNextPosition(int $nextPos) : void |
133 | 133 | { |
134 | - if($this->isWithinCommand($nextPos)) |
|
134 | + if ($this->isWithinCommand($nextPos)) |
|
135 | 135 | { |
136 | 136 | $this->log(sprintf( |
137 | 137 | 'Append: YES | Position: [%s] | Is within a mailcode command.', |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | |
146 | 146 | $next = $this->subject->getSubstr($nextPos, $this->eolLength); |
147 | 147 | |
148 | - if($next !== $this->formatter->getEOLChar()) |
|
148 | + if ($next !== $this->formatter->getEOLChar()) |
|
149 | 149 | { |
150 | 150 | $this->log(sprintf( |
151 | 151 | 'Append: YES | Position: [%s] | Next characters: [%s] | Do not match the EOL character.', |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | { |
43 | 43 | $tagName = strtolower($tagName); |
44 | 44 | |
45 | - if(!in_array($tagName, $this->excludeTags)) |
|
45 | + if (!in_array($tagName, $this->excludeTags)) |
|
46 | 46 | { |
47 | 47 | $this->excludeTags[] = $tagName; |
48 | 48 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function excludeTags(array $tagNames) |
60 | 60 | { |
61 | - foreach($tagNames as $tagName) |
|
61 | + foreach ($tagNames as $tagName) |
|
62 | 62 | { |
63 | 63 | $this->excludeTag((string)$tagName); |
64 | 64 | } |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | { |
54 | 54 | $pos = $this->getStartPosition(); |
55 | 55 | |
56 | - if(is_bool($pos)) |
|
56 | + if (is_bool($pos)) |
|
57 | 57 | { |
58 | 58 | return ''; |
59 | 59 | } |
@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | { |
76 | 76 | $tagNames = $this->getParentTags(); |
77 | 77 | |
78 | - foreach($tagNames as $tagName) |
|
78 | + foreach ($tagNames as $tagName) |
|
79 | 79 | { |
80 | - if($this->formatter->isTagExcluded($tagName)) |
|
80 | + if ($this->formatter->isTagExcluded($tagName)) |
|
81 | 81 | { |
82 | 82 | return true; |
83 | 83 | } |
@@ -99,11 +99,11 @@ discard block |
||
99 | 99 | // Create a stack of all direct parent tags of the command. |
100 | 100 | // Handles closing tags as well. |
101 | 101 | $stack = array(); |
102 | - foreach($tags[2] as $idx => $tagName) |
|
102 | + foreach ($tags[2] as $idx => $tagName) |
|
103 | 103 | { |
104 | 104 | $closing = $tags[1][$idx] === '/'; |
105 | 105 | |
106 | - if($closing) |
|
106 | + if ($closing) |
|
107 | 107 | { |
108 | 108 | array_pop($stack); |
109 | 109 | } |
@@ -128,9 +128,9 @@ discard block |
||
128 | 128 | |
129 | 129 | // This check is easy: if the command is in the attribute |
130 | 130 | // of any of the tags, we will find the command marker in there. |
131 | - foreach($tags[3] as $attributes) |
|
131 | + foreach ($tags[3] as $attributes) |
|
132 | 132 | { |
133 | - if(strstr($attributes, self::COMMAND_MARKER)) |
|
133 | + if (strstr($attributes, self::COMMAND_MARKER)) |
|
134 | 134 | { |
135 | 135 | return true; |
136 | 136 | } |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | */ |
148 | 148 | private function getTagAncestry() : array |
149 | 149 | { |
150 | - if($this->ancestryChecked) |
|
150 | + if ($this->ancestryChecked) |
|
151 | 151 | { |
152 | 152 | return $this->tagAncestry; |
153 | 153 | } |
@@ -89,23 +89,23 @@ discard block |
||
89 | 89 | |
90 | 90 | $placeholderID = $this->placeholder->getID(); |
91 | 91 | |
92 | - foreach($placeholders as $placeholder) |
|
92 | + foreach ($placeholders as $placeholder) |
|
93 | 93 | { |
94 | - if($placeholder->getID() === $placeholderID) |
|
94 | + if ($placeholder->getID() === $placeholderID) |
|
95 | 95 | { |
96 | 96 | continue; |
97 | 97 | } |
98 | 98 | |
99 | 99 | $start = $this->subject->getSubstrPosition($placeholder->getReplacementText()); |
100 | 100 | |
101 | - if($start === false) |
|
101 | + if ($start === false) |
|
102 | 102 | { |
103 | 103 | continue; |
104 | 104 | } |
105 | 105 | |
106 | 106 | $end = $start + $placeholder->getReplacementLength(); |
107 | 107 | |
108 | - if($position >= $start && $position <= $end) |
|
108 | + if ($position >= $start && $position <= $end) |
|
109 | 109 | { |
110 | 110 | return true; |
111 | 111 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | { |
122 | 122 | $start = $this->getStartPosition(); |
123 | 123 | |
124 | - if($start !== false) |
|
124 | + if ($start !== false) |
|
125 | 125 | { |
126 | 126 | return $start + $this->placeholder->getReplacementLength(); |
127 | 127 | } |
@@ -151,14 +151,14 @@ discard block |
||
151 | 151 | { |
152 | 152 | $needle = $this->placeholder->getReplacementText(); |
153 | 153 | |
154 | - if($this->subject->replaceSubstrings($needle, $replacementText)) |
|
154 | + if ($this->subject->replaceSubstrings($needle, $replacementText)) |
|
155 | 155 | { |
156 | 156 | return; |
157 | 157 | } |
158 | 158 | |
159 | 159 | // Complain about missing placeholders only if we |
160 | 160 | // are not in partial mode. |
161 | - if(!$this->formatter->getFormatting()->isPartial()) |
|
161 | + if (!$this->formatter->getFormatting()->isPartial()) |
|
162 | 162 | { |
163 | 163 | throw new Mailcode_Exception( |
164 | 164 | 'Could not find the placeholder to replace', |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | |
174 | 174 | public function format() : void |
175 | 175 | { |
176 | - if($this->requiresAdjustment() && (!empty($this->prepend) || !empty($this->append))) |
|
176 | + if ($this->requiresAdjustment() && (!empty($this->prepend) || !empty($this->append))) |
|
177 | 177 | { |
178 | 178 | $this->replaceWith(sprintf( |
179 | 179 | '%s%s%s', |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | */ |
127 | 127 | public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard |
128 | 128 | { |
129 | - if(empty($delimiter)) |
|
129 | + if (empty($delimiter)) |
|
130 | 130 | { |
131 | 131 | throw new Mailcode_Exception( |
132 | 132 | 'Empty delimiter', |
@@ -176,11 +176,11 @@ discard block |
||
176 | 176 | $placeholders = $this->getPlaceholders(); |
177 | 177 | $string = $this->originalString; |
178 | 178 | |
179 | - foreach($placeholders as $placeholder) |
|
179 | + foreach ($placeholders as $placeholder) |
|
180 | 180 | { |
181 | 181 | $pos = mb_strpos($string, $placeholder->getOriginalText()); |
182 | 182 | |
183 | - if($pos === false) |
|
183 | + if ($pos === false) |
|
184 | 184 | { |
185 | 185 | throw new Mailcode_Exception( |
186 | 186 | 'Placeholder original text not found', |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | */ |
210 | 210 | public function createFormatting($subject) : Mailcode_Parser_Safeguard_Formatting |
211 | 211 | { |
212 | - if(is_string($subject)) |
|
212 | + if (is_string($subject)) |
|
213 | 213 | { |
214 | 214 | $subject = Mailcode::create()->createString($subject); |
215 | 215 | } |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | */ |
226 | 226 | public function getPlaceholders() |
227 | 227 | { |
228 | - if(isset($this->placeholders)) |
|
228 | + if (isset($this->placeholders)) |
|
229 | 229 | { |
230 | 230 | return $this->placeholders; |
231 | 231 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | |
235 | 235 | $cmds = $this->getCollection()->getCommands(); |
236 | 236 | |
237 | - foreach($cmds as $command) |
|
237 | + foreach ($cmds as $command) |
|
238 | 238 | { |
239 | 239 | self::$counter++; |
240 | 240 | |
@@ -248,21 +248,21 @@ discard block |
||
248 | 248 | return $this->placeholders; |
249 | 249 | } |
250 | 250 | |
251 | - protected function restore(string $string, bool $partial=false, bool $highlighted=false) : string |
|
251 | + protected function restore(string $string, bool $partial = false, bool $highlighted = false) : string |
|
252 | 252 | { |
253 | - if(!$partial) |
|
253 | + if (!$partial) |
|
254 | 254 | { |
255 | 255 | $this->requireValidCollection(); |
256 | 256 | } |
257 | 257 | |
258 | 258 | $formatting = $this->createFormatting($string); |
259 | 259 | |
260 | - if($partial) |
|
260 | + if ($partial) |
|
261 | 261 | { |
262 | 262 | $formatting->makePartial(); |
263 | 263 | } |
264 | 264 | |
265 | - if($highlighted) |
|
265 | + if ($highlighted) |
|
266 | 266 | { |
267 | 267 | $formatting->replaceWithHTMLHighlighting(); |
268 | 268 | } |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | */ |
359 | 359 | public function getCollection() : Mailcode_Collection |
360 | 360 | { |
361 | - if(isset($this->collection)) |
|
361 | + if (isset($this->collection)) |
|
362 | 362 | { |
363 | 363 | return $this->collection; |
364 | 364 | } |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | */ |
381 | 381 | protected function requireValidCollection() : void |
382 | 382 | { |
383 | - if($this->getCollection()->isValid()) |
|
383 | + if ($this->getCollection()->isValid()) |
|
384 | 384 | { |
385 | 385 | return; |
386 | 386 | } |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | */ |
404 | 404 | public function getPlaceholderStrings() : array |
405 | 405 | { |
406 | - if(is_array($this->placeholderStrings)) |
|
406 | + if (is_array($this->placeholderStrings)) |
|
407 | 407 | { |
408 | 408 | return $this->placeholderStrings; |
409 | 409 | } |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | |
413 | 413 | $this->placeholderStrings = array(); |
414 | 414 | |
415 | - foreach($placeholders as $placeholder) |
|
415 | + foreach ($placeholders as $placeholder) |
|
416 | 416 | { |
417 | 417 | $this->placeholderStrings[] = $placeholder->getReplacementText(); |
418 | 418 | } |
@@ -438,9 +438,9 @@ discard block |
||
438 | 438 | { |
439 | 439 | $placeholders = $this->getPlaceholders(); |
440 | 440 | |
441 | - foreach($placeholders as $placeholder) |
|
441 | + foreach ($placeholders as $placeholder) |
|
442 | 442 | { |
443 | - if($placeholder->getID() === $id) |
|
443 | + if ($placeholder->getID() === $id) |
|
444 | 444 | { |
445 | 445 | return $placeholder; |
446 | 446 | } |
@@ -467,9 +467,9 @@ discard block |
||
467 | 467 | { |
468 | 468 | $placeholders = $this->getPlaceholders(); |
469 | 469 | |
470 | - foreach($placeholders as $placeholder) |
|
470 | + foreach ($placeholders as $placeholder) |
|
471 | 471 | { |
472 | - if($placeholder->getReplacementText() === $string) |
|
472 | + if ($placeholder->getReplacementText() === $string) |
|
473 | 473 | { |
474 | 474 | return $placeholder; |
475 | 475 | } |
@@ -71,7 +71,7 @@ |
||
71 | 71 | { |
72 | 72 | $tokens = $this->params->getInfo()->getTokens(); |
73 | 73 | |
74 | - if(count($tokens) > 1) |
|
74 | + if (count($tokens) > 1) |
|
75 | 75 | { |
76 | 76 | $this->validationResult->makeError( |
77 | 77 | t('Unknown parameters found:').' '. |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | $errors = $this->errors; |
101 | 101 | |
102 | - if(!$result->isValid()) |
|
102 | + if (!$result->isValid()) |
|
103 | 103 | { |
104 | 104 | $errors[] = new Mailcode_Collection_Error_Message( |
105 | 105 | '', |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | { |
116 | 116 | $errors = $this->getErrors(); |
117 | 117 | |
118 | - if(!empty($errors)) |
|
118 | + if (!empty($errors)) |
|
119 | 119 | { |
120 | 120 | return array_shift($errors); |
121 | 121 | } |
@@ -157,11 +157,11 @@ discard block |
||
157 | 157 | { |
158 | 158 | $hashes = array(); |
159 | 159 | |
160 | - foreach($this->commands as $command) |
|
160 | + foreach ($this->commands as $command) |
|
161 | 161 | { |
162 | 162 | $hash = $command->getHash(); |
163 | 163 | |
164 | - if(!isset($hashes[$hash])) |
|
164 | + if (!isset($hashes[$hash])) |
|
165 | 165 | { |
166 | 166 | $hashes[$hash] = $command; |
167 | 167 | } |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | */ |
179 | 179 | public function addCommands(array $commands) : Mailcode_Collection |
180 | 180 | { |
181 | - foreach($commands as $command) |
|
181 | + foreach ($commands as $command) |
|
182 | 182 | { |
183 | 183 | $this->addCommand($command); |
184 | 184 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | { |
198 | 198 | $collection = new Mailcode_Variables_Collection_Regular(); |
199 | 199 | |
200 | - foreach($this->commands as $command) |
|
200 | + foreach ($this->commands as $command) |
|
201 | 201 | { |
202 | 202 | $collection->mergeWith($command->getVariables()); |
203 | 203 | } |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | |
208 | 208 | public function getValidationResult() : OperationResult |
209 | 209 | { |
210 | - if($this->validationResult instanceof OperationResult) |
|
210 | + if ($this->validationResult instanceof OperationResult) |
|
211 | 211 | { |
212 | 212 | return $this->validationResult; |
213 | 213 | } |
@@ -223,9 +223,9 @@ discard block |
||
223 | 223 | { |
224 | 224 | $errors = $this->getErrors(); |
225 | 225 | |
226 | - foreach($errors as $error) |
|
226 | + foreach ($errors as $error) |
|
227 | 227 | { |
228 | - if($error->getCode() === $code) |
|
228 | + if ($error->getCode() === $code) |
|
229 | 229 | { |
230 | 230 | return true; |
231 | 231 | } |
@@ -262,9 +262,9 @@ discard block |
||
262 | 262 | { |
263 | 263 | $result = array(); |
264 | 264 | |
265 | - foreach($this->commands as $command) |
|
265 | + foreach ($this->commands as $command) |
|
266 | 266 | { |
267 | - if($command instanceof $className) |
|
267 | + if ($command instanceof $className) |
|
268 | 268 | { |
269 | 269 | $result[] = $command; |
270 | 270 | } |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | { |
278 | 278 | $commands = $this->getCommands(); |
279 | 279 | |
280 | - if(!empty($commands)) |
|
280 | + if (!empty($commands)) |
|
281 | 281 | { |
282 | 282 | return array_shift($commands); |
283 | 283 | } |