@@ -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 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | $total = count($matches[0]); |
| 71 | 71 | |
| 72 | - for($i=0; $i < $total; $i++) |
|
| 72 | + for ($i = 0; $i < $total; $i++) |
|
| 73 | 73 | { |
| 74 | 74 | $match = $this->parseMatch($matches, $i); |
| 75 | 75 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | { |
| 92 | 92 | $name = $match->getName(); |
| 93 | 93 | |
| 94 | - if(!$this->commands->nameExists($name)) |
|
| 94 | + if (!$this->commands->nameExists($name)) |
|
| 95 | 95 | { |
| 96 | 96 | $collection->addErrorMessage( |
| 97 | 97 | $match->getMatchedString(), |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | $match->getMatchedString() |
| 109 | 109 | ); |
| 110 | 110 | |
| 111 | - if($cmd->isValid()) |
|
| 111 | + if ($cmd->isValid()) |
|
| 112 | 112 | { |
| 113 | 113 | $collection->addCommand($cmd); |
| 114 | 114 | return; |
@@ -138,16 +138,16 @@ discard block |
||
| 138 | 138 | // 5 = parameter type command, type |
| 139 | 139 | // 6 = parameter type command, params |
| 140 | 140 | |
| 141 | - if(!empty($matches[1][$index])) |
|
| 141 | + if (!empty($matches[1][$index])) |
|
| 142 | 142 | { |
| 143 | 143 | $name = $matches[1][$index]; |
| 144 | 144 | } |
| 145 | - else if(!empty($matches[2][$index])) |
|
| 145 | + else if (!empty($matches[2][$index])) |
|
| 146 | 146 | { |
| 147 | 147 | $name = $matches[2][$index]; |
| 148 | 148 | $params = $matches[3][$index]; |
| 149 | 149 | } |
| 150 | - else if(!empty($matches[4][$index])) |
|
| 150 | + else if (!empty($matches[4][$index])) |
|
| 151 | 151 | { |
| 152 | 152 | $name = $matches[4][$index]; |
| 153 | 153 | $type = $matches[5][$index]; |
@@ -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]; |
@@ -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 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | */ |
| 109 | 109 | public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard |
| 110 | 110 | { |
| 111 | - if(empty($delimiter)) |
|
| 111 | + if (empty($delimiter)) |
|
| 112 | 112 | { |
| 113 | 113 | throw new Mailcode_Exception( |
| 114 | 114 | 'Empty delimiter', |
@@ -149,17 +149,17 @@ discard block |
||
| 149 | 149 | * @param bool $highlighted |
| 150 | 150 | * @return string[]string |
| 151 | 151 | */ |
| 152 | - protected function getReplaces(bool $highlighted=false) : array |
|
| 152 | + protected function getReplaces(bool $highlighted = false) : array |
|
| 153 | 153 | { |
| 154 | 154 | $placeholders = $this->getPlaceholders(); |
| 155 | 155 | |
| 156 | 156 | $replaces = array(); |
| 157 | 157 | |
| 158 | - foreach($placeholders as $placeholder) |
|
| 158 | + foreach ($placeholders as $placeholder) |
|
| 159 | 159 | { |
| 160 | 160 | $replace = ''; |
| 161 | 161 | |
| 162 | - if($highlighted) |
|
| 162 | + if ($highlighted) |
|
| 163 | 163 | { |
| 164 | 164 | $replace = $placeholder->getHighlightedText(); |
| 165 | 165 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | */ |
| 184 | 184 | public function getPlaceholders() |
| 185 | 185 | { |
| 186 | - if(isset($this->placeholders)) |
|
| 186 | + if (isset($this->placeholders)) |
|
| 187 | 187 | { |
| 188 | 188 | return $this->placeholders; |
| 189 | 189 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | $cmds = $this->getCollection()->getCommands(); |
| 194 | 194 | |
| 195 | - foreach($cmds as $command) |
|
| 195 | + foreach ($cmds as $command) |
|
| 196 | 196 | { |
| 197 | 197 | self::$counter++; |
| 198 | 198 | |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | return $this->placeholders; |
| 207 | 207 | } |
| 208 | 208 | |
| 209 | - protected function restore(string $string, bool $highlighted=false) : string |
|
| 209 | + protected function restore(string $string, bool $highlighted = false) : string |
|
| 210 | 210 | { |
| 211 | 211 | $this->requireValidCollection(); |
| 212 | 212 | |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | $placeholderStrings = array_keys($replaces); |
| 216 | 216 | |
| 217 | - foreach($placeholderStrings as $search) |
|
| 217 | + foreach ($placeholderStrings as $search) |
|
| 218 | 218 | { |
| 219 | - if(!strstr($string, $search)) |
|
| 219 | + if (!strstr($string, $search)) |
|
| 220 | 220 | { |
| 221 | 221 | throw new Mailcode_Exception( |
| 222 | 222 | 'Command placeholder not found', |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | */ |
| 275 | 275 | public function getCollection() : Mailcode_Collection |
| 276 | 276 | { |
| 277 | - if(isset($this->collection)) |
|
| 277 | + if (isset($this->collection)) |
|
| 278 | 278 | { |
| 279 | 279 | return $this->collection; |
| 280 | 280 | } |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | */ |
| 297 | 297 | protected function requireValidCollection() : void |
| 298 | 298 | { |
| 299 | - if($this->getCollection()->isValid()) |
|
| 299 | + if ($this->getCollection()->isValid()) |
|
| 300 | 300 | { |
| 301 | 301 | return; |
| 302 | 302 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public function getParser() : Mailcode_Parser |
| 70 | 70 | { |
| 71 | - if(!isset($this->parser)) |
|
| 71 | + if (!isset($this->parser)) |
|
| 72 | 72 | { |
| 73 | 73 | $this->parser = new Mailcode_Parser($this); |
| 74 | 74 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | */ |
| 85 | 85 | public function getCommands() : Mailcode_Commands |
| 86 | 86 | { |
| 87 | - if(!isset($this->commands)) |
|
| 87 | + if (!isset($this->commands)) |
|
| 88 | 88 | { |
| 89 | 89 | $this->commands = new Mailcode_Commands(); |
| 90 | 90 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | |
| 111 | 111 | public function createVariables() : Mailcode_Variables |
| 112 | 112 | { |
| 113 | - if(!isset($this->variables)) |
|
| 113 | + if (!isset($this->variables)) |
|
| 114 | 114 | { |
| 115 | 115 | $this->variables = new Mailcode_Variables(); |
| 116 | 116 | } |
@@ -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 | } |
@@ -35,12 +35,12 @@ |
||
| 35 | 35 | $matches = array(); |
| 36 | 36 | preg_match_all(self::REGEX_VARIABLE_NAME, $subject, $matches, PREG_PATTERN_ORDER); |
| 37 | 37 | |
| 38 | - if(!isset($matches[0]) || empty($matches[0])) |
|
| 38 | + if (!isset($matches[0]) || empty($matches[0])) |
|
| 39 | 39 | { |
| 40 | 40 | return $collection; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - foreach($matches[0] as $idx => $matchedText) |
|
| 43 | + foreach ($matches[0] as $idx => $matchedText) |
|
| 44 | 44 | { |
| 45 | 45 | $path = $matches[1][$idx]; |
| 46 | 46 | $name = $matches[2][$idx]; |