@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | // IF type. |
40 | 40 | $method = 'translate'.$this->getIfType($command); |
41 | 41 | |
42 | - if(method_exists($this, $method)) |
|
42 | + if (method_exists($this, $method)) |
|
43 | 43 | { |
44 | 44 | return strval($this->$method($command)); |
45 | 45 | } |
@@ -53,11 +53,11 @@ discard block |
||
53 | 53 | |
54 | 54 | $keywords = $command->getLogicKeywords()->getKeywords(); |
55 | 55 | |
56 | - foreach($keywords as $keyword) |
|
56 | + foreach ($keywords as $keyword) |
|
57 | 57 | { |
58 | 58 | $keyCommand = $keyword->getCommand(); |
59 | 59 | |
60 | - if($keyCommand instanceof Mailcode_Commands_IfBase) |
|
60 | + if ($keyCommand instanceof Mailcode_Commands_IfBase) |
|
61 | 61 | { |
62 | 62 | $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand); |
63 | 63 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | protected function getSign(Mailcode_Commands_LogicKeywords_Keyword $keyword) : string |
82 | 82 | { |
83 | - switch($keyword->getName()) |
|
83 | + switch ($keyword->getName()) |
|
84 | 84 | { |
85 | 85 | case 'and': |
86 | 86 | return '&&'; |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | { |
118 | 118 | $sign = ''; |
119 | 119 | |
120 | - if($notEmpty) |
|
120 | + if ($notEmpty) |
|
121 | 121 | { |
122 | 122 | $sign = '!'; |
123 | 123 | } |
@@ -133,12 +133,12 @@ discard block |
||
133 | 133 | { |
134 | 134 | $params = $command->getParams(); |
135 | 135 | |
136 | - if(!$params) |
|
136 | + if (!$params) |
|
137 | 137 | { |
138 | 138 | return ''; |
139 | 139 | } |
140 | 140 | |
141 | - if($command->hasFreeformParameters()) |
|
141 | + if ($command->hasFreeformParameters()) |
|
142 | 142 | { |
143 | 143 | return $params->getStatementString(); |
144 | 144 | } |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | $test = strtolower(trim($value, '"')); |
152 | 152 | $fullName = $variable->getFullName(); |
153 | 153 | |
154 | - if(in_array($test, array('true', 'false'))) |
|
154 | + if (in_array($test, array('true', 'false'))) |
|
155 | 155 | { |
156 | 156 | $fullName .= '.toLowerCase()'; |
157 | 157 | $value = '"'.$test.'"'; |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | protected function _translateSearch(string $mode, Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string |
183 | 183 | { |
184 | 184 | $method = $mode.'With'; |
185 | - if($caseSensitive) |
|
185 | + if ($caseSensitive) |
|
186 | 186 | { |
187 | 187 | $method = $mode.'WithIgnoreCase'; |
188 | 188 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function getParser() : Mailcode_Parser |
75 | 75 | { |
76 | - if(!isset($this->parser)) |
|
76 | + if (!isset($this->parser)) |
|
77 | 77 | { |
78 | 78 | $this->parser = new Mailcode_Parser($this); |
79 | 79 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function getCommands() : Mailcode_Commands |
91 | 91 | { |
92 | - if(!isset($this->commands)) |
|
92 | + if (!isset($this->commands)) |
|
93 | 93 | { |
94 | 94 | $this->commands = new Mailcode_Commands(); |
95 | 95 | } |
@@ -114,14 +114,14 @@ discard block |
||
114 | 114 | * @param Mailcode_Commands_Command|null $sourceCommand |
115 | 115 | * @return Mailcode_Variables_Collection_Regular |
116 | 116 | */ |
117 | - public function findVariables(string $subject, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Variables_Collection_Regular |
|
117 | + public function findVariables(string $subject, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Variables_Collection_Regular |
|
118 | 118 | { |
119 | 119 | return $this->createVariables()->parseString($subject, $sourceCommand); |
120 | 120 | } |
121 | 121 | |
122 | 122 | public function createVariables() : Mailcode_Variables |
123 | 123 | { |
124 | - if(!isset($this->variables)) |
|
124 | + if (!isset($this->variables)) |
|
125 | 125 | { |
126 | 126 | $this->variables = new Mailcode_Variables(); |
127 | 127 | } |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | */ |
138 | 138 | public function createTranslator() : Mailcode_Translator |
139 | 139 | { |
140 | - if(!isset($this->translator)) |
|
140 | + if (!isset($this->translator)) |
|
141 | 141 | { |
142 | 142 | $this->translator = new Mailcode_Translator(); |
143 | 143 | } |
@@ -62,9 +62,9 @@ discard block |
||
62 | 62 | { |
63 | 63 | $fullName = $this->fixName($fullName); |
64 | 64 | |
65 | - foreach($this->variables as $variable) |
|
65 | + foreach ($this->variables as $variable) |
|
66 | 66 | { |
67 | - if($variable->getFullName() === $fullName) |
|
67 | + if ($variable->getFullName() === $fullName) |
|
68 | 68 | { |
69 | 69 | return true; |
70 | 70 | } |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | |
88 | 88 | $collection = new Mailcode_Variables_Collection_Regular(); |
89 | 89 | |
90 | - foreach($this->variables as $variable) |
|
90 | + foreach ($this->variables as $variable) |
|
91 | 91 | { |
92 | - if($variable->getFullName() === $fullName) |
|
92 | + if ($variable->getFullName() === $fullName) |
|
93 | 93 | { |
94 | 94 | $collection->add($variable); |
95 | 95 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | */ |
107 | 107 | protected function fixName(string $fullName) : string |
108 | 108 | { |
109 | - if(substr($fullName, 0, 1) === '$') |
|
109 | + if (substr($fullName, 0, 1) === '$') |
|
110 | 110 | { |
111 | 111 | return $fullName; |
112 | 112 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | { |
125 | 125 | $entries = array(); |
126 | 126 | |
127 | - foreach($this->variables as $variable) |
|
127 | + foreach ($this->variables as $variable) |
|
128 | 128 | { |
129 | 129 | $entries[$variable->getHash()] = $variable; |
130 | 130 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | { |
142 | 142 | $entries = array(); |
143 | 143 | |
144 | - foreach($this->variables as $variable) |
|
144 | + foreach ($this->variables as $variable) |
|
145 | 145 | { |
146 | 146 | $entries[$variable->getFullName()] = $variable; |
147 | 147 | } |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | { |
161 | 161 | $entries = array(); |
162 | 162 | |
163 | - foreach($this->variables as $variable) |
|
163 | + foreach ($this->variables as $variable) |
|
164 | 164 | { |
165 | 165 | $entries[$variable->getUniqueName()] = $variable; |
166 | 166 | } |
@@ -185,11 +185,11 @@ discard block |
||
185 | 185 | { |
186 | 186 | $result = array(); |
187 | 187 | |
188 | - foreach($this->variables as $variable) |
|
188 | + foreach ($this->variables as $variable) |
|
189 | 189 | { |
190 | 190 | $name = $variable->getFullName(); |
191 | 191 | |
192 | - if(!in_array($name, $result)) |
|
192 | + if (!in_array($name, $result)) |
|
193 | 193 | { |
194 | 194 | $result[] = $name; |
195 | 195 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | { |
229 | 229 | $variables = $collection->getGroupedByHash(); |
230 | 230 | |
231 | - foreach($variables as $variable) |
|
231 | + foreach ($variables as $variable) |
|
232 | 232 | { |
233 | 233 | $this->add($variable); |
234 | 234 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | { |
241 | 241 | $variables = $this->getAll(); |
242 | 242 | |
243 | - if(!empty($variables)) |
|
243 | + if (!empty($variables)) |
|
244 | 244 | { |
245 | 245 | return array_shift($variables); |
246 | 246 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | */ |
73 | 73 | private $command; |
74 | 74 | |
75 | - public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) |
|
75 | + public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) |
|
76 | 76 | { |
77 | 77 | $this->path = $path; |
78 | 78 | $this->name = $name; |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | public function getFullName() : string |
97 | 97 | { |
98 | - if(empty($this->path)) |
|
98 | + if (empty($this->path)) |
|
99 | 99 | { |
100 | 100 | return '$'.$this->name; |
101 | 101 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function getUniqueName() : string |
115 | 115 | { |
116 | - if(isset($this->command)) |
|
116 | + if (isset($this->command)) |
|
117 | 117 | { |
118 | 118 | return $this->getFullName().'/'.$this->command->getHash(); |
119 | 119 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | |
139 | 139 | public function getHash() : string |
140 | 140 | { |
141 | - if(empty($this->hash)) |
|
141 | + if (empty($this->hash)) |
|
142 | 142 | { |
143 | 143 | $this->hash = md5($this->matchedText); |
144 | 144 | } |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | |
154 | 154 | public function getValidationResult() : OperationResult |
155 | 155 | { |
156 | - if(isset($this->validationResult)) |
|
156 | + if (isset($this->validationResult)) |
|
157 | 157 | { |
158 | 158 | return $this->validationResult; |
159 | 159 | } |
@@ -167,11 +167,11 @@ discard block |
||
167 | 167 | |
168 | 168 | protected function validate() : void |
169 | 169 | { |
170 | - foreach($this->validations as $validation) |
|
170 | + foreach ($this->validations as $validation) |
|
171 | 171 | { |
172 | 172 | $method = 'validate_'.$validation; |
173 | 173 | |
174 | - if(!method_exists($this, $method)) |
|
174 | + if (!method_exists($this, $method)) |
|
175 | 175 | { |
176 | 176 | throw new Mailcode_Exception( |
177 | 177 | 'Unknown validation method', |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | |
187 | 187 | $this->$method(); |
188 | 188 | |
189 | - if(!$this->validationResult->isValid()) |
|
189 | + if (!$this->validationResult->isValid()) |
|
190 | 190 | { |
191 | 191 | return; |
192 | 192 | } |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | |
216 | 216 | protected function validateNumber(string $value, int $errorCode) : void |
217 | 217 | { |
218 | - if(!is_numeric(substr($value, 0, 1))) |
|
218 | + if (!is_numeric(substr($value, 0, 1))) |
|
219 | 219 | { |
220 | 220 | return; |
221 | 221 | } |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | protected function validateUnderscore(string $value, int $errorCode) : void |
234 | 234 | { |
235 | 235 | // allow empty paths |
236 | - if(empty($value)) |
|
236 | + if (empty($value)) |
|
237 | 237 | { |
238 | 238 | return; |
239 | 239 | } |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | $length = strlen($value); |
242 | 242 | |
243 | 243 | // trimming underscores does not change the length: no underscores at start or end of string. |
244 | - if(strlen(trim($value, '_')) == $length) |
|
244 | + if (strlen(trim($value, '_')) == $length) |
|
245 | 245 | { |
246 | 246 | return; |
247 | 247 | } |
@@ -34,21 +34,21 @@ discard block |
||
34 | 34 | * @param Mailcode_Commands_Command|null $sourceCommand |
35 | 35 | * @return Mailcode_Variables_Collection_Regular |
36 | 36 | */ |
37 | - public function parseString(string $subject, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Variables_Collection_Regular |
|
37 | + public function parseString(string $subject, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Variables_Collection_Regular |
|
38 | 38 | { |
39 | 39 | $this->collection = new Mailcode_Variables_Collection_Regular(); |
40 | 40 | |
41 | 41 | $matches = array(); |
42 | 42 | preg_match_all(self::REGEX_VARIABLE_NAME, $subject, $matches, PREG_PATTERN_ORDER); |
43 | 43 | |
44 | - if(!isset($matches[0]) || empty($matches[0])) |
|
44 | + if (!isset($matches[0]) || empty($matches[0])) |
|
45 | 45 | { |
46 | 46 | return $this->collection; |
47 | 47 | } |
48 | 48 | |
49 | - foreach($matches[0] as $idx => $matchedText) |
|
49 | + foreach ($matches[0] as $idx => $matchedText) |
|
50 | 50 | { |
51 | - if(!empty($matches[3][$idx])) |
|
51 | + if (!empty($matches[3][$idx])) |
|
52 | 52 | { |
53 | 53 | $this->addSingle($matches[3][$idx], $matchedText, $sourceCommand); |
54 | 54 | } |
@@ -61,10 +61,10 @@ discard block |
||
61 | 61 | return $this->collection; |
62 | 62 | } |
63 | 63 | |
64 | - protected function addSingle(string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) : void |
|
64 | + protected function addSingle(string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) : void |
|
65 | 65 | { |
66 | 66 | // ignore US style numbers like $451 |
67 | - if(is_numeric($name)) |
|
67 | + if (is_numeric($name)) |
|
68 | 68 | { |
69 | 69 | return; |
70 | 70 | } |
@@ -72,10 +72,10 @@ discard block |
||
72 | 72 | $this->collection->add(new Mailcode_Variables_Variable('', $name, $matchedText, $sourceCommand)); |
73 | 73 | } |
74 | 74 | |
75 | - protected function addPathed(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) : void |
|
75 | + protected function addPathed(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) : void |
|
76 | 76 | { |
77 | 77 | // ignore US style numbers like $45.12 |
78 | - if(is_numeric($path.'.'.$name)) |
|
78 | + if (is_numeric($path.'.'.$name)) |
|
79 | 79 | { |
80 | 80 | return; |
81 | 81 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | private $sourceCommand; |
58 | 58 | |
59 | - public function __construct(string $statement, bool $freeform=false, ?Mailcode_Commands_Command $sourceCommand=null) |
|
59 | + public function __construct(string $statement, bool $freeform = false, ?Mailcode_Commands_Command $sourceCommand = null) |
|
60 | 60 | { |
61 | 61 | $this->sourceCommand = $sourceCommand; |
62 | 62 | $this->statement = $statement; |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | public function getInfo() : Mailcode_Parser_Statement_Info |
93 | 93 | { |
94 | - if($this->info instanceof Mailcode_Parser_Statement_Info) |
|
94 | + if ($this->info instanceof Mailcode_Parser_Statement_Info) |
|
95 | 95 | { |
96 | 96 | return $this->info; |
97 | 97 | } |
@@ -103,12 +103,12 @@ discard block |
||
103 | 103 | |
104 | 104 | protected function validate() : void |
105 | 105 | { |
106 | - if($this->freeform) |
|
106 | + if ($this->freeform) |
|
107 | 107 | { |
108 | 108 | return; |
109 | 109 | } |
110 | 110 | |
111 | - if(!$this->tokenizer->hasTokens()) |
|
111 | + if (!$this->tokenizer->hasTokens()) |
|
112 | 112 | { |
113 | 113 | $this->result->makeError( |
114 | 114 | t('Empty statement'), |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | |
121 | 121 | $unknown = $this->tokenizer->getFirstUnknown(); |
122 | 122 | |
123 | - if($unknown) |
|
123 | + if ($unknown) |
|
124 | 124 | { |
125 | 125 | $this->result->makeError( |
126 | 126 | t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')', |
@@ -46,7 +46,7 @@ |
||
46 | 46 | * @param mixed $subject |
47 | 47 | * @param Mailcode_Commands_Command|null $sourceCommand |
48 | 48 | */ |
49 | - public function __construct(string $tokenID, string $matchedText, $subject=null, ?Mailcode_Commands_Command $sourceCommand=null) |
|
49 | + public function __construct(string $tokenID, string $matchedText, $subject = null, ?Mailcode_Commands_Command $sourceCommand = null) |
|
50 | 50 | { |
51 | 51 | $this->tokenID = $tokenID; |
52 | 52 | $this->matchedText = $matchedText; |
@@ -10,7 +10,7 @@ |
||
10 | 10 | { |
11 | 11 | $vars = Mailcode::create()->findVariables($this->tokenized, $this->tokenizer->getSourceCommand())->getGroupedByHash(); |
12 | 12 | |
13 | - foreach($vars as $var) |
|
13 | + foreach ($vars as $var) |
|
14 | 14 | { |
15 | 15 | $this->registerToken('Variable', $var->getMatchedText(), $var); |
16 | 16 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | $total = count($matches[0]); |
82 | 82 | |
83 | - for($i=0; $i < $total; $i++) |
|
83 | + for ($i = 0; $i < $total; $i++) |
|
84 | 84 | { |
85 | 85 | $match = $this->parseMatch($matches, $i); |
86 | 86 | |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | protected function prepareString(string $subject) : string |
96 | 96 | { |
97 | - if(!ConvertHelper::isStringHTML($subject)) |
|
97 | + if (!ConvertHelper::isStringHTML($subject)) |
|
98 | 98 | { |
99 | 99 | return $subject; |
100 | 100 | } |
@@ -145,17 +145,17 @@ discard block |
||
145 | 145 | private function handleNesting(Mailcode_Commands_Command $cmd) : void |
146 | 146 | { |
147 | 147 | // Set the command's parent from the stack, if any is present. |
148 | - if(!empty($this->stack)) |
|
148 | + if (!empty($this->stack)) |
|
149 | 149 | { |
150 | 150 | $cmd->setParent($this->getStackLast()); |
151 | 151 | } |
152 | 152 | |
153 | 153 | // Handle opening and closing commands, adding and removing from the stack. |
154 | - if($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
|
154 | + if ($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
|
155 | 155 | { |
156 | 156 | $this->stack[] = $cmd; |
157 | 157 | } |
158 | - else if($cmd instanceof Mailcode_Commands_Command_Type_Closing) |
|
158 | + else if ($cmd instanceof Mailcode_Commands_Command_Type_Closing) |
|
159 | 159 | { |
160 | 160 | array_pop($this->stack); |
161 | 161 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | { |
166 | 166 | $cmd = $this->stack[array_key_last($this->stack)]; |
167 | 167 | |
168 | - if($cmd instanceof Mailcode_Commands_Command) |
|
168 | + if ($cmd instanceof Mailcode_Commands_Command) |
|
169 | 169 | { |
170 | 170 | return $cmd; |
171 | 171 | } |
@@ -194,16 +194,16 @@ discard block |
||
194 | 194 | // 5 = parameter type command, type |
195 | 195 | // 6 = parameter type command, params |
196 | 196 | |
197 | - if(!empty($matches[1][$index])) |
|
197 | + if (!empty($matches[1][$index])) |
|
198 | 198 | { |
199 | 199 | $name = $matches[1][$index]; |
200 | 200 | } |
201 | - else if(!empty($matches[2][$index])) |
|
201 | + else if (!empty($matches[2][$index])) |
|
202 | 202 | { |
203 | 203 | $name = $matches[2][$index]; |
204 | 204 | $params = $matches[3][$index]; |
205 | 205 | } |
206 | - else if(!empty($matches[4][$index])) |
|
206 | + else if (!empty($matches[4][$index])) |
|
207 | 207 | { |
208 | 208 | $name = $matches[4][$index]; |
209 | 209 | $type = $matches[5][$index]; |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | * @param Mailcode_Commands_Command|null $sourceCommand |
241 | 241 | * @return Mailcode_Parser_Statement |
242 | 242 | */ |
243 | - public function createStatement(string $statement, bool $freeform=false, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Parser_Statement |
|
243 | + public function createStatement(string $statement, bool $freeform = false, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Parser_Statement |
|
244 | 244 | { |
245 | 245 | return new Mailcode_Parser_Statement($statement, $freeform, $sourceCommand); |
246 | 246 | } |