@@ -24,34 +24,34 @@ discard block |
||
24 | 24 | { |
25 | 25 | const ERROR_PLACEHOLDER_NOT_FOUND = 66001; |
26 | 26 | |
27 | - /** |
|
28 | - * @var Mailcode_Parser_Safeguard_Formatter |
|
29 | - */ |
|
27 | + /** |
|
28 | + * @var Mailcode_Parser_Safeguard_Formatter |
|
29 | + */ |
|
30 | 30 | protected $formatter; |
31 | 31 | |
32 | - /** |
|
33 | - * @var string |
|
34 | - */ |
|
32 | + /** |
|
33 | + * @var string |
|
34 | + */ |
|
35 | 35 | protected $append = ''; |
36 | 36 | |
37 | - /** |
|
38 | - * @var string |
|
39 | - */ |
|
37 | + /** |
|
38 | + * @var string |
|
39 | + */ |
|
40 | 40 | protected $prepend = ''; |
41 | 41 | |
42 | - /** |
|
43 | - * @var Mailcode_Parser_Safeguard_Placeholder |
|
44 | - */ |
|
42 | + /** |
|
43 | + * @var Mailcode_Parser_Safeguard_Placeholder |
|
44 | + */ |
|
45 | 45 | protected $placeholder; |
46 | 46 | |
47 | - /** |
|
48 | - * @var Mailcode_StringContainer |
|
49 | - */ |
|
47 | + /** |
|
48 | + * @var Mailcode_StringContainer |
|
49 | + */ |
|
50 | 50 | protected $subject; |
51 | 51 | |
52 | - /** |
|
53 | - * @var string[] |
|
54 | - */ |
|
52 | + /** |
|
53 | + * @var string[] |
|
54 | + */ |
|
55 | 55 | protected $log = array(); |
56 | 56 | |
57 | 57 | public function __construct(Mailcode_Parser_Safeguard_Formatter $formatter, Mailcode_Parser_Safeguard_Placeholder $placeholder) |
@@ -67,22 +67,22 @@ discard block |
||
67 | 67 | |
68 | 68 | abstract public function requiresAdjustment() : bool; |
69 | 69 | |
70 | - /** |
|
71 | - * @return int|boolean |
|
72 | - */ |
|
70 | + /** |
|
71 | + * @return int|boolean |
|
72 | + */ |
|
73 | 73 | public function getStartPosition() |
74 | 74 | { |
75 | 75 | return $this->subject->getSubstrPosition($this->placeholder->getReplacementText()); |
76 | 76 | } |
77 | 77 | |
78 | - /** |
|
79 | - * Checks whether the specified position within the string |
|
80 | - * is within another command's placeholder (excluding this |
|
81 | - * location's placeholder). |
|
82 | - * |
|
83 | - * @param int $position |
|
84 | - * @return bool |
|
85 | - */ |
|
78 | + /** |
|
79 | + * Checks whether the specified position within the string |
|
80 | + * is within another command's placeholder (excluding this |
|
81 | + * location's placeholder). |
|
82 | + * |
|
83 | + * @param int $position |
|
84 | + * @return bool |
|
85 | + */ |
|
86 | 86 | public function isWithinCommand(int $position) : bool |
87 | 87 | { |
88 | 88 | $placeholders = $this->formatter->getSafeguard()->getPlaceholders(); |
@@ -114,9 +114,9 @@ discard block |
||
114 | 114 | return false; |
115 | 115 | } |
116 | 116 | |
117 | - /** |
|
118 | - * @return int|boolean |
|
119 | - */ |
|
117 | + /** |
|
118 | + * @return int|boolean |
|
119 | + */ |
|
120 | 120 | public function getEndPosition() |
121 | 121 | { |
122 | 122 | $start = $this->getStartPosition(); |
@@ -139,14 +139,14 @@ discard block |
||
139 | 139 | return $this->placeholder; |
140 | 140 | } |
141 | 141 | |
142 | - /** |
|
143 | - * Replaces the placeholder with the specified replacement text. |
|
144 | - * |
|
145 | - * @param string $replacementText |
|
146 | - * @throws Mailcode_Exception |
|
147 | - * |
|
148 | - * @see Mailcode_Parser_Safeguard_Formatter_Location::ERROR_PLACEHOLDER_NOT_FOUND |
|
149 | - */ |
|
142 | + /** |
|
143 | + * Replaces the placeholder with the specified replacement text. |
|
144 | + * |
|
145 | + * @param string $replacementText |
|
146 | + * @throws Mailcode_Exception |
|
147 | + * |
|
148 | + * @see Mailcode_Parser_Safeguard_Formatter_Location::ERROR_PLACEHOLDER_NOT_FOUND |
|
149 | + */ |
|
150 | 150 | public function replaceWith(string $replacementText) : void |
151 | 151 | { |
152 | 152 | $needle = $this->placeholder->getReplacementText(); |
@@ -189,10 +189,10 @@ discard block |
||
189 | 189 | ); |
190 | 190 | } |
191 | 191 | |
192 | - /** |
|
193 | - * Retrieves the location's log messages, if any. |
|
194 | - * @return string[] |
|
195 | - */ |
|
192 | + /** |
|
193 | + * Retrieves the location's log messages, if any. |
|
194 | + * @return string[] |
|
195 | + */ |
|
196 | 196 | public function getLog() : array |
197 | 197 | { |
198 | 198 | return $this->log; |
@@ -89,23 +89,23 @@ discard block |
||
89 | 89 | |
90 | 90 | $placeholderID = $this->placeholder->getID(); |
91 | 91 | |
92 | - foreach($placeholders as $placeholder) |
|
92 | + foreach ($placeholders as $placeholder) |
|
93 | 93 | { |
94 | - if($placeholder->getID() === $placeholderID) |
|
94 | + if ($placeholder->getID() === $placeholderID) |
|
95 | 95 | { |
96 | 96 | continue; |
97 | 97 | } |
98 | 98 | |
99 | 99 | $start = $this->subject->getSubstrPosition($placeholder->getReplacementText()); |
100 | 100 | |
101 | - if($start === false) |
|
101 | + if ($start === false) |
|
102 | 102 | { |
103 | 103 | continue; |
104 | 104 | } |
105 | 105 | |
106 | 106 | $end = $start + $placeholder->getReplacementLength(); |
107 | 107 | |
108 | - if($position >= $start && $position <= $end) |
|
108 | + if ($position >= $start && $position <= $end) |
|
109 | 109 | { |
110 | 110 | return true; |
111 | 111 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | { |
122 | 122 | $start = $this->getStartPosition(); |
123 | 123 | |
124 | - if($start !== false) |
|
124 | + if ($start !== false) |
|
125 | 125 | { |
126 | 126 | return $start + $this->placeholder->getReplacementLength(); |
127 | 127 | } |
@@ -151,14 +151,14 @@ discard block |
||
151 | 151 | { |
152 | 152 | $needle = $this->placeholder->getReplacementText(); |
153 | 153 | |
154 | - if($this->subject->replaceSubstrings($needle, $replacementText)) |
|
154 | + if ($this->subject->replaceSubstrings($needle, $replacementText)) |
|
155 | 155 | { |
156 | 156 | return; |
157 | 157 | } |
158 | 158 | |
159 | 159 | // Complain about missing placeholders only if we |
160 | 160 | // are not in partial mode. |
161 | - if(!$this->formatter->getFormatting()->isPartial()) |
|
161 | + if (!$this->formatter->getFormatting()->isPartial()) |
|
162 | 162 | { |
163 | 163 | throw new Mailcode_Exception( |
164 | 164 | 'Could not find the placeholder to replace', |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | |
174 | 174 | public function format() : void |
175 | 175 | { |
176 | - if($this->requiresAdjustment() && (!empty($this->prepend) || !empty($this->append))) |
|
176 | + if ($this->requiresAdjustment() && (!empty($this->prepend) || !empty($this->append))) |
|
177 | 177 | { |
178 | 178 | $this->replaceWith(sprintf( |
179 | 179 | '%s%s%s', |
@@ -27,19 +27,19 @@ discard block |
||
27 | 27 | { |
28 | 28 | const ERROR_INVALID_LOCATION_INSTANCE = 65601; |
29 | 29 | |
30 | - /** |
|
31 | - * @var Mailcode_Parser_Safeguard_Formatting |
|
32 | - */ |
|
30 | + /** |
|
31 | + * @var Mailcode_Parser_Safeguard_Formatting |
|
32 | + */ |
|
33 | 33 | protected $formatting; |
34 | 34 | |
35 | - /** |
|
36 | - * @var Mailcode_StringContainer |
|
37 | - */ |
|
35 | + /** |
|
36 | + * @var Mailcode_StringContainer |
|
37 | + */ |
|
38 | 38 | protected $subject; |
39 | 39 | |
40 | - /** |
|
41 | - * @var string[] |
|
42 | - */ |
|
40 | + /** |
|
41 | + * @var string[] |
|
42 | + */ |
|
43 | 43 | protected $log = array(); |
44 | 44 | |
45 | 45 | public function __construct(Mailcode_Parser_Safeguard_Formatting $formatting) |
@@ -93,12 +93,12 @@ discard block |
||
93 | 93 | ); |
94 | 94 | } |
95 | 95 | |
96 | - /** |
|
97 | - * Retrieves all formatter-specific placeholder locations |
|
98 | - * in the subject string. |
|
99 | - * |
|
100 | - * @return Mailcode_Parser_Safeguard_Formatter_Location[] |
|
101 | - */ |
|
96 | + /** |
|
97 | + * Retrieves all formatter-specific placeholder locations |
|
98 | + * in the subject string. |
|
99 | + * |
|
100 | + * @return Mailcode_Parser_Safeguard_Formatter_Location[] |
|
101 | + */ |
|
102 | 102 | protected function resolveLocations() : array |
103 | 103 | { |
104 | 104 | $placeholders = $this->formatting->getSafeguard()->getPlaceholders(); |
@@ -113,12 +113,12 @@ discard block |
||
113 | 113 | return $result; |
114 | 114 | } |
115 | 115 | |
116 | - /** |
|
117 | - * Resolves the newline character used in the string. |
|
118 | - * |
|
119 | - * @param string $subject |
|
120 | - * @return string |
|
121 | - */ |
|
116 | + /** |
|
117 | + * Resolves the newline character used in the string. |
|
118 | + * |
|
119 | + * @param string $subject |
|
120 | + * @return string |
|
121 | + */ |
|
122 | 122 | protected function resolveNewlineChar(string $subject) : string |
123 | 123 | { |
124 | 124 | $eol = ConvertHelper::detectEOLCharacter($subject); |
@@ -150,9 +150,9 @@ discard block |
||
150 | 150 | ); |
151 | 151 | } |
152 | 152 | |
153 | - /** |
|
154 | - * @return string[] |
|
155 | - */ |
|
153 | + /** |
|
154 | + * @return string[] |
|
155 | + */ |
|
156 | 156 | public function getLog() : array |
157 | 157 | { |
158 | 158 | return $this->log; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | $instance = new $class($this, $placeholder); |
79 | 79 | |
80 | - if($instance instanceof Mailcode_Parser_Safeguard_Formatter_Location) |
|
80 | + if ($instance instanceof Mailcode_Parser_Safeguard_Formatter_Location) |
|
81 | 81 | { |
82 | 82 | return $instance; |
83 | 83 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | $result = array(); |
107 | 107 | |
108 | - foreach($placeholders as $placeholder) |
|
108 | + foreach ($placeholders as $placeholder) |
|
109 | 109 | { |
110 | 110 | $result[] = $this->createLocation($placeholder); |
111 | 111 | } |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | { |
124 | 124 | $eol = ConvertHelper::detectEOLCharacter($subject); |
125 | 125 | |
126 | - if($eol) |
|
126 | + if ($eol) |
|
127 | 127 | { |
128 | 128 | $this->log(sprintf( |
129 | 129 | 'Detected EOL character: %s.', |
@@ -146,8 +146,7 @@ discard block |
||
146 | 146 | if($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
147 | 147 | { |
148 | 148 | $this->stack[] = $cmd; |
149 | - } |
|
150 | - else if($cmd instanceof Mailcode_Commands_Command_Type_Closing) |
|
149 | + } else if($cmd instanceof Mailcode_Commands_Command_Type_Closing) |
|
151 | 150 | { |
152 | 151 | array_pop($this->stack); |
153 | 152 | } |
@@ -177,13 +176,11 @@ discard block |
||
177 | 176 | if(!empty($matches[1][$index])) |
178 | 177 | { |
179 | 178 | $name = $matches[1][$index]; |
180 | - } |
|
181 | - else if(!empty($matches[2][$index])) |
|
179 | + } else if(!empty($matches[2][$index])) |
|
182 | 180 | { |
183 | 181 | $name = $matches[2][$index]; |
184 | 182 | $params = $matches[3][$index]; |
185 | - } |
|
186 | - else if(!empty($matches[4][$index])) |
|
183 | + } else if(!empty($matches[4][$index])) |
|
187 | 184 | { |
188 | 185 | $name = $matches[4][$index]; |
189 | 186 | $type = $matches[5][$index]; |
@@ -30,14 +30,14 @@ discard block |
||
30 | 30 | '{\s*([a-z]+)\s+([a-z-]+)\s*:([^}]*)}' |
31 | 31 | ); |
32 | 32 | |
33 | - /** |
|
34 | - * @var Mailcode |
|
35 | - */ |
|
33 | + /** |
|
34 | + * @var Mailcode |
|
35 | + */ |
|
36 | 36 | protected $mailcode; |
37 | 37 | |
38 | - /** |
|
39 | - * @var Mailcode_Commands |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @var Mailcode_Commands |
|
40 | + */ |
|
41 | 41 | protected $commands; |
42 | 42 | |
43 | 43 | /** |
@@ -51,24 +51,24 @@ discard block |
||
51 | 51 | $this->commands = $this->mailcode->getCommands(); |
52 | 52 | } |
53 | 53 | |
54 | - /** |
|
55 | - * Gets the regex format string used to detect commands. |
|
56 | - * |
|
57 | - * @return string |
|
58 | - */ |
|
54 | + /** |
|
55 | + * Gets the regex format string used to detect commands. |
|
56 | + * |
|
57 | + * @return string |
|
58 | + */ |
|
59 | 59 | protected static function getRegex() : string |
60 | 60 | { |
61 | 61 | return '/'.implode('|', self::COMMAND_REGEX_PARTS).'/sixU'; |
62 | 62 | } |
63 | 63 | |
64 | - /** |
|
65 | - * Parses a string to detect all commands within. Returns a |
|
66 | - * collection instance that contains information on all the |
|
67 | - * commands. |
|
68 | - * |
|
69 | - * @param string $string |
|
70 | - * @return Mailcode_Collection A collection with all unique commands found. |
|
71 | - */ |
|
64 | + /** |
|
65 | + * Parses a string to detect all commands within. Returns a |
|
66 | + * collection instance that contains information on all the |
|
67 | + * commands. |
|
68 | + * |
|
69 | + * @param string $string |
|
70 | + * @return Mailcode_Collection A collection with all unique commands found. |
|
71 | + */ |
|
72 | 72 | public function parseString(string $string) : Mailcode_Collection |
73 | 73 | { |
74 | 74 | $collection = new Mailcode_Collection(); |
@@ -103,14 +103,14 @@ discard block |
||
103 | 103 | return preg_replace('%<style\b[^>]*>(.*?)</style>%six', '', $subject); |
104 | 104 | } |
105 | 105 | |
106 | - /** |
|
107 | - * Processes a single match found in the string: creates the command, |
|
108 | - * and adds it to the collection if it's a valid command, or to the list |
|
109 | - * of invalid commands otherwise. |
|
110 | - * |
|
111 | - * @param Mailcode_Parser_Match $match |
|
112 | - * @param Mailcode_Collection $collection |
|
113 | - */ |
|
106 | + /** |
|
107 | + * Processes a single match found in the string: creates the command, |
|
108 | + * and adds it to the collection if it's a valid command, or to the list |
|
109 | + * of invalid commands otherwise. |
|
110 | + * |
|
111 | + * @param Mailcode_Parser_Match $match |
|
112 | + * @param Mailcode_Collection $collection |
|
113 | + */ |
|
114 | 114 | protected function processMatch(Mailcode_Parser_Match $match, Mailcode_Collection $collection) : void |
115 | 115 | { |
116 | 116 | $name = $match->getName(); |
@@ -173,14 +173,14 @@ discard block |
||
173 | 173 | throw new Mailcode_Exception('Not a command', '', self::ERROR_NOT_A_COMMAND); |
174 | 174 | } |
175 | 175 | |
176 | - /** |
|
177 | - * Parses a single regex match: determines which named group |
|
178 | - * matches, and retrieves the according information. |
|
179 | - * |
|
180 | - * @param array[] $matches The regex results array. |
|
181 | - * @param int $index The matched index. |
|
182 | - * @return Mailcode_Parser_Match |
|
183 | - */ |
|
176 | + /** |
|
177 | + * Parses a single regex match: determines which named group |
|
178 | + * matches, and retrieves the according information. |
|
179 | + * |
|
180 | + * @param array[] $matches The regex results array. |
|
181 | + * @param int $index The matched index. |
|
182 | + * @return Mailcode_Parser_Match |
|
183 | + */ |
|
184 | 184 | protected function parseMatch(array $matches, int $index) : Mailcode_Parser_Match |
185 | 185 | { |
186 | 186 | $name = ''; // the command name, e.g. "showvar" |
@@ -218,14 +218,14 @@ discard block |
||
218 | 218 | ); |
219 | 219 | } |
220 | 220 | |
221 | - /** |
|
222 | - * Creates an instance of the safeguard tool, which |
|
223 | - * is used to safeguard commands in a string with placeholders. |
|
224 | - * |
|
225 | - * @param string $subject The string to use to safeguard commands in. |
|
226 | - * @return Mailcode_Parser_Safeguard |
|
227 | - * @see Mailcode_Parser_Safeguard |
|
228 | - */ |
|
221 | + /** |
|
222 | + * Creates an instance of the safeguard tool, which |
|
223 | + * is used to safeguard commands in a string with placeholders. |
|
224 | + * |
|
225 | + * @param string $subject The string to use to safeguard commands in. |
|
226 | + * @return Mailcode_Parser_Safeguard |
|
227 | + * @see Mailcode_Parser_Safeguard |
|
228 | + */ |
|
229 | 229 | public function createSafeguard(string $subject) : Mailcode_Parser_Safeguard |
230 | 230 | { |
231 | 231 | return new Mailcode_Parser_Safeguard($this, $subject); |
@@ -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 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | public function setTemplate(string $template) : Mailcode_Parser_Safeguard_Formatter_Type_MarkVariables |
62 | 62 | { |
63 | - if(substr_count($template, '%s') !== 1) |
|
63 | + if (substr_count($template, '%s') !== 1) |
|
64 | 64 | { |
65 | 65 | throw new Mailcode_Exception( |
66 | 66 | 'Invalid tag template', |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $parts = explode('%s', $this->getTemplate()); |
102 | 102 | $tag = array_shift($parts); |
103 | 103 | |
104 | - if($this->templateMode === self::TEMPLATE_MODE_INLINE) |
|
104 | + if ($this->templateMode === self::TEMPLATE_MODE_INLINE) |
|
105 | 105 | { |
106 | 106 | $tag = str_replace('__STYLES__', $this->getInlineStyles(), $tag); |
107 | 107 | } |
@@ -129,12 +129,12 @@ discard block |
||
129 | 129 | $styles = ''; |
130 | 130 | $regex = '/\.'.self::DEFAULT_CLASS_NAME.'{([^}]+)}/'; |
131 | 131 | |
132 | - if(preg_match($regex, $this->getCSS(), $matches)) |
|
132 | + if (preg_match($regex, $this->getCSS(), $matches)) |
|
133 | 133 | { |
134 | 134 | $styles = $matches[1]; |
135 | 135 | } |
136 | 136 | |
137 | - if(empty($styles)) |
|
137 | + if (empty($styles)) |
|
138 | 138 | { |
139 | 139 | throw new Mailcode_Exception( |
140 | 140 | 'Cannot extract styles.', |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | $file = MAILCODE_INSTALL_FOLDER.'/css/marked-variables.css'; |
192 | 192 | $path = realpath($file); |
193 | 193 | |
194 | - if($path !== false) |
|
194 | + if ($path !== false) |
|
195 | 195 | { |
196 | 196 | return $path; |
197 | 197 | } |
@@ -24,15 +24,15 @@ |
||
24 | 24 | { |
25 | 25 | const ERROR_UNKNOWN_DATE_FORMAT_CHARACTER = 55501; |
26 | 26 | |
27 | - /** |
|
28 | - * The date format used in the date variable. This is used to convert |
|
29 | - * the native date to the format specified in the variable command. |
|
30 | - */ |
|
27 | + /** |
|
28 | + * The date format used in the date variable. This is used to convert |
|
29 | + * the native date to the format specified in the variable command. |
|
30 | + */ |
|
31 | 31 | const DEFAULT_INTERNAL_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"; |
32 | 32 | |
33 | - /** |
|
34 | - * @var string[]string |
|
35 | - */ |
|
33 | + /** |
|
34 | + * @var string[]string |
|
35 | + */ |
|
36 | 36 | private $charTable = array( |
37 | 37 | 'd' => 'dd', |
38 | 38 | 'j' => 'd', |
@@ -56,12 +56,12 @@ discard block |
||
56 | 56 | $varName = ltrim($command->getVariableName(), '$'); |
57 | 57 | $javaFormat = $this->translateFormat($command->getFormatString()); |
58 | 58 | |
59 | - if(empty($internalFormat)) |
|
59 | + if (empty($internalFormat)) |
|
60 | 60 | { |
61 | 61 | $internalFormat = self::DEFAULT_INTERNAL_FORMAT; |
62 | 62 | } |
63 | 63 | |
64 | - if($command->isURLEncoded()) |
|
64 | + if ($command->isURLEncoded()) |
|
65 | 65 | { |
66 | 66 | return sprintf( |
67 | 67 | '${esc.url($date.format("%s", $date.toDate("%s", $%s)))}', |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | $chars = ConvertHelper::string2array($formatString); |
85 | 85 | $result = array(); |
86 | 86 | |
87 | - foreach($chars as $char) |
|
87 | + foreach ($chars as $char) |
|
88 | 88 | { |
89 | - if(!isset($this->charTable[$char])) |
|
89 | + if (!isset($this->charTable[$char])) |
|
90 | 90 | { |
91 | 91 | throw new Mailcode_Translator_Exception( |
92 | 92 | 'Unknown date format string character', |
@@ -22,15 +22,15 @@ discard block |
||
22 | 22 | { |
23 | 23 | const VALIDATION_NOT_A_FORMAT_STRING = 55401; |
24 | 24 | |
25 | - /** |
|
26 | - * The date format string. |
|
27 | - * @var string |
|
28 | - */ |
|
25 | + /** |
|
26 | + * The date format string. |
|
27 | + * @var string |
|
28 | + */ |
|
29 | 29 | private $formatString; |
30 | 30 | |
31 | - /** |
|
32 | - * @var Mailcode_Date_FormatInfo |
|
33 | - */ |
|
31 | + /** |
|
32 | + * @var Mailcode_Date_FormatInfo |
|
33 | + */ |
|
34 | 34 | private $formatInfo; |
35 | 35 | |
36 | 36 | public function getName() : string |
@@ -90,11 +90,11 @@ discard block |
||
90 | 90 | ); |
91 | 91 | } |
92 | 92 | |
93 | - /** |
|
94 | - * Retrieves the format string used to format the date. |
|
95 | - * |
|
96 | - * @return string A PHP compatible date format string. |
|
97 | - */ |
|
93 | + /** |
|
94 | + * Retrieves the format string used to format the date. |
|
95 | + * |
|
96 | + * @return string A PHP compatible date format string. |
|
97 | + */ |
|
98 | 98 | public function getFormatString() : string |
99 | 99 | { |
100 | 100 | return $this->formatString; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $tokens = $this->params->getInfo()->getStringLiterals(); |
66 | 66 | |
67 | 67 | // no format specified? Use the default one. |
68 | - if(empty($tokens)) |
|
68 | + if (empty($tokens)) |
|
69 | 69 | { |
70 | 70 | return; |
71 | 71 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | { |
79 | 79 | $result = $this->formatInfo->validateFormat($format); |
80 | 80 | |
81 | - if($result->isValid()) |
|
81 | + if ($result->isValid()) |
|
82 | 82 | { |
83 | 83 | $this->formatString = $format; |
84 | 84 | return; |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $tokens = $this->params->getInfo()->getStringLiterals(); |
67 | 67 | |
68 | 68 | // no format specified? Use the default one. |
69 | - if(empty($tokens)) |
|
69 | + if (empty($tokens)) |
|
70 | 70 | { |
71 | 71 | return; |
72 | 72 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | { |
80 | 80 | $result = new Mailcode_Number_Info($format); |
81 | 81 | |
82 | - if($result->isValid()) |
|
82 | + if ($result->isValid()) |
|
83 | 83 | { |
84 | 84 | $this->formatString = $format; |
85 | 85 | return; |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | const VALIDATION_INVALID_DECIMAL_SEPARATOR = 72209; |
32 | 32 | const VALIDATION_SEPARATORS_SAME_CHARACTER = 72210; |
33 | 33 | |
34 | - /** |
|
35 | - * The default number format string. |
|
36 | - * @var string |
|
37 | - */ |
|
34 | + /** |
|
35 | + * The default number format string. |
|
36 | + * @var string |
|
37 | + */ |
|
38 | 38 | private $formatString = Mailcode_Number_Info::DEFAULT_FORMAT; |
39 | 39 | |
40 | 40 | public function getName() : string |
@@ -58,16 +58,16 @@ discard block |
||
58 | 58 | |
59 | 59 | protected function validateSyntax_check_format() : void |
60 | 60 | { |
61 | - $tokens = $this->params->getInfo()->getStringLiterals(); |
|
61 | + $tokens = $this->params->getInfo()->getStringLiterals(); |
|
62 | 62 | |
63 | - // no format specified? Use the default one. |
|
64 | - if(empty($tokens)) |
|
65 | - { |
|
66 | - return; |
|
67 | - } |
|
63 | + // no format specified? Use the default one. |
|
64 | + if(empty($tokens)) |
|
65 | + { |
|
66 | + return; |
|
67 | + } |
|
68 | 68 | |
69 | - $token = array_pop($tokens); |
|
70 | - $this->parseFormatString($token->getText()); |
|
69 | + $token = array_pop($tokens); |
|
70 | + $this->parseFormatString($token->getText()); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | private function parseFormatString(string $format) : void |
@@ -86,11 +86,11 @@ discard block |
||
86 | 86 | ); |
87 | 87 | } |
88 | 88 | |
89 | - /** |
|
90 | - * Retrieves the format string used to format the number. |
|
91 | - * |
|
92 | - * @return string |
|
93 | - */ |
|
89 | + /** |
|
90 | + * Retrieves the format string used to format the number. |
|
91 | + * |
|
92 | + * @return string |
|
93 | + */ |
|
94 | 94 | public function getFormatString() : string |
95 | 95 | { |
96 | 96 | return $this->formatString; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | { |
43 | 43 | $format = trim($format); |
44 | 44 | |
45 | - if(empty($format)) |
|
45 | + if (empty($format)) |
|
46 | 46 | { |
47 | 47 | $format = self::DEFAULT_FORMAT; |
48 | 48 | } |
@@ -108,15 +108,15 @@ discard block |
||
108 | 108 | { |
109 | 109 | $format = $this->format; |
110 | 110 | |
111 | - foreach($this->validations as $validation) |
|
111 | + foreach ($this->validations as $validation) |
|
112 | 112 | { |
113 | 113 | $method = 'parse_'.$validation; |
114 | 114 | |
115 | - if(method_exists($this, $method)) |
|
115 | + if (method_exists($this, $method)) |
|
116 | 116 | { |
117 | 117 | $format = $this->$method($format); |
118 | 118 | |
119 | - if(!$this->isValid()) |
|
119 | + if (!$this->isValid()) |
|
120 | 120 | { |
121 | 121 | return; |
122 | 122 | } |
@@ -138,13 +138,13 @@ discard block |
||
138 | 138 | |
139 | 139 | private function parse_padding(string $format) : string |
140 | 140 | { |
141 | - if(strstr($format, ':') === false) { |
|
141 | + if (strstr($format, ':') === false) { |
|
142 | 142 | return $format; |
143 | 143 | } |
144 | 144 | |
145 | 145 | $parts = ConvertHelper::explodeTrim(':', $this->format); |
146 | 146 | |
147 | - if(count($parts) !== 2) |
|
147 | + if (count($parts) !== 2) |
|
148 | 148 | { |
149 | 149 | $this->makeError( |
150 | 150 | t( |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | |
160 | 160 | $padding = $parts[1]; |
161 | 161 | |
162 | - if(!preg_match('/\A[#]+\z/x', $padding)) |
|
162 | + if (!preg_match('/\A[#]+\z/x', $padding)) |
|
163 | 163 | { |
164 | 164 | $this->makeError( |
165 | 165 | t('The padding may only contain hashes (%1$s given).', '<code>'.$padding.'</code>'), |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | private function parse_number(string $format) : string |
178 | 178 | { |
179 | - if($format[0] !== '1') |
|
179 | + if ($format[0] !== '1') |
|
180 | 180 | { |
181 | 181 | $this->makeError( |
182 | 182 | t('The first character of the format must be a %1$s.', '<code>1</code>'), |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | $base = str_replace(array('.', ',', ' '), '', $format); |
191 | 191 | $number = intval(substr($base, 0, 4)); |
192 | 192 | |
193 | - if($number === 1000) { |
|
193 | + if ($number === 1000) { |
|
194 | 194 | return $format; |
195 | 195 | } |
196 | 196 | |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | $separator = $format[1]; |
211 | 211 | |
212 | 212 | // No thousands separator |
213 | - if($separator === '0') |
|
213 | + if ($separator === '0') |
|
214 | 214 | { |
215 | 215 | return $format; |
216 | 216 | } |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | // Valid thousands separator |
219 | 219 | $validSeparators = array(' ', ',', '.'); |
220 | 220 | |
221 | - if(in_array($separator, $validSeparators)) |
|
221 | + if (in_array($separator, $validSeparators)) |
|
222 | 222 | { |
223 | 223 | $this->thousandsSeparator = $separator; |
224 | 224 | $format = str_replace('1'.$separator, '1', $format); |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | |
255 | 255 | private function parse_separators(string $format) : string |
256 | 256 | { |
257 | - if(!empty($this->thousandsSeparator) && !empty($this->decimalsSeparator) && $this->thousandsSeparator === $this->decimalsSeparator) |
|
257 | + if (!empty($this->thousandsSeparator) && !empty($this->decimalsSeparator) && $this->thousandsSeparator === $this->decimalsSeparator) |
|
258 | 258 | { |
259 | 259 | $this->makeError( |
260 | 260 | t( |
@@ -270,14 +270,14 @@ discard block |
||
270 | 270 | |
271 | 271 | private function parse_decimals(string $format) : string |
272 | 272 | { |
273 | - if(empty($this->decimalsSeparator)) |
|
273 | + if (empty($this->decimalsSeparator)) |
|
274 | 274 | { |
275 | 275 | return $format; |
276 | 276 | } |
277 | 277 | |
278 | 278 | $parts = ConvertHelper::explodeTrim($this->decimalsSeparator, $format); |
279 | 279 | |
280 | - if(!isset($parts[1])) |
|
280 | + if (!isset($parts[1])) |
|
281 | 281 | { |
282 | 282 | $this->makeError( |
283 | 283 | t('Cannot determine the amount of decimals.').' '. |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | return $format; |
294 | 294 | } |
295 | 295 | |
296 | - if($this->validateDecimals($parts[1])) |
|
296 | + if ($this->validateDecimals($parts[1])) |
|
297 | 297 | { |
298 | 298 | $this->decimals = strlen($parts[1]); |
299 | 299 | } |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | |
304 | 304 | private function validateDecimals(string $decimals) : bool |
305 | 305 | { |
306 | - if(preg_match('/\A[0]+\z/x', $decimals)) { |
|
306 | + if (preg_match('/\A[0]+\z/x', $decimals)) { |
|
307 | 307 | return true; |
308 | 308 | } |
309 | 309 | |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | { |
323 | 323 | $validSeparators = array('.', ','); |
324 | 324 | |
325 | - if(in_array($separator, $validSeparators)) { |
|
325 | + if (in_array($separator, $validSeparators)) { |
|
326 | 326 | return true; |
327 | 327 | } |
328 | 328 | |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | */ |
345 | 345 | private function parse_regex(string $format) : string |
346 | 346 | { |
347 | - if(preg_match('/1[ ,.]?000|1[ ,.]?000[.,][0]+/x', $format)) |
|
347 | + if (preg_match('/1[ ,.]?000|1[ ,.]?000[.,][0]+/x', $format)) |
|
348 | 348 | { |
349 | 349 | return $format; |
350 | 350 | } |
@@ -50,7 +50,7 @@ |
||
50 | 50 | { |
51 | 51 | $value = $this->getRawNumber(); |
52 | 52 | |
53 | - if(!is_numeric($value)) |
|
53 | + if (!is_numeric($value)) |
|
54 | 54 | { |
55 | 55 | $this->validationResult->makeError( |
56 | 56 | t( |