@@ -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 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | */ |
24 | 24 | function init() |
25 | 25 | { |
26 | - if(!class_exists('\AppLocalize\Localization')) { |
|
26 | + if (!class_exists('\AppLocalize\Localization')) { |
|
27 | 27 | return; |
28 | 28 | } |
29 | 29 |
@@ -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]; |
@@ -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', |
@@ -145,17 +145,17 @@ discard block |
||
145 | 145 | return str_replace(array_values($replaces), array_keys($replaces), $this->originalString); |
146 | 146 | } |
147 | 147 | |
148 | - protected function getReplaces(bool $highlighted=false) : array |
|
148 | + protected function getReplaces(bool $highlighted = false) : array |
|
149 | 149 | { |
150 | 150 | $placeholders = $this->getPlaceholders(); |
151 | 151 | |
152 | 152 | $replaces = array(); |
153 | 153 | |
154 | - foreach($placeholders as $placeholder) |
|
154 | + foreach ($placeholders as $placeholder) |
|
155 | 155 | { |
156 | 156 | $replace = ''; |
157 | 157 | |
158 | - if($highlighted) |
|
158 | + if ($highlighted) |
|
159 | 159 | { |
160 | 160 | $replace = $placeholder->getHighlightedText(); |
161 | 161 | } |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | */ |
180 | 180 | public function getPlaceholders() |
181 | 181 | { |
182 | - if(isset($this->placeholders)) |
|
182 | + if (isset($this->placeholders)) |
|
183 | 183 | { |
184 | 184 | return $this->placeholders; |
185 | 185 | } |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | |
189 | 189 | $cmds = $this->getCollection()->getCommands(); |
190 | 190 | |
191 | - foreach($cmds as $command) |
|
191 | + foreach ($cmds as $command) |
|
192 | 192 | { |
193 | 193 | self::$counter++; |
194 | 194 | |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | return $this->placeholders; |
203 | 203 | } |
204 | 204 | |
205 | - protected function restore(string $string, bool $highlighted=false) : string |
|
205 | + protected function restore(string $string, bool $highlighted = false) : string |
|
206 | 206 | { |
207 | 207 | $this->requireValidCollection(); |
208 | 208 | |
@@ -210,9 +210,9 @@ discard block |
||
210 | 210 | |
211 | 211 | $placeholderStrings = array_keys($replaces); |
212 | 212 | |
213 | - foreach($placeholderStrings as $search) |
|
213 | + foreach ($placeholderStrings as $search) |
|
214 | 214 | { |
215 | - if(!strstr($string, $search)) |
|
215 | + if (!strstr($string, $search)) |
|
216 | 216 | { |
217 | 217 | throw new Mailcode_Exception( |
218 | 218 | 'Command placeholder not found', |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | */ |
271 | 271 | public function getCollection() : Mailcode_Collection |
272 | 272 | { |
273 | - if(isset($this->collection)) |
|
273 | + if (isset($this->collection)) |
|
274 | 274 | { |
275 | 275 | return $this->collection; |
276 | 276 | } |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | */ |
293 | 293 | protected function requireValidCollection() : void |
294 | 294 | { |
295 | - if($this->getCollection()->isValid()) |
|
295 | + if ($this->getCollection()->isValid()) |
|
296 | 296 | { |
297 | 297 | return; |
298 | 298 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | { |
52 | 52 | $this->parts[] = $this->renderTag(array('command-name'), $this->command->getName()); |
53 | 53 | |
54 | - if($this->command->hasType()) |
|
54 | + if ($this->command->hasType()) |
|
55 | 55 | { |
56 | 56 | $this->parts[] = ' '.$this->renderTag(array('command-type'), $this->command->getType()); |
57 | 57 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | protected function appendParams() |
64 | 64 | { |
65 | - if($this->command->hasParameters()) |
|
65 | + if ($this->command->hasParameters()) |
|
66 | 66 | { |
67 | 67 | $this->parts[] = ' '.$this->renderTag(array('params'), $this->command->getParamsString()); |
68 | 68 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | { |
73 | 73 | $parts = array(); |
74 | 74 | |
75 | - foreach($classes as $class) |
|
75 | + foreach ($classes as $class) |
|
76 | 76 | { |
77 | 77 | $parts[] = 'mailcode-'.$class; |
78 | 78 | } |
@@ -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 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | */ |
60 | 60 | protected $validationResult = null; |
61 | 61 | |
62 | - public function __construct(string $type='', string $paramsString='', string $matchedText='') |
|
62 | + public function __construct(string $type = '', string $paramsString = '', string $matchedText = '') |
|
63 | 63 | { |
64 | 64 | $this->type = $type; |
65 | 65 | $this->paramsString = $paramsString; |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | { |
98 | 98 | $this->requireNonDummy(); |
99 | 99 | |
100 | - if($this->hash === '') { |
|
100 | + if ($this->hash === '') { |
|
101 | 101 | $this->hash = md5($this->matchedText); |
102 | 102 | } |
103 | 103 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | protected function requireNonDummy() : void |
108 | 108 | { |
109 | - if(!$this->isDummy()) |
|
109 | + if (!$this->isDummy()) |
|
110 | 110 | { |
111 | 111 | return; |
112 | 112 | } |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | { |
128 | 128 | $this->requireNonDummy(); |
129 | 129 | |
130 | - if(isset($this->validationResult)) |
|
130 | + if (isset($this->validationResult)) |
|
131 | 131 | { |
132 | 132 | return $this->validationResult; |
133 | 133 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | |
142 | 142 | public function getValidationResult() : \AppUtils\OperationResult |
143 | 143 | { |
144 | - if(isset($this->validationResult)) |
|
144 | + if (isset($this->validationResult)) |
|
145 | 145 | { |
146 | 146 | return $this->validationResult; |
147 | 147 | } |
@@ -164,11 +164,11 @@ discard block |
||
164 | 164 | { |
165 | 165 | $validations = array_merge($this->validations, $this->getValidations()); |
166 | 166 | |
167 | - foreach($validations as $validation) |
|
167 | + foreach ($validations as $validation) |
|
168 | 168 | { |
169 | 169 | $method = 'validateSyntax_'.$validation; |
170 | 170 | |
171 | - if(!method_exists($this, $method)) |
|
171 | + if (!method_exists($this, $method)) |
|
172 | 172 | { |
173 | 173 | throw new Mailcode_Exception( |
174 | 174 | 'Missing validation method', |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $this->$method(); |
185 | 185 | |
186 | 186 | // break off at the first validation issue |
187 | - if(!$this->validationResult->isValid()) |
|
187 | + if (!$this->validationResult->isValid()) |
|
188 | 188 | { |
189 | 189 | return; |
190 | 190 | } |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | |
196 | 196 | protected function validateSyntax_params() |
197 | 197 | { |
198 | - if($this->requiresParameters() && empty($this->paramsString)) |
|
198 | + if ($this->requiresParameters() && empty($this->paramsString)) |
|
199 | 199 | { |
200 | 200 | $this->validationResult->makeError( |
201 | 201 | t('Parameters have to be specified.'), |
@@ -207,14 +207,14 @@ discard block |
||
207 | 207 | |
208 | 208 | protected function validateSyntax_type_supported() |
209 | 209 | { |
210 | - if(!$this->supportsType() || empty($this->type)) |
|
210 | + if (!$this->supportsType() || empty($this->type)) |
|
211 | 211 | { |
212 | 212 | return; |
213 | 213 | } |
214 | 214 | |
215 | 215 | $types = $this->getSupportedTypes(); |
216 | 216 | |
217 | - if(!in_array($this->type, $types)) |
|
217 | + if (!in_array($this->type, $types)) |
|
218 | 218 | { |
219 | 219 | $this->validationResult->makeError( |
220 | 220 | t('The command addon %1$s is not supported.', $this->type).' '. |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | |
229 | 229 | protected function validateSyntax_type_unsupported() |
230 | 230 | { |
231 | - if($this->supportsType() || empty($this->type)) |
|
231 | + if ($this->supportsType() || empty($this->type)) |
|
232 | 232 | { |
233 | 233 | return; |
234 | 234 | } |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | { |
244 | 244 | $vars = $this->getVariables(); |
245 | 245 | |
246 | - if(!$vars->hasInvalid()) |
|
246 | + if (!$vars->hasInvalid()) |
|
247 | 247 | { |
248 | 248 | return; |
249 | 249 | } |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | |
264 | 264 | public function getType() : string |
265 | 265 | { |
266 | - if($this->supportsType()) |
|
266 | + if ($this->supportsType()) |
|
267 | 267 | { |
268 | 268 | return $this->type; |
269 | 269 | } |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | |
290 | 290 | public function getParamsString() : string |
291 | 291 | { |
292 | - if($this->requiresParameters()) |
|
292 | + if ($this->requiresParameters()) |
|
293 | 293 | { |
294 | 294 | return $this->paramsString; |
295 | 295 | } |