@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection |
| 28 | 28 | { |
| 29 | - if($variable->isValid()) |
|
| 29 | + if ($variable->isValid()) |
|
| 30 | 30 | { |
| 31 | 31 | return $this; |
| 32 | 32 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | { |
| 39 | 39 | $first = $this->getFirst(); |
| 40 | 40 | |
| 41 | - if($first) |
|
| 41 | + if ($first) |
|
| 42 | 42 | { |
| 43 | 43 | return $first->getValidationResult(); |
| 44 | 44 | } |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | private ?Mailcode_Commands_Command $sourceCommand = null; |
| 58 | 58 | |
| 59 | - public function __construct(string $statement, bool $freeform=false, ?Mailcode_Commands_Command $sourceCommand=null) |
|
| 59 | + public function __construct(string $statement, bool $freeform = false, ?Mailcode_Commands_Command $sourceCommand = null) |
|
| 60 | 60 | { |
| 61 | 61 | $this->sourceCommand = $sourceCommand; |
| 62 | 62 | $this->statement = $this->prepareStatement($statement); |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | |
| 107 | 107 | public function getInfo() : Mailcode_Parser_Statement_Info |
| 108 | 108 | { |
| 109 | - if($this->info instanceof Mailcode_Parser_Statement_Info) |
|
| 109 | + if ($this->info instanceof Mailcode_Parser_Statement_Info) |
|
| 110 | 110 | { |
| 111 | 111 | return $this->info; |
| 112 | 112 | } |
@@ -118,12 +118,12 @@ discard block |
||
| 118 | 118 | |
| 119 | 119 | protected function validate() : void |
| 120 | 120 | { |
| 121 | - if($this->freeform) |
|
| 121 | + if ($this->freeform) |
|
| 122 | 122 | { |
| 123 | 123 | return; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - if(!$this->tokenizer->hasTokens()) |
|
| 126 | + if (!$this->tokenizer->hasTokens()) |
|
| 127 | 127 | { |
| 128 | 128 | $this->result->makeError( |
| 129 | 129 | t('Empty statement'), |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | |
| 136 | 136 | $unknown = $this->tokenizer->getFirstUnknown(); |
| 137 | 137 | |
| 138 | - if($unknown) |
|
| 138 | + if ($unknown) |
|
| 139 | 139 | { |
| 140 | 140 | $this->result->makeError( |
| 141 | 141 | t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')', |
@@ -139,11 +139,11 @@ |
||
| 139 | 139 | $commands = $parser->getCommands(); |
| 140 | 140 | $content = $this->getContent(); |
| 141 | 141 | |
| 142 | - foreach($commands as $command) |
|
| 142 | + foreach ($commands as $command) |
|
| 143 | 143 | { |
| 144 | 144 | $string = $command->getOpeningText(); |
| 145 | 145 | |
| 146 | - if(strpos($content, $string) !== false) |
|
| 146 | + if (strpos($content, $string) !== false) |
|
| 147 | 147 | { |
| 148 | 148 | $this->addEscapeError($command, $collection); |
| 149 | 149 | return false; |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $placeholders = $this->getPlaceholdersCollection()->getAll(); |
| 175 | 175 | $string = $this->originalString; |
| 176 | 176 | |
| 177 | - foreach($placeholders as $placeholder) |
|
| 177 | + foreach ($placeholders as $placeholder) |
|
| 178 | 178 | { |
| 179 | 179 | $string = $this->makePlaceholderSafe($string, $placeholder); |
| 180 | 180 | } |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | { |
| 189 | 189 | $pos = mb_strpos($string, $placeholder->getOriginalText()); |
| 190 | 190 | |
| 191 | - if($pos === false) |
|
| 191 | + if ($pos === false) |
|
| 192 | 192 | { |
| 193 | 193 | throw new Mailcode_Exception( |
| 194 | 194 | 'Placeholder original text not found', |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | */ |
| 228 | 228 | public function createFormatting($subject) : Mailcode_Parser_Safeguard_Formatting |
| 229 | 229 | { |
| 230 | - if(is_string($subject)) |
|
| 230 | + if (is_string($subject)) |
|
| 231 | 231 | { |
| 232 | 232 | $subject = Mailcode::create()->createString($subject); |
| 233 | 233 | } |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | */ |
| 257 | 257 | public function getPlaceholdersCollection() : Mailcode_Parser_Safeguard_PlaceholderCollection |
| 258 | 258 | { |
| 259 | - if(isset($this->placeholders)) |
|
| 259 | + if (isset($this->placeholders)) |
|
| 260 | 260 | { |
| 261 | 261 | return $this->placeholders; |
| 262 | 262 | } |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | $placeholders = array(); |
| 265 | 265 | $commands = $this->getCollection()->getCommands(); |
| 266 | 266 | |
| 267 | - foreach($commands as $command) |
|
| 267 | + foreach ($commands as $command) |
|
| 268 | 268 | { |
| 269 | 269 | self::$counter++; |
| 270 | 270 | |
@@ -287,21 +287,21 @@ discard block |
||
| 287 | 287 | * @return string |
| 288 | 288 | * @throws Mailcode_Exception |
| 289 | 289 | */ |
| 290 | - protected function restore(string $string, bool $partial=false, bool $highlighted=false) : string |
|
| 290 | + protected function restore(string $string, bool $partial = false, bool $highlighted = false) : string |
|
| 291 | 291 | { |
| 292 | - if(!$partial) |
|
| 292 | + if (!$partial) |
|
| 293 | 293 | { |
| 294 | 294 | $this->requireValidCollection(); |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | $formatting = $this->createFormatting($string); |
| 298 | 298 | |
| 299 | - if($partial) |
|
| 299 | + if ($partial) |
|
| 300 | 300 | { |
| 301 | 301 | $formatting->makePartial(); |
| 302 | 302 | } |
| 303 | 303 | |
| 304 | - if($highlighted) |
|
| 304 | + if ($highlighted) |
|
| 305 | 305 | { |
| 306 | 306 | $formatting->replaceWithHTMLHighlighting(); |
| 307 | 307 | } |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | */ |
| 398 | 398 | public function getCollection() : Mailcode_Collection |
| 399 | 399 | { |
| 400 | - if(isset($this->collection)) |
|
| 400 | + if (isset($this->collection)) |
|
| 401 | 401 | { |
| 402 | 402 | return $this->collection; |
| 403 | 403 | } |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | */ |
| 426 | 426 | protected function requireValidCollection() : void |
| 427 | 427 | { |
| 428 | - if($this->getCollection()->isValid()) |
|
| 428 | + if ($this->getCollection()->isValid()) |
|
| 429 | 429 | { |
| 430 | 430 | return; |
| 431 | 431 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function getByIndex(int $index) : Mailcode_Parser_Safeguard_Placeholder |
| 41 | 41 | { |
| 42 | - if(isset($this->placeholders[$index])) |
|
| 42 | + if (isset($this->placeholders[$index])) |
|
| 43 | 43 | { |
| 44 | 44 | return $this->placeholders[$index]; |
| 45 | 45 | } |
@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | public function getByCommand(Mailcode_Commands_Command $command) : Mailcode_Parser_Safeguard_Placeholder |
| 55 | 55 | { |
| 56 | - foreach($this->placeholders as $placeholder) |
|
| 56 | + foreach ($this->placeholders as $placeholder) |
|
| 57 | 57 | { |
| 58 | - if($placeholder->getCommand() === $command) |
|
| 58 | + if ($placeholder->getCommand() === $command) |
|
| 59 | 59 | { |
| 60 | 60 | return $placeholder; |
| 61 | 61 | } |
@@ -77,9 +77,9 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public function getByID(int $id) : Mailcode_Parser_Safeguard_Placeholder |
| 79 | 79 | { |
| 80 | - foreach($this->placeholders as $placeholder) |
|
| 80 | + foreach ($this->placeholders as $placeholder) |
|
| 81 | 81 | { |
| 82 | - if($placeholder->getID() === $id) |
|
| 82 | + if ($placeholder->getID() === $id) |
|
| 83 | 83 | { |
| 84 | 84 | return $placeholder; |
| 85 | 85 | } |
@@ -104,9 +104,9 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | public function getByString(string $string) : Mailcode_Parser_Safeguard_Placeholder |
| 106 | 106 | { |
| 107 | - foreach($this->placeholders as $placeholder) |
|
| 107 | + foreach ($this->placeholders as $placeholder) |
|
| 108 | 108 | { |
| 109 | - if($placeholder->getReplacementText() === $string) |
|
| 109 | + if ($placeholder->getReplacementText() === $string) |
|
| 110 | 110 | { |
| 111 | 111 | return $placeholder; |
| 112 | 112 | } |
@@ -129,14 +129,14 @@ discard block |
||
| 129 | 129 | */ |
| 130 | 130 | public function getStrings() : array |
| 131 | 131 | { |
| 132 | - if(is_array($this->placeholderStrings)) |
|
| 132 | + if (is_array($this->placeholderStrings)) |
|
| 133 | 133 | { |
| 134 | 134 | return $this->placeholderStrings; |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | $this->placeholderStrings = array(); |
| 138 | 138 | |
| 139 | - foreach($this->placeholders as $placeholder) |
|
| 139 | + foreach ($this->placeholders as $placeholder) |
|
| 140 | 140 | { |
| 141 | 141 | $this->placeholderStrings[] = $placeholder->getReplacementText(); |
| 142 | 142 | } |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | $keywords = $this->params->getInfo()->getKeywords(); |
| 40 | 40 | |
| 41 | - foreach($keywords as $keyword) |
|
| 41 | + foreach ($keywords as $keyword) |
|
| 42 | 42 | { |
| 43 | - if($keyword->isNoHTML()) |
|
| 43 | + if ($keyword->isNoHTML()) |
|
| 44 | 44 | { |
| 45 | 45 | $this->noHTMLToken = $keyword; |
| 46 | 46 | break; |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * @return $this |
| 56 | 56 | * @throws Mailcode_Exception |
| 57 | 57 | */ |
| 58 | - public function setHTMLEnabled(bool $enabled=true) : self |
|
| 58 | + public function setHTMLEnabled(bool $enabled = true) : self |
|
| 59 | 59 | { |
| 60 | 60 | $this->params->getInfo()->setKeywordEnabled(Mailcode_Commands_Keywords::TYPE_NOHTML, !$enabled); |
| 61 | 61 | |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | * |
| 58 | 58 | * @return Mailcode_Factory_CommandSets_Set_If |
| 59 | 59 | */ |
| 60 | - public static function if() : Mailcode_Factory_CommandSets_Set_If |
|
| 60 | + public static function if () : Mailcode_Factory_CommandSets_Set_If |
|
| 61 | 61 | { |
| 62 | 62 | return self::getSets()->if(); |
| 63 | 63 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * |
| 68 | 68 | * @return Mailcode_Factory_CommandSets_Set_ElseIf |
| 69 | 69 | */ |
| 70 | - public static function elseIf() : Mailcode_Factory_CommandSets_Set_ElseIf |
|
| 70 | + public static function elseIf () : Mailcode_Factory_CommandSets_Set_ElseIf |
|
| 71 | 71 | { |
| 72 | 72 | return self::getSets()->elseIf(); |
| 73 | 73 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | protected static function getSets() : Mailcode_Factory_CommandSets |
| 119 | 119 | { |
| 120 | - if(!isset(self::$commandSets)) |
|
| 120 | + if (!isset(self::$commandSets)) |
|
| 121 | 121 | { |
| 122 | 122 | self::$commandSets = new Mailcode_Factory_CommandSets(); |
| 123 | 123 | } |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | { |
| 33 | 33 | $result = array(); |
| 34 | 34 | |
| 35 | - foreach($commands as $command) |
|
| 35 | + foreach ($commands as $command) |
|
| 36 | 36 | { |
| 37 | - if($command instanceof Mailcode_Commands_ShowBase) |
|
| 37 | + if ($command instanceof Mailcode_Commands_ShowBase) |
|
| 38 | 38 | { |
| 39 | 39 | $result[] = $command; |
| 40 | 40 | } |
@@ -56,9 +56,9 @@ discard block |
||
| 56 | 56 | { |
| 57 | 57 | $result = array(); |
| 58 | 58 | |
| 59 | - foreach($commands as $command) |
|
| 59 | + foreach ($commands as $command) |
|
| 60 | 60 | { |
| 61 | - if($command instanceof Mailcode_Interfaces_Commands_ListVariables) |
|
| 61 | + if ($command instanceof Mailcode_Interfaces_Commands_ListVariables) |
|
| 62 | 62 | { |
| 63 | 63 | $result[] = $command; |
| 64 | 64 | } |
@@ -77,9 +77,9 @@ discard block |
||
| 77 | 77 | { |
| 78 | 78 | $result = array(); |
| 79 | 79 | |
| 80 | - foreach($commands as $command) |
|
| 80 | + foreach ($commands as $command) |
|
| 81 | 81 | { |
| 82 | - if($command instanceof Mailcode_Commands_Command_ShowVariable) |
|
| 82 | + if ($command instanceof Mailcode_Commands_Command_ShowVariable) |
|
| 83 | 83 | { |
| 84 | 84 | $result[] = $command; |
| 85 | 85 | } |
@@ -98,9 +98,9 @@ discard block |
||
| 98 | 98 | { |
| 99 | 99 | $result = array(); |
| 100 | 100 | |
| 101 | - foreach($commands as $command) |
|
| 101 | + foreach ($commands as $command) |
|
| 102 | 102 | { |
| 103 | - if($command instanceof Mailcode_Commands_Command_For) |
|
| 103 | + if ($command instanceof Mailcode_Commands_Command_For) |
|
| 104 | 104 | { |
| 105 | 105 | $result[] = $command; |
| 106 | 106 | } |
@@ -119,9 +119,9 @@ discard block |
||
| 119 | 119 | { |
| 120 | 120 | $result = array(); |
| 121 | 121 | |
| 122 | - foreach($commands as $command) |
|
| 122 | + foreach ($commands as $command) |
|
| 123 | 123 | { |
| 124 | - if($command instanceof Mailcode_Commands_Command_ShowDate) |
|
| 124 | + if ($command instanceof Mailcode_Commands_Command_ShowDate) |
|
| 125 | 125 | { |
| 126 | 126 | $result[] = $command; |
| 127 | 127 | } |
@@ -140,9 +140,9 @@ discard block |
||
| 140 | 140 | { |
| 141 | 141 | $result = array(); |
| 142 | 142 | |
| 143 | - foreach($commands as $command) |
|
| 143 | + foreach ($commands as $command) |
|
| 144 | 144 | { |
| 145 | - if($command instanceof Mailcode_Commands_Command_If) |
|
| 145 | + if ($command instanceof Mailcode_Commands_Command_If) |
|
| 146 | 146 | { |
| 147 | 147 | $result[] = $command; |
| 148 | 148 | } |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | public function normalize() : string |
| 39 | 39 | { |
| 40 | - if(!$this->command->isValid()) |
|
| 40 | + if (!$this->command->isValid()) |
|
| 41 | 41 | { |
| 42 | 42 | return ''; |
| 43 | 43 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | private function addType() : void |
| 59 | 59 | { |
| 60 | - if(!$this->command->supportsType() || !$this->command->hasType()) |
|
| 60 | + if (!$this->command->supportsType() || !$this->command->hasType()) |
|
| 61 | 61 | { |
| 62 | 62 | return; |
| 63 | 63 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | $params = $this->getParamsString($command); |
| 71 | 71 | |
| 72 | - if(empty($params)) |
|
| 72 | + if (empty($params)) |
|
| 73 | 73 | { |
| 74 | 74 | return; |
| 75 | 75 | } |
@@ -87,12 +87,12 @@ discard block |
||
| 87 | 87 | { |
| 88 | 88 | $params = $this->getParamsStatement($command); |
| 89 | 89 | |
| 90 | - if($params === null) |
|
| 90 | + if ($params === null) |
|
| 91 | 91 | { |
| 92 | 92 | return ''; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - if($command->hasFreeformParameters()) |
|
| 95 | + if ($command->hasFreeformParameters()) |
|
| 96 | 96 | { |
| 97 | 97 | return $params->getStatementString(); |
| 98 | 98 | } |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | private function addLogicKeywords() : void |
| 104 | 104 | { |
| 105 | - if(!$this->command->supportsLogicKeywords()) |
|
| 105 | + if (!$this->command->supportsLogicKeywords()) |
|
| 106 | 106 | { |
| 107 | 107 | return; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | $keywords = $this->command->getLogicKeywords()->getKeywords(); |
| 111 | 111 | |
| 112 | - foreach($keywords as $keyword) |
|
| 112 | + foreach ($keywords as $keyword) |
|
| 113 | 113 | { |
| 114 | 114 | $this->parts[] = ' '; |
| 115 | 115 | $this->parts[] = $keyword->getKeywordString(); // e.g. "if variable" |