@@ -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 | } |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | { |
| 38 | 38 | static $ids = array(); |
| 39 | 39 | |
| 40 | - if(empty($ids)) { |
|
| 40 | + if (empty($ids)) { |
|
| 41 | 41 | $ids = \AppUtils\FileHelper::createFileFinder(__DIR__.'/Commands/Command') |
| 42 | 42 | ->getPHPClassNames(); |
| 43 | 43 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function getAll() |
| 56 | 56 | { |
| 57 | - if(!empty($this->commands)) { |
|
| 57 | + if (!empty($this->commands)) { |
|
| 58 | 58 | return $this->commands; |
| 59 | 59 | } |
| 60 | 60 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $result = array(); |
| 64 | 64 | |
| 65 | - foreach($ids as $id) |
|
| 65 | + foreach ($ids as $id) |
|
| 66 | 66 | { |
| 67 | 67 | $result[] = $this->getByID($id); |
| 68 | 68 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | { |
| 88 | 88 | static $instances = array(); |
| 89 | 89 | |
| 90 | - if(!isset($instances[$id])) |
|
| 90 | + if (!isset($instances[$id])) |
|
| 91 | 91 | { |
| 92 | 92 | $instances[$id] = $this->createCommand($id, '__dummy', '', ''); |
| 93 | 93 | } |
@@ -108,9 +108,9 @@ discard block |
||
| 108 | 108 | { |
| 109 | 109 | $items = $this->getAll(); |
| 110 | 110 | |
| 111 | - foreach($items as $item) |
|
| 111 | + foreach ($items as $item) |
|
| 112 | 112 | { |
| 113 | - if($item->getName() === $name) { |
|
| 113 | + if ($item->getName() === $name) { |
|
| 114 | 114 | return $item->getID(); |
| 115 | 115 | } |
| 116 | 116 | } |
@@ -142,9 +142,9 @@ discard block |
||
| 142 | 142 | { |
| 143 | 143 | $items = $this->getAll(); |
| 144 | 144 | |
| 145 | - foreach($items as $item) |
|
| 145 | + foreach ($items as $item) |
|
| 146 | 146 | { |
| 147 | - if($item->getName() === $name) { |
|
| 147 | + if ($item->getName() === $name) { |
|
| 148 | 148 | return true; |
| 149 | 149 | } |
| 150 | 150 | } |
@@ -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 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | */ |
| 116 | 116 | public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard |
| 117 | 117 | { |
| 118 | - if(empty($delimiter)) |
|
| 118 | + if (empty($delimiter)) |
|
| 119 | 119 | { |
| 120 | 120 | throw new Mailcode_Exception( |
| 121 | 121 | 'Empty delimiter', |
@@ -156,17 +156,17 @@ discard block |
||
| 156 | 156 | * @param bool $highlighted |
| 157 | 157 | * @return string[]string |
| 158 | 158 | */ |
| 159 | - protected function getReplaces(bool $highlighted=false) : array |
|
| 159 | + protected function getReplaces(bool $highlighted = false) : array |
|
| 160 | 160 | { |
| 161 | 161 | $placeholders = $this->getPlaceholders(); |
| 162 | 162 | |
| 163 | 163 | $replaces = array(); |
| 164 | 164 | |
| 165 | - foreach($placeholders as $placeholder) |
|
| 165 | + foreach ($placeholders as $placeholder) |
|
| 166 | 166 | { |
| 167 | 167 | $replace = ''; |
| 168 | 168 | |
| 169 | - if($highlighted) |
|
| 169 | + if ($highlighted) |
|
| 170 | 170 | { |
| 171 | 171 | $replace = $placeholder->getHighlightedText(); |
| 172 | 172 | } |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | */ |
| 191 | 191 | public function getPlaceholders() |
| 192 | 192 | { |
| 193 | - if(isset($this->placeholders)) |
|
| 193 | + if (isset($this->placeholders)) |
|
| 194 | 194 | { |
| 195 | 195 | return $this->placeholders; |
| 196 | 196 | } |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | |
| 200 | 200 | $cmds = $this->getCollection()->getGroupedByHash(); |
| 201 | 201 | |
| 202 | - foreach($cmds as $command) |
|
| 202 | + foreach ($cmds as $command) |
|
| 203 | 203 | { |
| 204 | 204 | self::$counter++; |
| 205 | 205 | |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | return $this->placeholders; |
| 214 | 214 | } |
| 215 | 215 | |
| 216 | - protected function restore(string $string, bool $highlighted=false) : string |
|
| 216 | + protected function restore(string $string, bool $highlighted = false) : string |
|
| 217 | 217 | { |
| 218 | 218 | $this->requireValidCollection(); |
| 219 | 219 | |
@@ -221,9 +221,9 @@ discard block |
||
| 221 | 221 | |
| 222 | 222 | $placeholderStrings = array_keys($replaces); |
| 223 | 223 | |
| 224 | - foreach($placeholderStrings as $search) |
|
| 224 | + foreach ($placeholderStrings as $search) |
|
| 225 | 225 | { |
| 226 | - if(!strstr($string, $search)) |
|
| 226 | + if (!strstr($string, $search)) |
|
| 227 | 227 | { |
| 228 | 228 | throw new Mailcode_Exception( |
| 229 | 229 | 'Command placeholder not found', |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | */ |
| 282 | 282 | public function getCollection() : Mailcode_Collection |
| 283 | 283 | { |
| 284 | - if(isset($this->collection)) |
|
| 284 | + if (isset($this->collection)) |
|
| 285 | 285 | { |
| 286 | 286 | return $this->collection; |
| 287 | 287 | } |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | */ |
| 304 | 304 | protected function requireValidCollection() : void |
| 305 | 305 | { |
| 306 | - if($this->getCollection()->isValid()) |
|
| 306 | + if ($this->getCollection()->isValid()) |
|
| 307 | 307 | { |
| 308 | 308 | return; |
| 309 | 309 | } |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | */ |
| 326 | 326 | public function getPlaceholderStrings() : array |
| 327 | 327 | { |
| 328 | - if(isset($this->placeholderStrings)) |
|
| 328 | + if (isset($this->placeholderStrings)) |
|
| 329 | 329 | { |
| 330 | 330 | return $this->placeholderStrings; |
| 331 | 331 | } |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | |
| 335 | 335 | $this->placeholderStrings = array(); |
| 336 | 336 | |
| 337 | - foreach($placeholders as $placeholder) |
|
| 337 | + foreach ($placeholders as $placeholder) |
|
| 338 | 338 | { |
| 339 | 339 | $this->placeholderStrings[] = $placeholder->getReplacementText(); |
| 340 | 340 | } |
@@ -360,9 +360,9 @@ discard block |
||
| 360 | 360 | { |
| 361 | 361 | $placeholders = $this->getPlaceholders(); |
| 362 | 362 | |
| 363 | - foreach($placeholders as $placeholder) |
|
| 363 | + foreach ($placeholders as $placeholder) |
|
| 364 | 364 | { |
| 365 | - if($placeholder->getID() === $id) |
|
| 365 | + if ($placeholder->getID() === $id) |
|
| 366 | 366 | { |
| 367 | 367 | return $placeholder; |
| 368 | 368 | } |
@@ -389,9 +389,9 @@ discard block |
||
| 389 | 389 | { |
| 390 | 390 | $placeholders = $this->getPlaceholders(); |
| 391 | 391 | |
| 392 | - foreach($placeholders as $placeholder) |
|
| 392 | + foreach ($placeholders as $placeholder) |
|
| 393 | 393 | { |
| 394 | - if($placeholder->getReplacementText() === $string) |
|
| 394 | + if ($placeholder->getReplacementText() === $string) |
|
| 395 | 395 | { |
| 396 | 396 | return $placeholder; |
| 397 | 397 | } |
@@ -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.'), |