@@ -41,7 +41,7 @@ |
||
41 | 41 | |
42 | 42 | $this->instantiator->checkCommand($cmd); |
43 | 43 | |
44 | - if($cmd instanceof Mailcode_Commands_Command_End) |
|
44 | + if ($cmd instanceof Mailcode_Commands_Command_End) |
|
45 | 45 | { |
46 | 46 | return $cmd; |
47 | 47 | } |
@@ -31,7 +31,7 @@ |
||
31 | 31 | |
32 | 32 | $this->instantiator->checkCommand($cmd); |
33 | 33 | |
34 | - if($cmd instanceof Mailcode_Commands_Command_Else) |
|
34 | + if ($cmd instanceof Mailcode_Commands_Command_Else) |
|
35 | 35 | { |
36 | 36 | return $cmd; |
37 | 37 | } |
@@ -45,9 +45,9 @@ discard block |
||
45 | 45 | */ |
46 | 46 | private $elseIf; |
47 | 47 | |
48 | - public function if() : Mailcode_Factory_CommandSets_Set_If |
|
48 | + public function if () : Mailcode_Factory_CommandSets_Set_If |
|
49 | 49 | { |
50 | - if(!isset($this->if)) |
|
50 | + if (!isset($this->if)) |
|
51 | 51 | { |
52 | 52 | $this->if = new Mailcode_Factory_CommandSets_Set_If(); |
53 | 53 | } |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | return $this->if; |
56 | 56 | } |
57 | 57 | |
58 | - public function elseIf() : Mailcode_Factory_CommandSets_Set_ElseIf |
|
58 | + public function elseIf () : Mailcode_Factory_CommandSets_Set_ElseIf |
|
59 | 59 | { |
60 | - if(!isset($this->elseIf)) |
|
60 | + if (!isset($this->elseIf)) |
|
61 | 61 | { |
62 | 62 | $this->elseIf = new Mailcode_Factory_CommandSets_Set_ElseIf(); |
63 | 63 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | public function show() : Mailcode_Factory_CommandSets_Set_Show |
69 | 69 | { |
70 | - if(!isset($this->show)) |
|
70 | + if (!isset($this->show)) |
|
71 | 71 | { |
72 | 72 | $this->show = new Mailcode_Factory_CommandSets_Set_Show(); |
73 | 73 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | public function misc() : Mailcode_Factory_CommandSets_Set_Misc |
79 | 79 | { |
80 | - if(!isset($this->misc)) |
|
80 | + if (!isset($this->misc)) |
|
81 | 81 | { |
82 | 82 | $this->misc = new Mailcode_Factory_CommandSets_Set_Misc(); |
83 | 83 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | |
88 | 88 | public function set() : Mailcode_Factory_CommandSets_Set_Set |
89 | 89 | { |
90 | - if(!isset($this->set)) |
|
90 | + if (!isset($this->set)) |
|
91 | 91 | { |
92 | 92 | $this->set = new Mailcode_Factory_CommandSets_Set_Set(); |
93 | 93 | } |
@@ -71,9 +71,9 @@ discard block |
||
71 | 71 | |
72 | 72 | private function parse() : void |
73 | 73 | { |
74 | - foreach($this->names as $name) |
|
74 | + foreach ($this->names as $name) |
|
75 | 75 | { |
76 | - if(!stristr($this->paramsString, $name)) |
|
76 | + if (!stristr($this->paramsString, $name)) |
|
77 | 77 | { |
78 | 78 | continue; |
79 | 79 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $names = $this->getDetectedNames(); |
91 | 91 | $amount = count($names); |
92 | 92 | |
93 | - if($amount > 1) |
|
93 | + if ($amount > 1) |
|
94 | 94 | { |
95 | 95 | $this->makeError( |
96 | 96 | t( |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | private function splitParams() : void |
111 | 111 | { |
112 | - if(empty($this->keywords)) |
|
112 | + if (empty($this->keywords)) |
|
113 | 113 | { |
114 | 114 | $this->mainParams = $this->paramsString; |
115 | 115 | |
@@ -118,13 +118,13 @@ discard block |
||
118 | 118 | |
119 | 119 | $params = $this->detectParameters(); |
120 | 120 | |
121 | - foreach($this->keywords as $keyword) |
|
121 | + foreach ($this->keywords as $keyword) |
|
122 | 122 | { |
123 | 123 | $kParams = array_shift($params); |
124 | 124 | |
125 | 125 | $keyword->setParamsString($kParams); |
126 | 126 | |
127 | - if(!$keyword->isValid()) |
|
127 | + if (!$keyword->isValid()) |
|
128 | 128 | { |
129 | 129 | $this->makeError( |
130 | 130 | t('Error #%1$s:', $keyword->getCode()).' '.$keyword->getErrorMessage(), |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | $params = $this->paramsString; |
145 | 145 | $stack = array(); |
146 | 146 | |
147 | - foreach($this->keywords as $keyword) |
|
147 | + foreach ($this->keywords as $keyword) |
|
148 | 148 | { |
149 | 149 | $params = $this->detectParamsKeyword($params, $keyword, $stack); |
150 | 150 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $search = $keyword->getMatchedString(); |
169 | 169 | $pos = strpos($params, $search, 0); |
170 | 170 | |
171 | - if($pos === false) |
|
171 | + if ($pos === false) |
|
172 | 172 | { |
173 | 173 | throw new Mailcode_Exception( |
174 | 174 | 'Keyword matched string not found', |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | $length = strlen($search); |
181 | 181 | |
182 | 182 | $store = substr($params, 0, $pos); |
183 | - $params = trim(substr($params, $pos+$length)); |
|
183 | + $params = trim(substr($params, $pos + $length)); |
|
184 | 184 | |
185 | 185 | $stack[] = $store; |
186 | 186 | |
@@ -207,11 +207,11 @@ discard block |
||
207 | 207 | { |
208 | 208 | $names = array(); |
209 | 209 | |
210 | - foreach($this->keywords as $keyword) |
|
210 | + foreach ($this->keywords as $keyword) |
|
211 | 211 | { |
212 | 212 | $name = $keyword->getName(); |
213 | 213 | |
214 | - if(!in_array($name, $names)) |
|
214 | + if (!in_array($name, $names)) |
|
215 | 215 | { |
216 | 216 | $names[] = $name; |
217 | 217 | } |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | $matches = array(); |
245 | 245 | preg_match_all($regex, $this->paramsString, $matches, PREG_PATTERN_ORDER); |
246 | 246 | |
247 | - if(!isset($matches[0][0]) || empty($matches[0][0])) |
|
247 | + if (!isset($matches[0][0]) || empty($matches[0][0])) |
|
248 | 248 | { |
249 | 249 | return array(); |
250 | 250 | } |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | $amount = count($matches[0]); |
253 | 253 | $result = array(); |
254 | 254 | |
255 | - for($i=0; $i < $amount; $i++) |
|
255 | + for ($i = 0; $i < $amount; $i++) |
|
256 | 256 | { |
257 | 257 | $result[] = $this->createKeyword( |
258 | 258 | $name, |
@@ -269,22 +269,22 @@ discard block |
||
269 | 269 | return !empty($this->keywords); |
270 | 270 | } |
271 | 271 | |
272 | - public function appendAND(string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword |
|
272 | + public function appendAND(string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword |
|
273 | 273 | { |
274 | 274 | return $this->appendKeyword('and', $paramsString, $type); |
275 | 275 | } |
276 | 276 | |
277 | - public function appendOR(string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword |
|
277 | + public function appendOR(string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword |
|
278 | 278 | { |
279 | 279 | return $this->appendKeyword('or', $paramsString, $type); |
280 | 280 | } |
281 | 281 | |
282 | - public function appendKeyword(string $name, string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword |
|
282 | + public function appendKeyword(string $name, string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword |
|
283 | 283 | { |
284 | 284 | $keyword = $this->createKeyword($name, $type); |
285 | 285 | $keyword->setParamsString($paramsString); |
286 | 286 | |
287 | - if(!$keyword->isValid()) |
|
287 | + if (!$keyword->isValid()) |
|
288 | 288 | { |
289 | 289 | throw new Mailcode_Exception( |
290 | 290 | 'Cannot append invalid logic keyword', |
@@ -305,13 +305,13 @@ discard block |
||
305 | 305 | return $keyword; |
306 | 306 | } |
307 | 307 | |
308 | - private function createKeyword(string $name, string $type='', string $matchedString='') : Mailcode_Commands_LogicKeywords_Keyword |
|
308 | + private function createKeyword(string $name, string $type = '', string $matchedString = '') : Mailcode_Commands_LogicKeywords_Keyword |
|
309 | 309 | { |
310 | - if(empty($matchedString)) |
|
310 | + if (empty($matchedString)) |
|
311 | 311 | { |
312 | 312 | $matchedString = $name; |
313 | 313 | |
314 | - if(!empty($type)) |
|
314 | + if (!empty($type)) |
|
315 | 315 | { |
316 | 316 | $matchedString .= ' '.$type; |
317 | 317 | } |
@@ -39,7 +39,7 @@ |
||
39 | 39 | $folder = sprintf(__DIR__.'/../../css/%s', $this->fileName); |
40 | 40 | $path = realpath($folder); |
41 | 41 | |
42 | - if($path === false) |
|
42 | + if ($path === false) |
|
43 | 43 | { |
44 | 44 | throw new Mailcode_Exception( |
45 | 45 | 'Could not find the highlight CSS file', |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | { |
91 | 91 | $string = $this->name; |
92 | 92 | |
93 | - if(!empty($this->keywordType)) |
|
93 | + if (!empty($this->keywordType)) |
|
94 | 94 | { |
95 | 95 | $string .= ' '.$this->keywordType; |
96 | 96 | } |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | */ |
119 | 119 | public function setParamsString(string $params) : void |
120 | 120 | { |
121 | - if($this->paramsSet) |
|
121 | + if ($this->paramsSet) |
|
122 | 122 | { |
123 | 123 | throw new Mailcode_Exception( |
124 | 124 | 'Cannot set parameters twice', |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | |
161 | 161 | $command = $this->collection->getFirstCommand(); |
162 | 162 | |
163 | - if($command === null) |
|
163 | + if ($command === null) |
|
164 | 164 | { |
165 | 165 | $this->makeError( |
166 | 166 | t('No command could be created using the following string:').' '. |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | return; |
173 | 173 | } |
174 | 174 | |
175 | - if(!$command->isValid()) |
|
175 | + if (!$command->isValid()) |
|
176 | 176 | { |
177 | 177 | $this->makeError( |
178 | 178 | t('Invalid command created:').' '. |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | { |
193 | 193 | $command = $this->collection->getFirstCommand(); |
194 | 194 | |
195 | - if($command !== null && $command->isValid()) |
|
195 | + if ($command !== null && $command->isValid()) |
|
196 | 196 | { |
197 | 197 | return $command; |
198 | 198 | } |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | { |
53 | 53 | $this->parts[] = $this->renderTag(array('command-name'), $this->command->getName()); |
54 | 54 | |
55 | - if($this->command->hasType()) |
|
55 | + if ($this->command->hasType()) |
|
56 | 56 | { |
57 | 57 | $this->parts[] = ' '.$this->renderTag(array('command-type'), $this->command->getType()); |
58 | 58 | } |
59 | 59 | |
60 | - if($this->command->requiresParameters()) |
|
60 | + if ($this->command->requiresParameters()) |
|
61 | 61 | { |
62 | 62 | $this->parts[] = $this->renderTag(array('hyphen'), ':'); |
63 | 63 | $this->parts[] = '<wbr>'; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | { |
69 | 69 | $params = $command->getParams(); |
70 | 70 | |
71 | - if($params === null) |
|
71 | + if ($params === null) |
|
72 | 72 | { |
73 | 73 | return; |
74 | 74 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | $this->parts[] = '<span class="mailcode-params">'; |
79 | 79 | |
80 | - foreach($tokens as $token) |
|
80 | + foreach ($tokens as $token) |
|
81 | 81 | { |
82 | 82 | $this->appendParamToken($token); |
83 | 83 | } |
@@ -92,14 +92,14 @@ discard block |
||
92 | 92 | |
93 | 93 | protected function appendLogicKeywords() : void |
94 | 94 | { |
95 | - if(!$this->command->supportsLogicKeywords()) |
|
95 | + if (!$this->command->supportsLogicKeywords()) |
|
96 | 96 | { |
97 | 97 | return; |
98 | 98 | } |
99 | 99 | |
100 | 100 | $keywords = $this->command->getLogicKeywords()->getKeywords(); |
101 | 101 | |
102 | - foreach($keywords as $keyword) |
|
102 | + foreach ($keywords as $keyword) |
|
103 | 103 | { |
104 | 104 | $this->appendLogicKeyword($keyword); |
105 | 105 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | |
112 | 112 | $type = $keyword->getType(); |
113 | 113 | |
114 | - if(!empty($type)) |
|
114 | + if (!empty($type)) |
|
115 | 115 | { |
116 | 116 | $this->parts[] = ' '.$this->renderTag(array('command-type'), $type); |
117 | 117 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | { |
131 | 131 | $parts = array(); |
132 | 132 | |
133 | - foreach($classes as $class) |
|
133 | + foreach ($classes as $class) |
|
134 | 134 | { |
135 | 135 | $parts[] = 'mailcode-'.$class; |
136 | 136 | } |
@@ -82,11 +82,11 @@ |
||
82 | 82 | return $validate; |
83 | 83 | } |
84 | 84 | |
85 | - public function createOperand(string $sign='') : Mailcode_Parser_Statement_Validator_Type_Operand |
|
85 | + public function createOperand(string $sign = '') : Mailcode_Parser_Statement_Validator_Type_Operand |
|
86 | 86 | { |
87 | 87 | $validate = new Mailcode_Parser_Statement_Validator_Type_Operand($this->statement); |
88 | 88 | |
89 | - if(!empty($sign)) |
|
89 | + if (!empty($sign)) |
|
90 | 90 | { |
91 | 91 | $validate->setOperandSign($sign); |
92 | 92 | } |
@@ -72,12 +72,12 @@ discard block |
||
72 | 72 | protected function isMatch(Mailcode_Parser_Statement_Tokenizer_Token $token, int $index) : bool |
73 | 73 | { |
74 | 74 | // filter out tokens of other types |
75 | - if(!is_a($token, $this->getTokenClass())) |
|
75 | + if (!is_a($token, $this->getTokenClass())) |
|
76 | 76 | { |
77 | 77 | return false; |
78 | 78 | } |
79 | 79 | |
80 | - if($this->searchIndex >= 0 && $index !== $this->searchIndex) |
|
80 | + if ($this->searchIndex >= 0 && $index !== $this->searchIndex) |
|
81 | 81 | { |
82 | 82 | return false; |
83 | 83 | } |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | { |
97 | 97 | $tokens = $this->params->getTokens(); |
98 | 98 | |
99 | - foreach($tokens as $index => $token) |
|
99 | + foreach ($tokens as $index => $token) |
|
100 | 100 | { |
101 | - if($this->isMatch($token, $index)) |
|
101 | + if ($this->isMatch($token, $index)) |
|
102 | 102 | { |
103 | 103 | return $token; |
104 | 104 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | { |
112 | 112 | $token = $this->findToken(); |
113 | 113 | |
114 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token && is_a($token, $this->getTokenClass())) |
|
114 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token && is_a($token, $this->getTokenClass())) |
|
115 | 115 | { |
116 | 116 | $this->token = $token; |
117 | 117 | return true; |