@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | */ |
| 117 | 117 | public static function getContent(int $id) : string |
| 118 | 118 | { |
| 119 | - if(isset(self::$contents[$id])) |
|
| 119 | + if (isset(self::$contents[$id])) |
|
| 120 | 120 | { |
| 121 | 121 | return self::$contents[$id]; |
| 122 | 122 | } |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | */ |
| 140 | 140 | public static function clearContent(int $id) : void |
| 141 | 141 | { |
| 142 | - if(isset(self::$contents[$id])) |
|
| 142 | + if (isset(self::$contents[$id])) |
|
| 143 | 143 | { |
| 144 | 144 | unset(self::$contents[$id]); |
| 145 | 145 | } |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | public function parse() : self |
| 158 | 158 | { |
| 159 | - if($this->parsed) |
|
| 159 | + if ($this->parsed) |
|
| 160 | 160 | { |
| 161 | 161 | return $this; |
| 162 | 162 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | $this->detectCommands(); |
| 168 | 168 | |
| 169 | - foreach($this->commands as $commandDef) |
|
| 169 | + foreach ($this->commands as $commandDef) |
|
| 170 | 170 | { |
| 171 | 171 | $this->processCommand($commandDef); |
| 172 | 172 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | $commands = Mailcode::create()->getCommands()->getContentCommands(); |
| 188 | 188 | $result = array(); |
| 189 | 189 | |
| 190 | - foreach($commands as $command) |
|
| 190 | + foreach ($commands as $command) |
|
| 191 | 191 | { |
| 192 | 192 | $result[] = $command->getName(); |
| 193 | 193 | } |
@@ -260,9 +260,9 @@ discard block |
||
| 260 | 260 | |
| 261 | 261 | private function validateCommandContents() : void |
| 262 | 262 | { |
| 263 | - foreach($this->commands as $command) |
|
| 263 | + foreach ($this->commands as $command) |
|
| 264 | 264 | { |
| 265 | - if(!$command->validateContent($this, $this->collection)) |
|
| 265 | + if (!$command->validateContent($this, $this->collection)) |
|
| 266 | 266 | { |
| 267 | 267 | return; |
| 268 | 268 | } |
@@ -274,12 +274,12 @@ discard block |
||
| 274 | 274 | $openingCommands = $this->detectOpeningCommands(); |
| 275 | 275 | $closingCommands = $this->detectClosingCommands(); |
| 276 | 276 | |
| 277 | - if(!$this->validateCommandsList($openingCommands, $closingCommands)) |
|
| 277 | + if (!$this->validateCommandsList($openingCommands, $closingCommands)) |
|
| 278 | 278 | { |
| 279 | 279 | return; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - foreach($openingCommands as $idx => $def) |
|
| 282 | + foreach ($openingCommands as $idx => $def) |
|
| 283 | 283 | { |
| 284 | 284 | $this->commands[] = new CommandDef( |
| 285 | 285 | $def['name'], |
@@ -300,20 +300,20 @@ discard block |
||
| 300 | 300 | $opening = count($openingCommands); |
| 301 | 301 | $closing = count($closingCommands); |
| 302 | 302 | $max = $opening; |
| 303 | - if($closing > $max) { |
|
| 303 | + if ($closing > $max) { |
|
| 304 | 304 | $max = $closing; |
| 305 | 305 | } |
| 306 | 306 | |
| 307 | - for($i=0; $i < $max; $i++) |
|
| 307 | + for ($i = 0; $i < $max; $i++) |
|
| 308 | 308 | { |
| 309 | 309 | // command closed that was never opened |
| 310 | - if(!isset($openingCommands[$i])) |
|
| 310 | + if (!isset($openingCommands[$i])) |
|
| 311 | 311 | { |
| 312 | 312 | return $this->addErrorClosedNeverOpened($closingCommands[$i]['matchedText']); |
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | // command opened that was never closed |
| 316 | - if(!isset($closingCommands[$i])) |
|
| 316 | + if (!isset($closingCommands[$i])) |
|
| 317 | 317 | { |
| 318 | 318 | return $this->addErrorNeverClosed( |
| 319 | 319 | $openingCommands[$i]['matchedText'], |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | // command closed does not match opening |
| 325 | - if($openingCommands[$i]['name'] !== $closingCommands[$i]['name']) |
|
| 325 | + if ($openingCommands[$i]['name'] !== $closingCommands[$i]['name']) |
|
| 326 | 326 | { |
| 327 | 327 | return $this->addErrorClosingMismatch( |
| 328 | 328 | $openingCommands[$i]['name'], |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | |
| 378 | 378 | $result = array(); |
| 379 | 379 | |
| 380 | - foreach($matches[0] as $idx => $matchedText) |
|
| 380 | + foreach ($matches[0] as $idx => $matchedText) |
|
| 381 | 381 | { |
| 382 | 382 | $result[] = array( |
| 383 | 383 | 'name' => strtolower(trim((string)$matches[1][$idx])), |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | $matchedText, |
| 462 | 462 | t( |
| 463 | 463 | 'The command is never closed with a matching %1$s command.', |
| 464 | - sb()->code('{' . $name . '}') |
|
| 464 | + sb()->code('{'.$name.'}') |
|
| 465 | 465 | ), |
| 466 | 466 | Mailcode_Commands_CommonConstants::VALIDATION_MISSING_CONTENT_CLOSING_TAG |
| 467 | 467 | ); |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | ) |
| 486 | 486 | ->t( |
| 487 | 487 | 'It must be closed with a matching %1$s command.', |
| 488 | - sb()->code('{' . $name . '}') |
|
| 488 | + sb()->code('{'.$name.'}') |
|
| 489 | 489 | ), |
| 490 | 490 | Mailcode_Commands_CommonConstants::VALIDATION_CONTENT_CLOSING_MISMATCHED_TAG |
| 491 | 491 | ); |
@@ -30,22 +30,22 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function debugOpeningCommands(array $matches) : void |
| 32 | 32 | { |
| 33 | - if(!Mailcode::isDebugEnabled()) |
|
| 33 | + if (!Mailcode::isDebugEnabled()) |
|
| 34 | 34 | { |
| 35 | 35 | return; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | Mailcode::debug('Opening command matches:'); |
| 39 | 39 | |
| 40 | - if(empty($matches)) |
|
| 40 | + if (empty($matches)) |
|
| 41 | 41 | { |
| 42 | 42 | Mailcode::debug('...None found.'); |
| 43 | 43 | return; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - foreach($matches[0] as $idx => $matchedText) |
|
| 46 | + foreach ($matches[0] as $idx => $matchedText) |
|
| 47 | 47 | { |
| 48 | - $number = $idx+1; |
|
| 48 | + $number = $idx + 1; |
|
| 49 | 49 | |
| 50 | 50 | Mailcode::debug(sprintf('...#%02d matched: [%s]', $number, $matchedText)); |
| 51 | 51 | Mailcode::debug(sprintf('...#%02d name...: [%s]', $number, $matches[1][$idx])); |
@@ -59,22 +59,22 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function debugClosingCommands(array $commands) : void |
| 61 | 61 | { |
| 62 | - if(!Mailcode::isDebugEnabled()) |
|
| 62 | + if (!Mailcode::isDebugEnabled()) |
|
| 63 | 63 | { |
| 64 | 64 | return; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | Mailcode::debug('Closing command matches:', $commands); |
| 68 | 68 | |
| 69 | - if(empty($commands)) |
|
| 69 | + if (empty($commands)) |
|
| 70 | 70 | { |
| 71 | 71 | Mailcode::debug('...None found.'); |
| 72 | 72 | return; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - foreach($commands as $idx => $command) |
|
| 75 | + foreach ($commands as $idx => $command) |
|
| 76 | 76 | { |
| 77 | - $number = $idx+1; |
|
| 77 | + $number = $idx + 1; |
|
| 78 | 78 | |
| 79 | 79 | Mailcode::debug(sprintf('...#%02d matched: [%s]', $number, $command['matchedText'])); |
| 80 | 80 | Mailcode::debug(sprintf('...#%02d name...: [%s]', $number, $command['name'])); |
@@ -83,14 +83,14 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | public function debugCommandDef(CommandDef $commandDef) : void |
| 85 | 85 | { |
| 86 | - if(!Mailcode::isDebugEnabled()) |
|
| 86 | + if (!Mailcode::isDebugEnabled()) |
|
| 87 | 87 | { |
| 88 | 88 | return; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | Mailcode::debug('Command definition:', $commandDef->toArray()); |
| 92 | 92 | |
| 93 | - if(defined('TESTS_ROOT')) |
|
| 93 | + if (defined('TESTS_ROOT')) |
|
| 94 | 94 | { |
| 95 | 95 | print_r($commandDef->toArray()); |
| 96 | 96 | } |
@@ -23,24 +23,24 @@ |
||
| 23 | 23 | */ |
| 24 | 24 | class Mailcode_Parser_Match |
| 25 | 25 | { |
| 26 | - /** |
|
| 27 | - * @var string |
|
| 28 | - */ |
|
| 26 | + /** |
|
| 27 | + * @var string |
|
| 28 | + */ |
|
| 29 | 29 | protected string $name; |
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * @var string |
|
| 33 | - */ |
|
| 31 | + /** |
|
| 32 | + * @var string |
|
| 33 | + */ |
|
| 34 | 34 | protected string $type; |
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * @var string |
|
| 38 | - */ |
|
| 36 | + /** |
|
| 37 | + * @var string |
|
| 38 | + */ |
|
| 39 | 39 | protected string $params; |
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * @var string |
|
| 43 | - */ |
|
| 41 | + /** |
|
| 42 | + * @var string |
|
| 43 | + */ |
|
| 44 | 44 | protected string $matchedString; |
| 45 | 45 | |
| 46 | 46 | public function __construct(string $name, string $type, string $params, string $matchedString) |
@@ -58,24 +58,24 @@ discard block |
||
| 58 | 58 | private function analyzeURL(string $url) : void |
| 59 | 59 | { |
| 60 | 60 | // Ignore phone URLs |
| 61 | - if(stripos($url, 'tel:') !== false) |
|
| 61 | + if (stripos($url, 'tel:') !== false) |
|
| 62 | 62 | { |
| 63 | 63 | return; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $placeholders = $this->safeguard->getPlaceholdersCollection()->getAll(); |
| 67 | 67 | |
| 68 | - foreach($placeholders as $placeholder) |
|
| 68 | + foreach ($placeholders as $placeholder) |
|
| 69 | 69 | { |
| 70 | 70 | $command = $placeholder->getCommand(); |
| 71 | 71 | |
| 72 | 72 | // The URL is not found in the replacement text |
| 73 | - if(strpos($url, $placeholder->getReplacementText()) === false) |
|
| 73 | + if (strpos($url, $placeholder->getReplacementText()) === false) |
|
| 74 | 74 | { |
| 75 | 75 | continue; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - if($command instanceof URLEncodingInterface) |
|
| 78 | + if ($command instanceof URLEncodingInterface) |
|
| 79 | 79 | { |
| 80 | 80 | $this->applyEncoding($command); |
| 81 | 81 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | private function applyEncoding(URLEncodingInterface $command) : void |
| 86 | 86 | { |
| 87 | - if(!$command->isURLDecoded()) |
|
| 87 | + if (!$command->isURLDecoded()) |
|
| 88 | 88 | { |
| 89 | 89 | $command->setURLEncoding(); |
| 90 | 90 | } |
@@ -24,9 +24,9 @@ discard block |
||
| 24 | 24 | protected string $matchedText; |
| 25 | 25 | private ?Mailcode_Commands_Command $sourceCommand; |
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * @var mixed |
|
| 29 | - */ |
|
| 27 | + /** |
|
| 28 | + * @var mixed |
|
| 29 | + */ |
|
| 30 | 30 | protected $subject; |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -58,20 +58,20 @@ discard block |
||
| 58 | 58 | return $this->sourceCommand; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * The ID of the type. i.e. the class name ("Keyword", "StringLiteral"). |
|
| 63 | - * @return string |
|
| 64 | - */ |
|
| 61 | + /** |
|
| 62 | + * The ID of the type. i.e. the class name ("Keyword", "StringLiteral"). |
|
| 63 | + * @return string |
|
| 64 | + */ |
|
| 65 | 65 | public function getTypeID() : string |
| 66 | 66 | { |
| 67 | 67 | $parts = explode('_', get_class($this)); |
| 68 | 68 | return array_pop($parts); |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - /** |
|
| 72 | - * Retrieves a unique ID of the token. |
|
| 73 | - * @return string |
|
| 74 | - */ |
|
| 71 | + /** |
|
| 72 | + * Retrieves a unique ID of the token. |
|
| 73 | + * @return string |
|
| 74 | + */ |
|
| 75 | 75 | public function getID() : string |
| 76 | 76 | { |
| 77 | 77 | return $this->tokenID; |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | * @param mixed $subject |
| 37 | 37 | * @param Mailcode_Commands_Command|null $sourceCommand |
| 38 | 38 | */ |
| 39 | - public function __construct(string $tokenID, string $matchedText, $subject=null, ?Mailcode_Commands_Command $sourceCommand=null) |
|
| 39 | + public function __construct(string $tokenID, string $matchedText, $subject = null, ?Mailcode_Commands_Command $sourceCommand = null) |
|
| 40 | 40 | { |
| 41 | 41 | $this->tokenID = $tokenID; |
| 42 | 42 | $this->matchedText = $matchedText; |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | */ |
| 64 | 64 | public function getName() : string |
| 65 | 65 | { |
| 66 | - if(isset($this->nameToken)) { |
|
| 66 | + if (isset($this->nameToken)) { |
|
| 67 | 67 | return $this->nameToken->getParamName(); |
| 68 | 68 | } |
| 69 | 69 | |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | { |
| 102 | 102 | $replaces = array(); |
| 103 | 103 | |
| 104 | - foreach(self::$charsEncoded as $char => $placeholder) |
|
| 104 | + foreach (self::$charsEncoded as $char => $placeholder) |
|
| 105 | 105 | { |
| 106 | 106 | $escaped = self::$charsEscaped[$char]; |
| 107 | 107 | |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function getVariable() : Mailcode_Variables_Variable |
| 30 | 30 | { |
| 31 | - if($this->subject instanceof Mailcode_Variables_Variable) |
|
| 31 | + if ($this->subject instanceof Mailcode_Variables_Variable) |
|
| 32 | 32 | { |
| 33 | 33 | return $this->subject; |
| 34 | 34 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | { |
| 44 | 44 | $token = $this->info->getTokenByIndex($index); |
| 45 | 45 | |
| 46 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
| 46 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
| 47 | 47 | { |
| 48 | 48 | return $token; |
| 49 | 49 | } |
@@ -62,9 +62,9 @@ discard block |
||
| 62 | 62 | { |
| 63 | 63 | $tokens = $this->getAll(); |
| 64 | 64 | |
| 65 | - foreach($tokens as $token) |
|
| 65 | + foreach ($tokens as $token) |
|
| 66 | 66 | { |
| 67 | - if($token->getKeyword() === $name) |
|
| 67 | + if ($token->getKeyword() === $name) |
|
| 68 | 68 | { |
| 69 | 69 | return $token; |
| 70 | 70 | } |
@@ -81,9 +81,9 @@ discard block |
||
| 81 | 81 | $result = array(); |
| 82 | 82 | $tokens = $this->info->getTokens(); |
| 83 | 83 | |
| 84 | - foreach($tokens as $token) |
|
| 84 | + foreach ($tokens as $token) |
|
| 85 | 85 | { |
| 86 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
| 86 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
| 87 | 87 | { |
| 88 | 88 | $result[] = $token; |
| 89 | 89 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | public function setEnabled(string $keyword, bool $enabled) : Mailcode_Parser_Statement_Info_Keywords |
| 104 | 104 | { |
| 105 | - if($enabled) |
|
| 105 | + if ($enabled) |
|
| 106 | 106 | { |
| 107 | 107 | return $this->add($keyword); |
| 108 | 108 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | { |
| 122 | 122 | $keyword = rtrim($keyword, ':').':'; |
| 123 | 123 | |
| 124 | - if(!$this->hasKeyword($keyword)) |
|
| 124 | + if (!$this->hasKeyword($keyword)) |
|
| 125 | 125 | { |
| 126 | 126 | $this->tokenizer->appendKeyword($keyword); |
| 127 | 127 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | foreach ($keywords as $kw) |
| 168 | 168 | { |
| 169 | - if($kw->getKeyword() === $keyword) |
|
| 169 | + if ($kw->getKeyword() === $keyword) |
|
| 170 | 170 | { |
| 171 | 171 | return true; |
| 172 | 172 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | private function stripStyleTags() : void |
| 81 | 81 | { |
| 82 | - if(!ConvertHelper::isStringHTML($this->subject)) |
|
| 82 | + if (!ConvertHelper::isStringHTML($this->subject)) |
|
| 83 | 83 | { |
| 84 | 84 | return; |
| 85 | 85 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | |
| 94 | 94 | private function escapeRegexBracketMatch(string $subject, string $needle) : string |
| 95 | 95 | { |
| 96 | - $replacement = str_replace( |
|
| 96 | + $replacement = str_replace( |
|
| 97 | 97 | array('{', '}'), |
| 98 | 98 | array('\{', '\}'), |
| 99 | 99 | $needle |