@@ -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 | } |
@@ -56,23 +56,23 @@ |
||
56 | 56 | |
57 | 57 | private function analyzeURL(string $url) : void |
58 | 58 | { |
59 | - if(stristr($url, 'tel:')) |
|
59 | + if (stristr($url, 'tel:')) |
|
60 | 60 | { |
61 | 61 | return; |
62 | 62 | } |
63 | 63 | |
64 | 64 | $placeholders = $this->safeguard->getPlaceholders(); |
65 | 65 | |
66 | - foreach($placeholders as $placeholder) |
|
66 | + foreach ($placeholders as $placeholder) |
|
67 | 67 | { |
68 | 68 | $command = $placeholder->getCommand(); |
69 | 69 | |
70 | - if(!$command->supportsURLEncoding()) |
|
70 | + if (!$command->supportsURLEncoding()) |
|
71 | 71 | { |
72 | 72 | continue; |
73 | 73 | } |
74 | 74 | |
75 | - if(strstr($url, $placeholder->getReplacementText()) && !$command->isURLDecoded()) |
|
75 | + if (strstr($url, $placeholder->getReplacementText()) && !$command->isURLDecoded()) |
|
76 | 76 | { |
77 | 77 | $command->setURLEncoding(true); |
78 | 78 | } |
@@ -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 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | |
70 | 70 | // All other special characters have to be escaped |
71 | 71 | // with two backslashes. |
72 | - foreach($this->regexSpecialChars as $char) |
|
72 | + foreach ($this->regexSpecialChars as $char) |
|
73 | 73 | { |
74 | 74 | $string = str_replace($char, '\\'.$char, $string); |
75 | 75 | } |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | */ |
21 | 21 | abstract class Mailcode_Translator_Syntax_ApacheVelocity extends Mailcode_Translator_Command |
22 | 22 | { |
23 | - /** |
|
24 | - * @var string[] |
|
25 | - */ |
|
23 | + /** |
|
24 | + * @var string[] |
|
25 | + */ |
|
26 | 26 | private $regexSpecialChars = array( |
27 | 27 | '?', |
28 | 28 | '.', |
@@ -47,15 +47,15 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | - * Filters the string for use in an Apache Velocity (Java) |
|
51 | - * regex string: escapes all special characters. |
|
52 | - * |
|
53 | - * Velocity does its own escaping, so no need to escape special |
|
54 | - * characters as if they were a javascript string. |
|
55 | - * |
|
56 | - * @param string $string |
|
57 | - * @return string |
|
58 | - */ |
|
50 | + * Filters the string for use in an Apache Velocity (Java) |
|
51 | + * regex string: escapes all special characters. |
|
52 | + * |
|
53 | + * Velocity does its own escaping, so no need to escape special |
|
54 | + * characters as if they were a javascript string. |
|
55 | + * |
|
56 | + * @param string $string |
|
57 | + * @return string |
|
58 | + */ |
|
59 | 59 | public function filterRegexString(string $string) : string |
60 | 60 | { |
61 | 61 | // Special case: previously escaped quotes. |