@@ -33,11 +33,11 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | $keywords = $command->getLogicKeywords()->getKeywords(); |
| 35 | 35 | |
| 36 | - foreach($keywords as $keyword) |
|
| 36 | + foreach ($keywords as $keyword) |
|
| 37 | 37 | { |
| 38 | 38 | $keyCommand = $keyword->getCommand(); |
| 39 | 39 | |
| 40 | - if($keyCommand instanceof Mailcode_Commands_IfBase) |
|
| 40 | + if ($keyCommand instanceof Mailcode_Commands_IfBase) |
|
| 41 | 41 | { |
| 42 | 42 | $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand); |
| 43 | 43 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | protected function getSign(Mailcode_Commands_LogicKeywords_Keyword $keyword) : string |
| 62 | 62 | { |
| 63 | - switch($keyword->getName()) |
|
| 63 | + switch ($keyword->getName()) |
|
| 64 | 64 | { |
| 65 | 65 | case 'and': |
| 66 | 66 | return '&&'; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | { |
| 84 | 84 | $sign = ''; |
| 85 | 85 | |
| 86 | - if($notEmpty) |
|
| 86 | + if ($notEmpty) |
|
| 87 | 87 | { |
| 88 | 88 | $sign = '!'; |
| 89 | 89 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | { |
| 100 | 100 | $params = $command->getParams(); |
| 101 | 101 | |
| 102 | - if(!$params) |
|
| 102 | + if (!$params) |
|
| 103 | 103 | { |
| 104 | 104 | return ''; |
| 105 | 105 | } |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | protected function _translateContains(Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string |
| 121 | 121 | { |
| 122 | 122 | $opts = 's'; |
| 123 | - if($caseSensitive) |
|
| 123 | + if ($caseSensitive) |
|
| 124 | 124 | { |
| 125 | 125 | $opts = 'is'; |
| 126 | 126 | } |
@@ -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 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | { |
| 88 | 88 | $string = $this->name; |
| 89 | 89 | |
| 90 | - if(!empty($this->keywordType)) |
|
| 90 | + if (!empty($this->keywordType)) |
|
| 91 | 91 | { |
| 92 | 92 | $string .= ' '.$this->keywordType; |
| 93 | 93 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | */ |
| 116 | 116 | public function setParamsString(string $params) : void |
| 117 | 117 | { |
| 118 | - if($this->paramsSet) |
|
| 118 | + if ($this->paramsSet) |
|
| 119 | 119 | { |
| 120 | 120 | throw new Mailcode_Exception( |
| 121 | 121 | 'Cannot set parameters twice', |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | ); |
| 150 | 150 | |
| 151 | 151 | // automatically close opening commands to be able to parse valid strings. |
| 152 | - if($command instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 152 | + if ($command instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 153 | 153 | { |
| 154 | 154 | $string .= '{end}'; |
| 155 | 155 | } |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | { |
| 162 | 162 | $this->collection = Mailcode::create()->parseString($this->getCommandString()); |
| 163 | 163 | |
| 164 | - if(!$this->collection->isValid()) |
|
| 164 | + if (!$this->collection->isValid()) |
|
| 165 | 165 | { |
| 166 | 166 | $error = $this->collection->getFirstError(); |
| 167 | 167 | |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | { |
| 180 | 180 | $command = $this->collection->getFirstCommand(); |
| 181 | 181 | |
| 182 | - if($this->collection->isValid() && $command !== null) |
|
| 182 | + if ($this->collection->isValid() && $command !== null) |
|
| 183 | 183 | { |
| 184 | 184 | return $command; |
| 185 | 185 | } |