@@ -74,11 +74,11 @@ |
||
| 74 | 74 | return new Mailcode_Parser_Statement_Validator_Type_Value($this->statement); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function createOperand(string $sign='') : Mailcode_Parser_Statement_Validator_Type_Operand |
|
| 77 | + public function createOperand(string $sign = '') : Mailcode_Parser_Statement_Validator_Type_Operand |
|
| 78 | 78 | { |
| 79 | 79 | $validate = new Mailcode_Parser_Statement_Validator_Type_Operand($this->statement); |
| 80 | 80 | |
| 81 | - if(!empty($sign)) |
|
| 81 | + if (!empty($sign)) |
|
| 82 | 82 | { |
| 83 | 83 | $validate->setOperandSign($sign); |
| 84 | 84 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | $this->multiline = $val->isValid(); |
| 44 | 44 | |
| 45 | - if($val->isValid()) |
|
| 45 | + if ($val->isValid()) |
|
| 46 | 46 | { |
| 47 | 47 | $this->multilineToken = $val->getToken(); |
| 48 | 48 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | public function getMultilineToken() : ?Mailcode_Parser_Statement_Tokenizer_Token_Keyword |
| 57 | 57 | { |
| 58 | - if($this->multilineToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
| 58 | + if ($this->multilineToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
| 59 | 59 | { |
| 60 | 60 | return $this->multilineToken; |
| 61 | 61 | } |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | $this |
| 42 | 42 | ); |
| 43 | 43 | |
| 44 | - if(!$this->params->isValid() && $this->requiresParameters()) |
|
| 44 | + if (!$this->params->isValid() && $this->requiresParameters()) |
|
| 45 | 45 | { |
| 46 | 46 | $error = $this->params->getValidationResult(); |
| 47 | 47 | |
@@ -40,15 +40,15 @@ |
||
| 40 | 40 | { |
| 41 | 41 | $opening = $this->getOpeningCommand(); |
| 42 | 42 | |
| 43 | - if($opening === null) { |
|
| 43 | + if ($opening === null) { |
|
| 44 | 44 | return array(); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | $siblings = $opening->getSiblingCommands(); |
| 48 | 48 | $result = array(); |
| 49 | - foreach($siblings as $sibling) |
|
| 49 | + foreach ($siblings as $sibling) |
|
| 50 | 50 | { |
| 51 | - if($sibling !== $this) { |
|
| 51 | + if ($sibling !== $this) { |
|
| 52 | 52 | $result[] = $sibling; |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -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,14 +68,14 @@ 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 | } |
| 75 | 75 | |
| 76 | 76 | $tokens = $params->getInfo()->getTokens(); |
| 77 | 77 | |
| 78 | - if(!empty($tokens)) |
|
| 78 | + if (!empty($tokens)) |
|
| 79 | 79 | { |
| 80 | 80 | $this->parts[] = '<span class="mailcode-params">'; |
| 81 | 81 | |
@@ -95,14 +95,14 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | protected function appendLogicKeywords() : void |
| 97 | 97 | { |
| 98 | - if(!$this->command->supportsLogicKeywords()) |
|
| 98 | + if (!$this->command->supportsLogicKeywords()) |
|
| 99 | 99 | { |
| 100 | 100 | return; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | $keywords = $this->command->getLogicKeywords()->getKeywords(); |
| 104 | 104 | |
| 105 | - foreach($keywords as $keyword) |
|
| 105 | + foreach ($keywords as $keyword) |
|
| 106 | 106 | { |
| 107 | 107 | $this->appendLogicKeyword($keyword); |
| 108 | 108 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | $type = $keyword->getType(); |
| 116 | 116 | |
| 117 | - if(!empty($type)) |
|
| 117 | + if (!empty($type)) |
|
| 118 | 118 | { |
| 119 | 119 | $this->parts[] = ' '.$this->renderTag(array('command-type'), $type); |
| 120 | 120 | } |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | { |
| 134 | 134 | $parts = array(); |
| 135 | 135 | |
| 136 | - foreach($classes as $class) |
|
| 136 | + foreach ($classes as $class) |
|
| 137 | 137 | { |
| 138 | 138 | $parts[] = 'mailcode-'.$class; |
| 139 | 139 | } |
@@ -60,11 +60,11 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | $commands = $this->collection->getCommands(); |
| 62 | 62 | |
| 63 | - foreach($commands as $command) |
|
| 63 | + foreach ($commands as $command) |
|
| 64 | 64 | { |
| 65 | 65 | $method = 'validate_'.$command->getCommandType(); |
| 66 | 66 | |
| 67 | - if(!method_exists($this, $method)) |
|
| 67 | + if (!method_exists($this, $method)) |
|
| 68 | 68 | { |
| 69 | 69 | throw new Mailcode_Exception( |
| 70 | 70 | 'Unknown command type validation method.', |
@@ -79,13 +79,13 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | $this->$method($command); |
| 81 | 81 | |
| 82 | - if(!$this->validationResult->isValid()) |
|
| 82 | + if (!$this->validationResult->isValid()) |
|
| 83 | 83 | { |
| 84 | 84 | break; |
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - if($this->validationResult->isValid()) |
|
| 88 | + if ($this->validationResult->isValid()) |
|
| 89 | 89 | { |
| 90 | 90 | $this->validate_Unclosed(); |
| 91 | 91 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | { |
| 98 | 98 | $leftover = $this->getOpenCommand(); |
| 99 | 99 | |
| 100 | - if($leftover === null) |
|
| 100 | + if ($leftover === null) |
|
| 101 | 101 | { |
| 102 | 102 | return; |
| 103 | 103 | } |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | protected function getOpenCommand() : ?Mailcode_Commands_Command_Type_Opening |
| 115 | 115 | { |
| 116 | - if(empty($this->stack)) |
|
| 116 | + if (empty($this->stack)) |
|
| 117 | 117 | { |
| 118 | 118 | return null; |
| 119 | 119 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | $cmd = $this->stack[$idx]; |
| 126 | 126 | |
| 127 | - if($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 127 | + if ($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 128 | 128 | { |
| 129 | 129 | return $cmd; |
| 130 | 130 | } |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | { |
| 149 | 149 | $parent = $this->getOpenCommand(); |
| 150 | 150 | |
| 151 | - if($parent === null) |
|
| 151 | + if ($parent === null) |
|
| 152 | 152 | { |
| 153 | 153 | $this->validationResult->makeError( |
| 154 | 154 | t( |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | return; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - if($parent->getName() !== $command->getParentName()) |
|
| 165 | + if ($parent->getName() !== $command->getParentName()) |
|
| 166 | 166 | { |
| 167 | 167 | $this->validationResult->makeError( |
| 168 | 168 | t( |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | |
| 185 | 185 | protected function validate_Closing(Mailcode_Commands_Command_Type_Closing $command) : void |
| 186 | 186 | { |
| 187 | - if(empty($this->stack)) |
|
| 187 | + if (empty($this->stack)) |
|
| 188 | 188 | { |
| 189 | 189 | $this->validationResult->makeError( |
| 190 | 190 | t('All open commands have already been ended.'), |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | |
| 197 | 197 | $openingCommand = array_pop($this->stack); |
| 198 | 198 | |
| 199 | - if($openingCommand instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 199 | + if ($openingCommand instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 200 | 200 | { |
| 201 | 201 | $this->log(sprintf('Closing command %s', $openingCommand->getName())); |
| 202 | 202 | |
@@ -25,16 +25,16 @@ |
||
| 25 | 25 | { |
| 26 | 26 | $command = $location->getPlaceholder()->getCommand(); |
| 27 | 27 | |
| 28 | - if($command instanceof Mailcode_Interfaces_Commands_PreProcessing) |
|
| 28 | + if ($command instanceof Mailcode_Interfaces_Commands_PreProcessing) |
|
| 29 | 29 | { |
| 30 | 30 | return $command->preProcessOpening(); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - if($command instanceof Mailcode_Commands_Command_Type_Closing) |
|
| 33 | + if ($command instanceof Mailcode_Commands_Command_Type_Closing) |
|
| 34 | 34 | { |
| 35 | 35 | $opening = $command->getOpeningCommand(); |
| 36 | 36 | |
| 37 | - if($opening instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
| 37 | + if ($opening instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
| 38 | 38 | return $opening->preProcessClosing(); |
| 39 | 39 | } |
| 40 | 40 | } |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | // This ending command is tied to a preprocessing command: Since |
| 26 | 26 | // we do not want to keep these, we return an empty string to strip |
| 27 | 27 | // it out. |
| 28 | - if($command->getOpeningCommand() instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
| 28 | + if ($command->getOpeningCommand() instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
| 29 | 29 | return ''; |
| 30 | 30 | } |
| 31 | 31 | |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | */ |
| 85 | 85 | public function getSign() : string |
| 86 | 86 | { |
| 87 | - if($this->isNotContains()) |
|
| 87 | + if ($this->isNotContains()) |
|
| 88 | 88 | { |
| 89 | 89 | return '!'; |
| 90 | 90 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | */ |
| 102 | 102 | public function getConnector() |
| 103 | 103 | { |
| 104 | - if($this->isNotContains()) |
|
| 104 | + if ($this->isNotContains()) |
|
| 105 | 105 | { |
| 106 | 106 | return '&&'; |
| 107 | 107 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | { |
| 118 | 118 | $parts = array(); |
| 119 | 119 | |
| 120 | - foreach($this->searchTerms as $token) |
|
| 120 | + foreach ($this->searchTerms as $token) |
|
| 121 | 121 | { |
| 122 | 122 | $parts[] = $this->renderCommand($token); |
| 123 | 123 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | */ |
| 133 | 133 | private function renderCommand(Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral $searchTerm) : string |
| 134 | 134 | { |
| 135 | - if($this->isList()) |
|
| 135 | + if ($this->isList()) |
|
| 136 | 136 | { |
| 137 | 137 | $command = $this->renderListCommand($searchTerm); |
| 138 | 138 | } |
@@ -173,14 +173,14 @@ discard block |
||
| 173 | 173 | private function renderRegex(Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral $searchTerm) : string |
| 174 | 174 | { |
| 175 | 175 | $opts = 's'; |
| 176 | - if($this->caseSensitive) |
|
| 176 | + if ($this->caseSensitive) |
|
| 177 | 177 | { |
| 178 | 178 | $opts = 'is'; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | $filtered = trim($searchTerm->getNormalized(), '"'); |
| 182 | 182 | |
| 183 | - if(!$this->regexEnabled) |
|
| 183 | + if (!$this->regexEnabled) |
|
| 184 | 184 | { |
| 185 | 185 | $filtered = $this->translator->filterRegexString($filtered); |
| 186 | 186 | $filtered = $this->addWildcards($filtered); |
@@ -203,17 +203,17 @@ discard block |
||
| 203 | 203 | */ |
| 204 | 204 | private function addWildcards(string $searchTerm) : string |
| 205 | 205 | { |
| 206 | - if($this->containsType === 'list-begins-with') |
|
| 206 | + if ($this->containsType === 'list-begins-with') |
|
| 207 | 207 | { |
| 208 | 208 | return $searchTerm.'.*'; |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - if($this->containsType === 'list-ends-with') |
|
| 211 | + if ($this->containsType === 'list-ends-with') |
|
| 212 | 212 | { |
| 213 | 213 | return '.*'.$searchTerm; |
| 214 | 214 | } |
| 215 | 215 | |
| 216 | - if($this->containsType === 'list-equals') |
|
| 216 | + if ($this->containsType === 'list-equals') |
|
| 217 | 217 | { |
| 218 | 218 | return '\\\A'.$searchTerm.'\\\Z'; |
| 219 | 219 | } |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | { |
| 230 | 230 | $tokens = explode('.', ltrim($this->variable->getFullName(), '$')); |
| 231 | 231 | |
| 232 | - if(count($tokens) === 2) |
|
| 232 | + if (count($tokens) === 2) |
|
| 233 | 233 | { |
| 234 | 234 | return array( |
| 235 | 235 | 'path' => $tokens[0], |