@@ -20,11 +20,11 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class Mailcode_Factory_CommandSets_Set_Set extends Mailcode_Factory_CommandSets_Set |
| 22 | 22 | { |
| 23 | - public function setVar(string $variableName, string $value, bool $quoteValue=true) : Mailcode_Commands_Command_SetVariable |
|
| 23 | + public function setVar(string $variableName, string $value, bool $quoteValue = true) : Mailcode_Commands_Command_SetVariable |
|
| 24 | 24 | { |
| 25 | 25 | $variableName = $this->instantiator->filterVariableName($variableName); |
| 26 | 26 | |
| 27 | - if($quoteValue) |
|
| 27 | + if ($quoteValue) |
|
| 28 | 28 | { |
| 29 | 29 | $value = $this->instantiator->quoteString($value); |
| 30 | 30 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | $this->instantiator->checkCommand($cmd); |
| 42 | 42 | |
| 43 | - if($cmd instanceof Mailcode_Commands_Command_SetVariable) |
|
| 43 | + if ($cmd instanceof Mailcode_Commands_Command_SetVariable) |
|
| 44 | 44 | { |
| 45 | 45 | return $cmd; |
| 46 | 46 | } |
@@ -35,14 +35,14 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | private $misc; |
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @var Mailcode_Factory_CommandSets_Set_Set |
|
| 40 | - */ |
|
| 38 | + /** |
|
| 39 | + * @var Mailcode_Factory_CommandSets_Set_Set |
|
| 40 | + */ |
|
| 41 | 41 | private $set; |
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @var Mailcode_Factory_CommandSets_Set_ElseIf |
|
| 45 | - */ |
|
| 43 | + /** |
|
| 44 | + * @var Mailcode_Factory_CommandSets_Set_ElseIf |
|
| 45 | + */ |
|
| 46 | 46 | private $elseIf; |
| 47 | 47 | |
| 48 | 48 | public function if() : Mailcode_Factory_CommandSets_Set_If |
@@ -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 | } |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | public function normalize() : string |
| 39 | 39 | { |
| 40 | - if(!$this->command->isValid()) |
|
| 40 | + if (!$this->command->isValid()) |
|
| 41 | 41 | { |
| 42 | 42 | return ''; |
| 43 | 43 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | private function addType() : void |
| 59 | 59 | { |
| 60 | - if(!$this->command->supportsType() || !$this->command->hasType()) |
|
| 60 | + if (!$this->command->supportsType() || !$this->command->hasType()) |
|
| 61 | 61 | { |
| 62 | 62 | return; |
| 63 | 63 | } |
@@ -67,14 +67,14 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | private function addParams(Mailcode_Commands_Command $command) : void |
| 69 | 69 | { |
| 70 | - if(!$command->requiresParameters()) |
|
| 70 | + if (!$command->requiresParameters()) |
|
| 71 | 71 | { |
| 72 | 72 | return; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $params = $command->getParams(); |
| 76 | 76 | |
| 77 | - if($params === null) |
|
| 77 | + if ($params === null) |
|
| 78 | 78 | { |
| 79 | 79 | return; |
| 80 | 80 | } |
@@ -85,14 +85,14 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | private function addLogicKeywords() : void |
| 87 | 87 | { |
| 88 | - if(!$this->command->supportsLogicKeywords()) |
|
| 88 | + if (!$this->command->supportsLogicKeywords()) |
|
| 89 | 89 | { |
| 90 | 90 | return; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | $keywords = $this->command->getLogicKeywords()->getKeywords(); |
| 94 | 94 | |
| 95 | - foreach($keywords as $keyword) |
|
| 95 | + foreach ($keywords as $keyword) |
|
| 96 | 96 | { |
| 97 | 97 | $this->parts[] = ' '; |
| 98 | 98 | $this->parts[] = $keyword->getKeywordString(); // e.g. "if variable" |
@@ -40,8 +40,7 @@ |
||
| 40 | 40 | if($keyCommand instanceof Mailcode_Commands_IfBase) |
| 41 | 41 | { |
| 42 | 42 | $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand); |
| 43 | - } |
|
| 44 | - else |
|
| 43 | + } else |
|
| 45 | 44 | { |
| 46 | 45 | throw new Mailcode_Exception( |
| 47 | 46 | 'Keyword command type does not match expected base class.', |
@@ -117,13 +117,13 @@ |
||
| 117 | 117 | ); |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - /** |
|
| 121 | - * |
|
| 122 | - * @param Mailcode_Variables_Variable $variable |
|
| 123 | - * @param bool $caseSensitive |
|
| 124 | - * @param Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral[] $searchTerms |
|
| 125 | - * @return string |
|
| 126 | - */ |
|
| 120 | + /** |
|
| 121 | + * |
|
| 122 | + * @param Mailcode_Variables_Variable $variable |
|
| 123 | + * @param bool $caseSensitive |
|
| 124 | + * @param Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral[] $searchTerms |
|
| 125 | + * @return string |
|
| 126 | + */ |
|
| 127 | 127 | protected function _translateContains(Mailcode_Variables_Variable $variable, bool $caseSensitive, array $searchTerms) : string |
| 128 | 128 | { |
| 129 | 129 | $parts = array(); |
@@ -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 | } |
@@ -130,12 +130,12 @@ discard block |
||
| 130 | 130 | $varName = $variable->getFullName(); |
| 131 | 131 | |
| 132 | 132 | $opts = 's'; |
| 133 | - if($caseSensitive) |
|
| 133 | + if ($caseSensitive) |
|
| 134 | 134 | { |
| 135 | 135 | $opts = 'is'; |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - foreach($searchTerms as $token) |
|
| 138 | + foreach ($searchTerms as $token) |
|
| 139 | 139 | { |
| 140 | 140 | $parts[] = sprintf( |
| 141 | 141 | '%s.matches("(?%s)%s")', |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | protected function _translateSearch(string $mode, Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string |
| 152 | 152 | { |
| 153 | 153 | $method = $mode.'With'; |
| 154 | - if($caseSensitive) |
|
| 154 | + if ($caseSensitive) |
|
| 155 | 155 | { |
| 156 | 156 | $method = $mode.'WithIgnoreCase'; |
| 157 | 157 | } |
@@ -31,27 +31,27 @@ discard block |
||
| 31 | 31 | const VALIDATION_CANNOT_MIX_LOGIC_KEYWORDS = 60701; |
| 32 | 32 | const VALIDATION_INVALID_SUB_COMMAND = 60702; |
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * @var string |
|
| 36 | - */ |
|
| 34 | + /** |
|
| 35 | + * @var string |
|
| 36 | + */ |
|
| 37 | 37 | private $paramsString; |
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @var string[] |
|
| 41 | - */ |
|
| 39 | + /** |
|
| 40 | + * @var string[] |
|
| 41 | + */ |
|
| 42 | 42 | private $names = array( |
| 43 | 43 | 'and', |
| 44 | 44 | 'or' |
| 45 | 45 | ); |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @var Mailcode_Commands_LogicKeywords_Keyword[] |
|
| 49 | - */ |
|
| 47 | + /** |
|
| 48 | + * @var Mailcode_Commands_LogicKeywords_Keyword[] |
|
| 49 | + */ |
|
| 50 | 50 | private $keywords = array(); |
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @var string |
|
| 54 | - */ |
|
| 52 | + /** |
|
| 53 | + * @var string |
|
| 54 | + */ |
|
| 55 | 55 | private $mainParams = ''; |
| 56 | 56 | |
| 57 | 57 | public function __construct(Mailcode_Commands_Command $command, string $paramsString) |
@@ -136,9 +136,9 @@ discard block |
||
| 136 | 136 | } |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - /** |
|
| 140 | - * @return string[] |
|
| 141 | - */ |
|
| 139 | + /** |
|
| 140 | + * @return string[] |
|
| 141 | + */ |
|
| 142 | 142 | private function detectParameters() : array |
| 143 | 143 | { |
| 144 | 144 | $params = $this->paramsString; |
@@ -156,13 +156,13 @@ discard block |
||
| 156 | 156 | return $stack; |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | - /** |
|
| 160 | - * @param string $params |
|
| 161 | - * @param Mailcode_Commands_LogicKeywords_Keyword $keyword |
|
| 162 | - * @param string[] $stack |
|
| 163 | - * @throws Mailcode_Exception |
|
| 164 | - * @return string |
|
| 165 | - */ |
|
| 159 | + /** |
|
| 160 | + * @param string $params |
|
| 161 | + * @param Mailcode_Commands_LogicKeywords_Keyword $keyword |
|
| 162 | + * @param string[] $stack |
|
| 163 | + * @throws Mailcode_Exception |
|
| 164 | + * @return string |
|
| 165 | + */ |
|
| 166 | 166 | private function detectParamsKeyword(string $params, Mailcode_Commands_LogicKeywords_Keyword $keyword, array &$stack) : string |
| 167 | 167 | { |
| 168 | 168 | $search = $keyword->getMatchedString(); |
@@ -187,22 +187,22 @@ discard block |
||
| 187 | 187 | return $params; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | - /** |
|
| 191 | - * Extracts the parameters string to use for the |
|
| 192 | - * original command itself, omitting all the logic |
|
| 193 | - * keywords for the sub-commands. |
|
| 194 | - * |
|
| 195 | - * @return string |
|
| 196 | - */ |
|
| 190 | + /** |
|
| 191 | + * Extracts the parameters string to use for the |
|
| 192 | + * original command itself, omitting all the logic |
|
| 193 | + * keywords for the sub-commands. |
|
| 194 | + * |
|
| 195 | + * @return string |
|
| 196 | + */ |
|
| 197 | 197 | public function getMainParamsString() : string |
| 198 | 198 | { |
| 199 | 199 | return $this->mainParams; |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - /** |
|
| 203 | - * Retrieves the detected keyword names. |
|
| 204 | - * @return string[] |
|
| 205 | - */ |
|
| 202 | + /** |
|
| 203 | + * Retrieves the detected keyword names. |
|
| 204 | + * @return string[] |
|
| 205 | + */ |
|
| 206 | 206 | public function getDetectedNames() : array |
| 207 | 207 | { |
| 208 | 208 | $names = array(); |
@@ -220,23 +220,23 @@ discard block |
||
| 220 | 220 | return $names; |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | - /** |
|
| 224 | - * Retrieves all keywords that were detected in the |
|
| 225 | - * command's parameters string, if any. |
|
| 226 | - * |
|
| 227 | - * @return Mailcode_Commands_LogicKeywords_Keyword[] |
|
| 228 | - */ |
|
| 223 | + /** |
|
| 224 | + * Retrieves all keywords that were detected in the |
|
| 225 | + * command's parameters string, if any. |
|
| 226 | + * |
|
| 227 | + * @return Mailcode_Commands_LogicKeywords_Keyword[] |
|
| 228 | + */ |
|
| 229 | 229 | public function getKeywords() : array |
| 230 | 230 | { |
| 231 | 231 | return $this->keywords; |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - /** |
|
| 235 | - * Detects any keyword statements in the parameters by keyword name. |
|
| 236 | - * |
|
| 237 | - * @param string $name |
|
| 238 | - * @return Mailcode_Commands_LogicKeywords_Keyword[] |
|
| 239 | - */ |
|
| 234 | + /** |
|
| 235 | + * Detects any keyword statements in the parameters by keyword name. |
|
| 236 | + * |
|
| 237 | + * @param string $name |
|
| 238 | + * @return Mailcode_Commands_LogicKeywords_Keyword[] |
|
| 239 | + */ |
|
| 240 | 240 | private function detectKeywords(string $name) : array |
| 241 | 241 | { |
| 242 | 242 | $regex = sprintf('/%1$s\s+([a-z\-0-9]+):|%1$s:/x', $name); |
@@ -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 | } |
@@ -24,14 +24,14 @@ discard block |
||
| 24 | 24 | { |
| 25 | 25 | const ERROR_CSS_FILE_NOT_FOUND = 60901; |
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * @var string |
|
| 29 | - */ |
|
| 27 | + /** |
|
| 28 | + * @var string |
|
| 29 | + */ |
|
| 30 | 30 | private $path; |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @var string |
|
| 34 | - */ |
|
| 32 | + /** |
|
| 33 | + * @var string |
|
| 34 | + */ |
|
| 35 | 35 | private $fileName = 'highlight.css'; |
| 36 | 36 | |
| 37 | 37 | public function __construct() |
@@ -54,22 +54,22 @@ discard block |
||
| 54 | 54 | $this->path = $path; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * Retrieves the raw CSS source for the highlighting. |
|
| 59 | - * |
|
| 60 | - * @return string |
|
| 61 | - */ |
|
| 57 | + /** |
|
| 58 | + * Retrieves the raw CSS source for the highlighting. |
|
| 59 | + * |
|
| 60 | + * @return string |
|
| 61 | + */ |
|
| 62 | 62 | public function getCSS() : string |
| 63 | 63 | { |
| 64 | 64 | return FileHelper::readContents($this->path); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * Retrieves a fully formed `code` tag with the CSS, |
|
| 69 | - * to inject inline into an HTML document. |
|
| 70 | - * |
|
| 71 | - * @return string |
|
| 72 | - */ |
|
| 67 | + /** |
|
| 68 | + * Retrieves a fully formed `code` tag with the CSS, |
|
| 69 | + * to inject inline into an HTML document. |
|
| 70 | + * |
|
| 71 | + * @return string |
|
| 72 | + */ |
|
| 73 | 73 | public function getStyleTag() : string |
| 74 | 74 | { |
| 75 | 75 | return sprintf( |
@@ -78,23 +78,23 @@ discard block |
||
| 78 | 78 | ); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * Retrieves the path to the stylesheet file. |
|
| 83 | - * |
|
| 84 | - * @return string |
|
| 85 | - */ |
|
| 81 | + /** |
|
| 82 | + * Retrieves the path to the stylesheet file. |
|
| 83 | + * |
|
| 84 | + * @return string |
|
| 85 | + */ |
|
| 86 | 86 | public function getStylesheetPath() : string |
| 87 | 87 | { |
| 88 | 88 | return $this->path; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - /** |
|
| 92 | - * Retrieves the URL to the stylesheet file, given the |
|
| 93 | - * local URL to the application's vendor folder. |
|
| 94 | - * |
|
| 95 | - * @param string $vendorURL The URL to the vendor folder (must be accessible in the webroot). |
|
| 96 | - * @return string |
|
| 97 | - */ |
|
| 91 | + /** |
|
| 92 | + * Retrieves the URL to the stylesheet file, given the |
|
| 93 | + * local URL to the application's vendor folder. |
|
| 94 | + * |
|
| 95 | + * @param string $vendorURL The URL to the vendor folder (must be accessible in the webroot). |
|
| 96 | + * @return string |
|
| 97 | + */ |
|
| 98 | 98 | public function getStylesheetURL(string $vendorURL) : string |
| 99 | 99 | { |
| 100 | 100 | return sprintf( |
@@ -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', |
@@ -29,39 +29,39 @@ discard block |
||
| 29 | 29 | const VALIDATION_NO_COMMAND_CREATED = 61101; |
| 30 | 30 | const VALIDATION_INVALID_COMMAND_CREATED = 61102; |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @var Mailcode_Commands_LogicKeywords |
|
| 34 | - */ |
|
| 32 | + /** |
|
| 33 | + * @var Mailcode_Commands_LogicKeywords |
|
| 34 | + */ |
|
| 35 | 35 | private $keywords; |
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @var string |
|
| 39 | - */ |
|
| 37 | + /** |
|
| 38 | + * @var string |
|
| 39 | + */ |
|
| 40 | 40 | private $name; |
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @var string |
|
| 44 | - */ |
|
| 42 | + /** |
|
| 43 | + * @var string |
|
| 44 | + */ |
|
| 45 | 45 | private $keywordType; |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @var string |
|
| 49 | - */ |
|
| 47 | + /** |
|
| 48 | + * @var string |
|
| 49 | + */ |
|
| 50 | 50 | private $matchedString; |
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @var string |
|
| 54 | - */ |
|
| 52 | + /** |
|
| 53 | + * @var string |
|
| 54 | + */ |
|
| 55 | 55 | private $params = ''; |
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * @var boolean |
|
| 59 | - */ |
|
| 57 | + /** |
|
| 58 | + * @var boolean |
|
| 59 | + */ |
|
| 60 | 60 | private $paramsSet = false; |
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * @var Mailcode_Collection |
|
| 64 | - */ |
|
| 62 | + /** |
|
| 63 | + * @var Mailcode_Collection |
|
| 64 | + */ |
|
| 65 | 65 | private $collection; |
| 66 | 66 | |
| 67 | 67 | public function __construct(Mailcode_Commands_LogicKeywords $keywords, string $name, string $matchedString, string $type) |
@@ -72,10 +72,10 @@ discard block |
||
| 72 | 72 | $this->matchedString = $matchedString; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * The keyword name, e.g. "and". Always lowercase. |
|
| 77 | - * @return string |
|
| 78 | - */ |
|
| 75 | + /** |
|
| 76 | + * The keyword name, e.g. "and". Always lowercase. |
|
| 77 | + * @return string |
|
| 78 | + */ |
|
| 79 | 79 | public function getName() : string |
| 80 | 80 | { |
| 81 | 81 | return $this->name; |
@@ -98,24 +98,24 @@ discard block |
||
| 98 | 98 | return $string; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - /** |
|
| 102 | - * The full string that was matched in the command's parameters |
|
| 103 | - * string. Examples: "and:", "and variable:"... |
|
| 104 | - * |
|
| 105 | - * @return string |
|
| 106 | - */ |
|
| 101 | + /** |
|
| 102 | + * The full string that was matched in the command's parameters |
|
| 103 | + * string. Examples: "and:", "and variable:"... |
|
| 104 | + * |
|
| 105 | + * @return string |
|
| 106 | + */ |
|
| 107 | 107 | public function getMatchedString() : string |
| 108 | 108 | { |
| 109 | 109 | return $this->matchedString; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - /** |
|
| 113 | - * Sets the parameters string matching this logic keyword, |
|
| 114 | - * which is used to build the actual sub-command. Set by |
|
| 115 | - * the LogicKeywords class instance. |
|
| 116 | - * |
|
| 117 | - * @param string $params |
|
| 118 | - */ |
|
| 112 | + /** |
|
| 113 | + * Sets the parameters string matching this logic keyword, |
|
| 114 | + * which is used to build the actual sub-command. Set by |
|
| 115 | + * the LogicKeywords class instance. |
|
| 116 | + * |
|
| 117 | + * @param string $params |
|
| 118 | + */ |
|
| 119 | 119 | public function setParamsString(string $params) : void |
| 120 | 120 | { |
| 121 | 121 | if($this->paramsSet) |
@@ -133,13 +133,13 @@ discard block |
||
| 133 | 133 | $this->createCommand(); |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - /** |
|
| 137 | - * Retrieves the full command string used to create |
|
| 138 | - * the actual command. For opening commands like IF, |
|
| 139 | - * this includes the closing {end} command. |
|
| 140 | - * |
|
| 141 | - * @return string |
|
| 142 | - */ |
|
| 136 | + /** |
|
| 137 | + * Retrieves the full command string used to create |
|
| 138 | + * the actual command. For opening commands like IF, |
|
| 139 | + * this includes the closing {end} command. |
|
| 140 | + * |
|
| 141 | + * @return string |
|
| 142 | + */ |
|
| 143 | 143 | public function getCommandString() : string |
| 144 | 144 | { |
| 145 | 145 | $string = sprintf( |
@@ -182,12 +182,12 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | - /** |
|
| 186 | - * Retrieves the command for the keyword. |
|
| 187 | - * |
|
| 188 | - * @throws Mailcode_Exception |
|
| 189 | - * @return Mailcode_Commands_Command |
|
| 190 | - */ |
|
| 185 | + /** |
|
| 186 | + * Retrieves the command for the keyword. |
|
| 187 | + * |
|
| 188 | + * @throws Mailcode_Exception |
|
| 189 | + * @return Mailcode_Commands_Command |
|
| 190 | + */ |
|
| 191 | 191 | public function getCommand() : Mailcode_Commands_Command |
| 192 | 192 | { |
| 193 | 193 | $command = $this->collection->getFirstCommand(); |
@@ -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 | } |
@@ -20,19 +20,19 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class Mailcode_Commands_Highlighter |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * @var Mailcode_Commands_Command |
|
| 25 | - */ |
|
| 23 | + /** |
|
| 24 | + * @var Mailcode_Commands_Command |
|
| 25 | + */ |
|
| 26 | 26 | protected $command; |
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * @var string[] |
|
| 30 | - */ |
|
| 28 | + /** |
|
| 29 | + * @var string[] |
|
| 30 | + */ |
|
| 31 | 31 | protected $parts = array(); |
| 32 | 32 | |
| 33 | 33 | public function __construct(Mailcode_Commands_Command $command) |
| 34 | 34 | { |
| 35 | - $this->command = $command; |
|
| 35 | + $this->command = $command; |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | public function highlight() : string |
@@ -121,11 +121,11 @@ discard block |
||
| 121 | 121 | $this->appendParams($keyword->getCommand()); |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - /** |
|
| 125 | - * @param string[] $classes |
|
| 126 | - * @param string $content |
|
| 127 | - * @return string |
|
| 128 | - */ |
|
| 124 | + /** |
|
| 125 | + * @param string[] $classes |
|
| 126 | + * @param string $content |
|
| 127 | + * @return string |
|
| 128 | + */ |
|
| 129 | 129 | protected function renderTag(array $classes, string $content) : string |
| 130 | 130 | { |
| 131 | 131 | $parts = array(); |
@@ -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 | } |
@@ -48,13 +48,13 @@ |
||
| 48 | 48 | <body> |
| 49 | 49 | <p> |
| 50 | 50 | <?php |
| 51 | - pts('This showcases the command\'s syntax highlighting.'); |
|
| 52 | - pts( |
|
| 53 | - 'It is based on the %1$s color scheme%2$s:', |
|
| 54 | - '<a href="https://ethanschoonover.com/solarized/">"Solarized"', |
|
| 55 | - '</a>' |
|
| 56 | - ); |
|
| 57 | - ?> |
|
| 51 | + pts('This showcases the command\'s syntax highlighting.'); |
|
| 52 | + pts( |
|
| 53 | + 'It is based on the %1$s color scheme%2$s:', |
|
| 54 | + '<a href="https://ethanschoonover.com/solarized/">"Solarized"', |
|
| 55 | + '</a>' |
|
| 56 | + ); |
|
| 57 | + ?> |
|
| 58 | 58 | </p> |
| 59 | 59 | <br> |
| 60 | 60 | <div class="commands"> |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $autoload = realpath($root.'/../vendor/autoload.php'); |
| 18 | 18 | |
| 19 | 19 | // we need the autoloader to be present |
| 20 | - if($autoload === false) |
|
| 20 | + if ($autoload === false) |
|
| 21 | 21 | { |
| 22 | 22 | die('<b>ERROR:</b> Autoloader not present. Run composer update first.'); |
| 23 | 23 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | Mailcode_Factory::comment('Some comments here'), |
| 66 | 66 | Mailcode_Factory::showSnippet('snippet_name'), |
| 67 | 67 | Mailcode_Factory::showDate('DATE.VARIABLE'), |
| 68 | - Mailcode_Factory::if('1 + 1 == 2'), |
|
| 68 | + Mailcode_Factory::if ('1 + 1 == 2'), |
|
| 69 | 69 | Mailcode_Factory::ifContains('CUSTOMER.NAME', 'John'), |
| 70 | 70 | Mailcode_Factory::ifVarEquals('NUMBER', 124), |
| 71 | 71 | ); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | $commands[] = Mailcode_Factory::end(); |
| 79 | 79 | |
| 80 | - foreach($commands as $command) |
|
| 80 | + foreach ($commands as $command) |
|
| 81 | 81 | { |
| 82 | 82 | ?> |
| 83 | 83 | <p> |
@@ -65,10 +65,12 @@ |
||
| 65 | 65 | Mailcode_Factory::comment('Some comments here'), |
| 66 | 66 | Mailcode_Factory::showSnippet('snippet_name'), |
| 67 | 67 | Mailcode_Factory::showDate('DATE.VARIABLE'), |
| 68 | - Mailcode_Factory::if('1 + 1 == 2'), |
|
| 68 | + Mailcode_Factory::if('1 + 1 == 2') { |
|
| 69 | + , |
|
| 69 | 70 | Mailcode_Factory::ifContains('CUSTOMER.NAME', 'John'), |
| 70 | 71 | Mailcode_Factory::ifVarEquals('NUMBER', 124), |
| 71 | 72 | ); |
| 73 | + } |
|
| 72 | 74 | |
| 73 | 75 | $and = Mailcode_Factory::elseIfVarEqualsString('STRINGVAR', 'John'); |
| 74 | 76 | $and->getLogicKeywords()->appendOR('$STRINGVAR == "Steve"', "variable"); |