@@ -107,9 +107,9 @@ discard block |
||
107 | 107 | { |
108 | 108 | $result = array(); |
109 | 109 | |
110 | - foreach($this->tokensOrdered as $token) |
|
110 | + foreach ($this->tokensOrdered as $token) |
|
111 | 111 | { |
112 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown) |
|
112 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown) |
|
113 | 113 | { |
114 | 114 | $result[] = $token; |
115 | 115 | } |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | { |
123 | 123 | $unknown = $this->getUnknown(); |
124 | 124 | |
125 | - if(!empty($unknown)) |
|
125 | + if (!empty($unknown)) |
|
126 | 126 | { |
127 | 127 | return array_shift($unknown); |
128 | 128 | } |
@@ -134,11 +134,11 @@ discard block |
||
134 | 134 | { |
135 | 135 | $parts = array(); |
136 | 136 | |
137 | - foreach($this->tokensOrdered as $token) |
|
137 | + foreach ($this->tokensOrdered as $token) |
|
138 | 138 | { |
139 | 139 | $string = $token->getNormalized(); |
140 | 140 | |
141 | - if($string != '') |
|
141 | + if ($string != '') |
|
142 | 142 | { |
143 | 143 | $parts[] = $string; |
144 | 144 | } |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $statement = trim($statement); |
163 | 163 | $tokens = array(); |
164 | 164 | |
165 | - foreach($this->tokenCategories as $tokenCategory) |
|
165 | + foreach ($this->tokenCategories as $tokenCategory) |
|
166 | 166 | { |
167 | 167 | $processor = $this->createProcessor($tokenCategory, $statement, $tokens); |
168 | 168 | $processor->process(); |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | |
189 | 189 | $instance = new $class($this, $statement, $tokens); |
190 | 190 | |
191 | - if($instance instanceof Mailcode_Parser_Statement_Tokenizer_Process) |
|
191 | + if ($instance instanceof Mailcode_Parser_Statement_Tokenizer_Process) |
|
192 | 192 | { |
193 | 193 | return $instance; |
194 | 194 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | * @param mixed $subject |
210 | 210 | * @return Mailcode_Parser_Statement_Tokenizer_Token |
211 | 211 | */ |
212 | - public function createToken(string $type, string $matchedText, $subject=null) : Mailcode_Parser_Statement_Tokenizer_Token |
|
212 | + public function createToken(string $type, string $matchedText, $subject = null) : Mailcode_Parser_Statement_Tokenizer_Token |
|
213 | 213 | { |
214 | 214 | $tokenID = $this->generateID(); |
215 | 215 | |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | |
225 | 225 | $token = $this->appendToken('Keyword', $name); |
226 | 226 | |
227 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
227 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
228 | 228 | { |
229 | 229 | return $token; |
230 | 230 | } |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | |
244 | 244 | foreach ($this->tokensOrdered as $checkToken) |
245 | 245 | { |
246 | - if($checkToken->getID() !== $tokenID) |
|
246 | + if ($checkToken->getID() !== $tokenID) |
|
247 | 247 | { |
248 | 248 | $keep[] = $checkToken; |
249 | 249 | } |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | * @param mixed $subject |
263 | 263 | * @return Mailcode_Parser_Statement_Tokenizer_Token |
264 | 264 | */ |
265 | - protected function appendToken(string $type, string $matchedText, $subject=null) : Mailcode_Parser_Statement_Tokenizer_Token |
|
265 | + protected function appendToken(string $type, string $matchedText, $subject = null) : Mailcode_Parser_Statement_Tokenizer_Token |
|
266 | 266 | { |
267 | 267 | $token = $this->createToken($type, $matchedText, $subject); |
268 | 268 | |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | { |
285 | 285 | static $alphas; |
286 | 286 | |
287 | - if(!isset($alphas)) |
|
287 | + if (!isset($alphas)) |
|
288 | 288 | { |
289 | 289 | $alphas = range('A', 'Z'); |
290 | 290 | } |
@@ -293,12 +293,12 @@ discard block |
||
293 | 293 | |
294 | 294 | $result = ''; |
295 | 295 | |
296 | - for($i=0; $i < $amount; $i++) |
|
296 | + for ($i = 0; $i < $amount; $i++) |
|
297 | 297 | { |
298 | 298 | $result .= $alphas[array_rand($alphas)]; |
299 | 299 | } |
300 | 300 | |
301 | - if(!in_array($result, self::$ids)) |
|
301 | + if (!in_array($result, self::$ids)) |
|
302 | 302 | { |
303 | 303 | self::$ids[] = $result; |
304 | 304 | return $result; |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | */ |
313 | 313 | public function onTokensChanged($callback) : void |
314 | 314 | { |
315 | - if(is_callable($callback)) |
|
315 | + if (is_callable($callback)) |
|
316 | 316 | { |
317 | 317 | $this->changeHandlers[] = $callback; |
318 | 318 | } |
@@ -38,14 +38,14 @@ discard block |
||
38 | 38 | 'ExtractTokens' |
39 | 39 | ); |
40 | 40 | |
41 | - /** |
|
42 | - * @var Mailcode_Parser_Statement |
|
43 | - */ |
|
41 | + /** |
|
42 | + * @var Mailcode_Parser_Statement |
|
43 | + */ |
|
44 | 44 | protected $statement; |
45 | 45 | |
46 | - /** |
|
47 | - * @var string |
|
48 | - */ |
|
46 | + /** |
|
47 | + * @var string |
|
48 | + */ |
|
49 | 49 | protected $tokenized; |
50 | 50 | |
51 | 51 | /** |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | */ |
54 | 54 | protected $tokensOrdered = array(); |
55 | 55 | |
56 | - /** |
|
57 | - * @var string[] |
|
58 | - */ |
|
56 | + /** |
|
57 | + * @var string[] |
|
58 | + */ |
|
59 | 59 | protected static $ids = array(); |
60 | 60 | |
61 | 61 | /** |
@@ -75,12 +75,12 @@ discard block |
||
75 | 75 | return $this->statement->getSourceCommand(); |
76 | 76 | } |
77 | 77 | |
78 | - /** |
|
79 | - * Retrieves all tokens detected in the statement string, in |
|
80 | - * the order they were found. |
|
81 | - * |
|
82 | - * @return Mailcode_Parser_Statement_Tokenizer_Token[] |
|
83 | - */ |
|
78 | + /** |
|
79 | + * Retrieves all tokens detected in the statement string, in |
|
80 | + * the order they were found. |
|
81 | + * |
|
82 | + * @return Mailcode_Parser_Statement_Tokenizer_Token[] |
|
83 | + */ |
|
84 | 84 | public function getTokens() |
85 | 85 | { |
86 | 86 | return $this->tokensOrdered; |
@@ -91,11 +91,11 @@ discard block |
||
91 | 91 | return !empty($this->tokensOrdered); |
92 | 92 | } |
93 | 93 | |
94 | - /** |
|
95 | - * Whether there were any unknown tokens in the statement. |
|
96 | - * |
|
97 | - * @return bool |
|
98 | - */ |
|
94 | + /** |
|
95 | + * Whether there were any unknown tokens in the statement. |
|
96 | + * |
|
97 | + * @return bool |
|
98 | + */ |
|
99 | 99 | public function hasUnknown() : bool |
100 | 100 | { |
101 | 101 | $unknown = $this->getUnknown(); |
@@ -103,11 +103,11 @@ discard block |
||
103 | 103 | return !empty($unknown); |
104 | 104 | } |
105 | 105 | |
106 | - /** |
|
107 | - * Retrieves all unknown content tokens, if any. |
|
108 | - * |
|
109 | - * @return Mailcode_Parser_Statement_Tokenizer_Token_Unknown[] |
|
110 | - */ |
|
106 | + /** |
|
107 | + * Retrieves all unknown content tokens, if any. |
|
108 | + * |
|
109 | + * @return Mailcode_Parser_Statement_Tokenizer_Token_Unknown[] |
|
110 | + */ |
|
111 | 111 | public function getUnknown() |
112 | 112 | { |
113 | 113 | $result = array(); |
@@ -278,13 +278,13 @@ discard block |
||
278 | 278 | return $token; |
279 | 279 | } |
280 | 280 | |
281 | - /** |
|
282 | - * Generates a unique alphabet-based ID without numbers |
|
283 | - * to use as token name, to avoid conflicts with the |
|
284 | - * numbers detection. |
|
285 | - * |
|
286 | - * @return string |
|
287 | - */ |
|
281 | + /** |
|
282 | + * Generates a unique alphabet-based ID without numbers |
|
283 | + * to use as token name, to avoid conflicts with the |
|
284 | + * numbers detection. |
|
285 | + * |
|
286 | + * @return string |
|
287 | + */ |
|
288 | 288 | protected function generateID() : string |
289 | 289 | { |
290 | 290 | static $alphas; |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @param string $matchedText |
67 | 67 | * @param mixed $subject |
68 | 68 | */ |
69 | - protected function registerToken(string $type, string $matchedText, $subject=null) : void |
|
69 | + protected function registerToken(string $type, string $matchedText, $subject = null) : void |
|
70 | 70 | { |
71 | 71 | $this->tokensTemporary[] = $this->createToken($type, $matchedText, $subject); |
72 | 72 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * @param mixed $subject |
78 | 78 | * @return Mailcode_Parser_Statement_Tokenizer_Token |
79 | 79 | */ |
80 | - public function createToken(string $type, string $matchedText, $subject=null) : Mailcode_Parser_Statement_Tokenizer_Token |
|
80 | + public function createToken(string $type, string $matchedText, $subject = null) : Mailcode_Parser_Statement_Tokenizer_Token |
|
81 | 81 | { |
82 | 82 | $token = $this->tokenizer->createToken($type, $matchedText, $subject); |
83 | 83 | $tokenID = $token->getID(); |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | |
94 | 94 | protected function getTokenByID(string $tokenID) : ?Mailcode_Parser_Statement_Tokenizer_Token |
95 | 95 | { |
96 | - foreach($this->tokensTemporary as $token) |
|
96 | + foreach ($this->tokensTemporary as $token) |
|
97 | 97 | { |
98 | - if($token->getID() === $tokenID) |
|
98 | + if ($token->getID() === $tokenID) |
|
99 | 99 | { |
100 | 100 | return $token; |
101 | 101 | } |
@@ -10,9 +10,9 @@ |
||
10 | 10 | { |
11 | 11 | $keywords = Mailcode_Commands_Keywords::getAll(); |
12 | 12 | |
13 | - foreach($keywords as $keyword) |
|
13 | + foreach ($keywords as $keyword) |
|
14 | 14 | { |
15 | - if(strstr($this->tokenized, $keyword)) |
|
15 | + if (strstr($this->tokenized, $keyword)) |
|
16 | 16 | { |
17 | 17 | $this->registerToken('Keyword', $keyword); |
18 | 18 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | $matches = array(); |
12 | 12 | preg_match_all('/"(.*)"/sxU', $this->tokenized, $matches, PREG_PATTERN_ORDER); |
13 | 13 | |
14 | - foreach($matches[0] as $match) |
|
14 | + foreach ($matches[0] as $match) |
|
15 | 15 | { |
16 | 16 | $this->registerToken('StringLiteral', $match); |
17 | 17 | } |
@@ -16,12 +16,12 @@ |
||
16 | 16 | $parts = ConvertHelper::explodeTrim($this->delimiter, $this->tokenized); |
17 | 17 | $tokens = array(); |
18 | 18 | |
19 | - foreach($parts as $part) |
|
19 | + foreach ($parts as $part) |
|
20 | 20 | { |
21 | 21 | $token = $this->getTokenByID($part); |
22 | 22 | |
23 | 23 | // if the entry is a token, simply add it. |
24 | - if($token) |
|
24 | + if ($token) |
|
25 | 25 | { |
26 | 26 | $tokens[] = $token; |
27 | 27 | } |
@@ -25,9 +25,9 @@ |
||
25 | 25 | |
26 | 26 | protected function _process() : void |
27 | 27 | { |
28 | - foreach($this->operands as $operand) |
|
28 | + foreach ($this->operands as $operand) |
|
29 | 29 | { |
30 | - if(strstr($this->tokenized, $operand)) |
|
30 | + if (strstr($this->tokenized, $operand)) |
|
31 | 31 | { |
32 | 32 | $this->registerToken('Operand', $operand); |
33 | 33 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | $matches = array(); |
12 | 12 | preg_match_all('/-*[0-9]+\s*[.,]\s*[0-9]+|-*[0-9]+/sx', $this->tokenized, $matches, PREG_PATTERN_ORDER); |
13 | 13 | |
14 | - foreach($matches[0] as $match) |
|
14 | + foreach ($matches[0] as $match) |
|
15 | 15 | { |
16 | 16 | $this->registerToken('Number', $match); |
17 | 17 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | |
34 | 34 | public function protectContent(string $string, Mailcode_Parser_Safeguard_Placeholder $open, Mailcode_Parser_Safeguard_Placeholder $end) : string |
35 | 35 | { |
36 | - if(!$end->getCommand() instanceof Mailcode_Commands_Command_End) |
|
36 | + if (!$end->getCommand() instanceof Mailcode_Commands_Command_End) |
|
37 | 37 | { |
38 | 38 | throw new Mailcode_Exception( |
39 | 39 | 'Invalid commands nesting', |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $start = strpos($string, $open->getReplacementText()) + $open->getReplacementLength(); |
46 | 46 | $end = strpos($string, $end->getReplacementText()); |
47 | 47 | |
48 | - $content = substr($string, $start, ($end-$start)); |
|
48 | + $content = substr($string, $start, ($end - $start)); |
|
49 | 49 | |
50 | 50 | return $this->replaceContent($string, $content); |
51 | 51 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | private function validate() : OperationResult |
46 | 46 | { |
47 | - if(empty($this->delimiter)) |
|
47 | + if (empty($this->delimiter)) |
|
48 | 48 | { |
49 | 49 | return $this->makeError( |
50 | 50 | 'Delimiters may not be empty.', |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | ); |
53 | 53 | } |
54 | 54 | |
55 | - if(strlen($this->delimiter) < 2) |
|
55 | + if (strlen($this->delimiter) < 2) |
|
56 | 56 | { |
57 | 57 | return $this->makeError( |
58 | 58 | 'The delimiter must have at least 2 characters in length.', |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | $encoded = urlencode($this->delimiter); |
64 | 64 | |
65 | - if($encoded !== $this->delimiter) |
|
65 | + if ($encoded !== $this->delimiter) |
|
66 | 66 | { |
67 | 67 | return $this->makeError( |
68 | 68 | 'The delimiter is not URL encoding neutral: it must not be modified by a urlencode() call.', |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | |
76 | 76 | public function throwExceptionIfInvalid() : void |
77 | 77 | { |
78 | - if($this->isValid()) { |
|
78 | + if ($this->isValid()) { |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 |