@@ -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 | } |
@@ -56,23 +56,23 @@ |
||
| 56 | 56 | |
| 57 | 57 | private function analyzeURL(string $url) : void |
| 58 | 58 | { |
| 59 | - if(stristr($url, 'tel:')) |
|
| 59 | + if (stristr($url, 'tel:')) |
|
| 60 | 60 | { |
| 61 | 61 | return; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | $placeholders = $this->safeguard->getPlaceholders(); |
| 65 | 65 | |
| 66 | - foreach($placeholders as $placeholder) |
|
| 66 | + foreach ($placeholders as $placeholder) |
|
| 67 | 67 | { |
| 68 | 68 | $command = $placeholder->getCommand(); |
| 69 | 69 | |
| 70 | - if(!$command->supportsURLEncoding()) |
|
| 70 | + if (!$command->supportsURLEncoding()) |
|
| 71 | 71 | { |
| 72 | 72 | continue; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - if(strstr($url, $placeholder->getReplacementText()) && !$command->isURLDecoded()) |
|
| 75 | + if (strstr($url, $placeholder->getReplacementText()) && !$command->isURLDecoded()) |
|
| 76 | 76 | { |
| 77 | 77 | $command->setURLEncoding(true); |
| 78 | 78 | } |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | $placeholders = $this->getPlaceholders(); |
| 181 | 181 | $string = $this->originalString; |
| 182 | 182 | |
| 183 | - foreach($placeholders as $placeholder) |
|
| 183 | + foreach ($placeholders as $placeholder) |
|
| 184 | 184 | { |
| 185 | 185 | $string = $this->makePlaceholderSafe($string, $placeholder); |
| 186 | 186 | } |
@@ -210,14 +210,14 @@ discard block |
||
| 210 | 210 | $placeholders = $this->getPlaceholders(); |
| 211 | 211 | $total = count($placeholders); |
| 212 | 212 | |
| 213 | - for($i=0; $i < $total; $i++) |
|
| 213 | + for ($i = 0; $i < $total; $i++) |
|
| 214 | 214 | { |
| 215 | 215 | $placeholder = $placeholders[$i]; |
| 216 | 216 | $command = $placeholder->getCommand(); |
| 217 | 217 | |
| 218 | - if($command instanceof Mailcode_Interfaces_Commands_ProtectedContent) |
|
| 218 | + if ($command instanceof Mailcode_Interfaces_Commands_ProtectedContent) |
|
| 219 | 219 | { |
| 220 | - $string = $command->protectContent($string, $placeholder, $placeholders[$i+1]); |
|
| 220 | + $string = $command->protectContent($string, $placeholder, $placeholders[$i + 1]); |
|
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | 223 | |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | { |
| 229 | 229 | $pos = mb_strpos($string, $placeholder->getOriginalText()); |
| 230 | 230 | |
| 231 | - if($pos === false) |
|
| 231 | + if ($pos === false) |
|
| 232 | 232 | { |
| 233 | 233 | throw new Mailcode_Exception( |
| 234 | 234 | 'Placeholder original text not found', |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | */ |
| 268 | 268 | public function createFormatting($subject) : Mailcode_Parser_Safeguard_Formatting |
| 269 | 269 | { |
| 270 | - if(is_string($subject)) |
|
| 270 | + if (is_string($subject)) |
|
| 271 | 271 | { |
| 272 | 272 | $subject = Mailcode::create()->createString($subject); |
| 273 | 273 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | */ |
| 284 | 284 | public function getPlaceholders() |
| 285 | 285 | { |
| 286 | - if(isset($this->placeholders)) |
|
| 286 | + if (isset($this->placeholders)) |
|
| 287 | 287 | { |
| 288 | 288 | return $this->placeholders; |
| 289 | 289 | } |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | |
| 293 | 293 | $cmds = $this->getCollection()->getCommands(); |
| 294 | 294 | |
| 295 | - foreach($cmds as $command) |
|
| 295 | + foreach ($cmds as $command) |
|
| 296 | 296 | { |
| 297 | 297 | self::$counter++; |
| 298 | 298 | |
@@ -313,21 +313,21 @@ discard block |
||
| 313 | 313 | * @return string |
| 314 | 314 | * @throws Mailcode_Exception |
| 315 | 315 | */ |
| 316 | - protected function restore(string $string, bool $partial=false, bool $highlighted=false) : string |
|
| 316 | + protected function restore(string $string, bool $partial = false, bool $highlighted = false) : string |
|
| 317 | 317 | { |
| 318 | - if(!$partial) |
|
| 318 | + if (!$partial) |
|
| 319 | 319 | { |
| 320 | 320 | $this->requireValidCollection(); |
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | $formatting = $this->createFormatting($string); |
| 324 | 324 | |
| 325 | - if($partial) |
|
| 325 | + if ($partial) |
|
| 326 | 326 | { |
| 327 | 327 | $formatting->makePartial(); |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | - if($highlighted) |
|
| 330 | + if ($highlighted) |
|
| 331 | 331 | { |
| 332 | 332 | $formatting->replaceWithHTMLHighlighting(); |
| 333 | 333 | } |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | { |
| 348 | 348 | $command = $placeholder->getCommand(); |
| 349 | 349 | |
| 350 | - if($command instanceof Mailcode_Interfaces_Commands_ProtectedContent) |
|
| 350 | + if ($command instanceof Mailcode_Interfaces_Commands_ProtectedContent) |
|
| 351 | 351 | { |
| 352 | 352 | $string = $command->restoreContent($string); |
| 353 | 353 | } |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | */ |
| 441 | 441 | public function getCollection() : Mailcode_Collection |
| 442 | 442 | { |
| 443 | - if(isset($this->collection)) |
|
| 443 | + if (isset($this->collection)) |
|
| 444 | 444 | { |
| 445 | 445 | return $this->collection; |
| 446 | 446 | } |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | */ |
| 463 | 463 | protected function requireValidCollection() : void |
| 464 | 464 | { |
| 465 | - if($this->getCollection()->isValid()) |
|
| 465 | + if ($this->getCollection()->isValid()) |
|
| 466 | 466 | { |
| 467 | 467 | return; |
| 468 | 468 | } |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | */ |
| 486 | 486 | public function getPlaceholderStrings() : array |
| 487 | 487 | { |
| 488 | - if(is_array($this->placeholderStrings)) |
|
| 488 | + if (is_array($this->placeholderStrings)) |
|
| 489 | 489 | { |
| 490 | 490 | return $this->placeholderStrings; |
| 491 | 491 | } |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | |
| 495 | 495 | $this->placeholderStrings = array(); |
| 496 | 496 | |
| 497 | - foreach($placeholders as $placeholder) |
|
| 497 | + foreach ($placeholders as $placeholder) |
|
| 498 | 498 | { |
| 499 | 499 | $this->placeholderStrings[] = $placeholder->getReplacementText(); |
| 500 | 500 | } |
@@ -520,9 +520,9 @@ discard block |
||
| 520 | 520 | { |
| 521 | 521 | $placeholders = $this->getPlaceholders(); |
| 522 | 522 | |
| 523 | - foreach($placeholders as $placeholder) |
|
| 523 | + foreach ($placeholders as $placeholder) |
|
| 524 | 524 | { |
| 525 | - if($placeholder->getID() === $id) |
|
| 525 | + if ($placeholder->getID() === $id) |
|
| 526 | 526 | { |
| 527 | 527 | return $placeholder; |
| 528 | 528 | } |
@@ -549,9 +549,9 @@ discard block |
||
| 549 | 549 | { |
| 550 | 550 | $placeholders = $this->getPlaceholders(); |
| 551 | 551 | |
| 552 | - foreach($placeholders as $placeholder) |
|
| 552 | + foreach ($placeholders as $placeholder) |
|
| 553 | 553 | { |
| 554 | - if($placeholder->getReplacementText() === $string) |
|
| 554 | + if ($placeholder->getReplacementText() === $string) |
|
| 555 | 555 | { |
| 556 | 556 | return $placeholder; |
| 557 | 557 | } |
@@ -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 | public function getReplacementText() : string |
| 71 | 71 | { |
| 72 | - if(!empty($this->replacement)) |
|
| 72 | + if (!empty($this->replacement)) |
|
| 73 | 73 | { |
| 74 | 74 | return $this->replacement; |
| 75 | 75 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |