@@ -20,13 +20,13 @@ |
||
20 | 20 | */ |
21 | 21 | abstract class Mailcode_Translator_Syntax_ApacheVelocity extends Mailcode_Translator_Command |
22 | 22 | { |
23 | - /** |
|
24 | - * Filters the string for use in an Apache Velocity (Java) |
|
25 | - * regex string: escapes all special characters. |
|
26 | - * |
|
27 | - * @param string $string |
|
28 | - * @return string |
|
29 | - */ |
|
23 | + /** |
|
24 | + * Filters the string for use in an Apache Velocity (Java) |
|
25 | + * regex string: escapes all special characters. |
|
26 | + * |
|
27 | + * @param string $string |
|
28 | + * @return string |
|
29 | + */ |
|
30 | 30 | protected function filterRegexString(string $string) : string |
31 | 31 | { |
32 | 32 | $escape = array( |
@@ -48,7 +48,7 @@ |
||
48 | 48 | ')' |
49 | 49 | ); |
50 | 50 | |
51 | - foreach($escape as $char) |
|
51 | + foreach ($escape as $char) |
|
52 | 52 | { |
53 | 53 | $string = str_replace($char, '\\'.$char, $string); |
54 | 54 | } |
@@ -22,17 +22,17 @@ discard block |
||
22 | 22 | { |
23 | 23 | public function translate(Mailcode_Commands_Command_If $command): string |
24 | 24 | { |
25 | - if($command instanceof Mailcode_Commands_Command_If_Command) |
|
25 | + if ($command instanceof Mailcode_Commands_Command_If_Command) |
|
26 | 26 | { |
27 | 27 | return $this->translateCommand($command); |
28 | 28 | } |
29 | 29 | |
30 | - if($command instanceof Mailcode_Commands_Command_If_Variable) |
|
30 | + if ($command instanceof Mailcode_Commands_Command_If_Variable) |
|
31 | 31 | { |
32 | 32 | return $this->translateVariable($command); |
33 | 33 | } |
34 | 34 | |
35 | - if($command instanceof Mailcode_Commands_Command_If_Contains) |
|
35 | + if ($command instanceof Mailcode_Commands_Command_If_Contains) |
|
36 | 36 | { |
37 | 37 | return $this->translateContains($command); |
38 | 38 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | { |
45 | 45 | $params = $command->getParams(); |
46 | 46 | |
47 | - if(!$params) |
|
47 | + if (!$params) |
|
48 | 48 | { |
49 | 49 | return ''; |
50 | 50 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | protected function translateContains(Mailcode_Commands_Command_If_Contains $command) : string |
69 | 69 | { |
70 | 70 | $opts = 's'; |
71 | - if($command->isCaseInsensitive()) |
|
71 | + if ($command->isCaseInsensitive()) |
|
72 | 72 | { |
73 | 73 | $opts = 'is'; |
74 | 74 | } |
@@ -22,17 +22,17 @@ discard block |
||
22 | 22 | { |
23 | 23 | public function translate(Mailcode_Commands_Command_ElseIf $command): string |
24 | 24 | { |
25 | - if($command instanceof Mailcode_Commands_Command_ElseIf_Command) |
|
25 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_Command) |
|
26 | 26 | { |
27 | 27 | return $this->translateCommand($command); |
28 | 28 | } |
29 | 29 | |
30 | - if($command instanceof Mailcode_Commands_Command_ElseIf_Variable) |
|
30 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable) |
|
31 | 31 | { |
32 | 32 | return $this->translateVariable($command); |
33 | 33 | } |
34 | 34 | |
35 | - if($command instanceof Mailcode_Commands_Command_ElseIf_Contains) |
|
35 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_Contains) |
|
36 | 36 | { |
37 | 37 | return $this->translateContains($command); |
38 | 38 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | { |
45 | 45 | $params = $command->getParams(); |
46 | 46 | |
47 | - if(!$params) |
|
47 | + if (!$params) |
|
48 | 48 | { |
49 | 49 | return ''; |
50 | 50 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | protected function translateContains(Mailcode_Commands_Command_ElseIf_Contains $command) : string |
69 | 69 | { |
70 | 70 | $opts = 's'; |
71 | - if($command->isCaseInsensitive()) |
|
71 | + if ($command->isCaseInsensitive()) |
|
72 | 72 | { |
73 | 73 | $opts = 'is'; |
74 | 74 | } |
@@ -23,9 +23,9 @@ discard block |
||
23 | 23 | { |
24 | 24 | const ERROR_UNKNOWN_COMMAND_TYPE = 50401; |
25 | 25 | |
26 | - /** |
|
27 | - * @var string |
|
28 | - */ |
|
26 | + /** |
|
27 | + * @var string |
|
28 | + */ |
|
29 | 29 | protected $typeID; |
30 | 30 | |
31 | 31 | public function __construct(string $typeID) |
@@ -33,22 +33,22 @@ discard block |
||
33 | 33 | $this->typeID = $typeID; |
34 | 34 | } |
35 | 35 | |
36 | - /** |
|
37 | - * Retrieves the syntax' type ID, e.g. "ApacheVelocity". |
|
38 | - * @return string |
|
39 | - */ |
|
36 | + /** |
|
37 | + * Retrieves the syntax' type ID, e.g. "ApacheVelocity". |
|
38 | + * @return string |
|
39 | + */ |
|
40 | 40 | public function getTypeID() : string |
41 | 41 | { |
42 | 42 | return $this->typeID; |
43 | 43 | } |
44 | 44 | |
45 | - /** |
|
46 | - * Translates a single command to the target syntax. |
|
47 | - * |
|
48 | - * @param Mailcode_Commands_Command $command |
|
49 | - * @throws Mailcode_Translator_Exception |
|
50 | - * @return string |
|
51 | - */ |
|
45 | + /** |
|
46 | + * Translates a single command to the target syntax. |
|
47 | + * |
|
48 | + * @param Mailcode_Commands_Command $command |
|
49 | + * @throws Mailcode_Translator_Exception |
|
50 | + * @return string |
|
51 | + */ |
|
52 | 52 | public function translateCommand(Mailcode_Commands_Command $command) : string |
53 | 53 | { |
54 | 54 | $translator = $this->createTranslator($command); |
@@ -81,13 +81,13 @@ discard block |
||
81 | 81 | return $translator; |
82 | 82 | } |
83 | 83 | |
84 | - /** |
|
85 | - * Translates all safeguarded commands in the subject string to the |
|
86 | - * target syntax in one go. |
|
87 | - * |
|
88 | - * @param Mailcode_Parser_Safeguard $safeguard |
|
89 | - * @return string |
|
90 | - */ |
|
84 | + /** |
|
85 | + * Translates all safeguarded commands in the subject string to the |
|
86 | + * target syntax in one go. |
|
87 | + * |
|
88 | + * @param Mailcode_Parser_Safeguard $safeguard |
|
89 | + * @return string |
|
90 | + */ |
|
91 | 91 | public function translateSafeguard(Mailcode_Parser_Safeguard $safeguard) : string |
92 | 92 | { |
93 | 93 | $subject = $safeguard->makeSafe(); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $command->getID() |
65 | 65 | ); |
66 | 66 | |
67 | - if(!class_exists($class)) |
|
67 | + if (!class_exists($class)) |
|
68 | 68 | { |
69 | 69 | throw new Mailcode_Translator_Exception( |
70 | 70 | sprintf('Unknown command %s in translator', $command->getID()), |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | { |
93 | 93 | $subject = $safeguard->makeSafe(); |
94 | 94 | |
95 | - if(!$safeguard->hasPlaceholders()) |
|
95 | + if (!$safeguard->hasPlaceholders()) |
|
96 | 96 | { |
97 | 97 | return $subject; |
98 | 98 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | |
102 | 102 | $replaces = array(); |
103 | 103 | |
104 | - foreach($placeholders as $placeholder) |
|
104 | + foreach ($placeholders as $placeholder) |
|
105 | 105 | { |
106 | 106 | $replaces[$placeholder->getReplacementText()] = $this->translateCommand($placeholder->getCommand()); |
107 | 107 | } |
@@ -25,9 +25,9 @@ |
||
25 | 25 | |
26 | 26 | const VALIDATION_NOT_ASSIGNMENT_STATEMENT = 48501; |
27 | 27 | |
28 | - /** |
|
29 | - * @var Mailcode_Parser_Statement_Tokenizer_Type_Value |
|
30 | - */ |
|
28 | + /** |
|
29 | + * @var Mailcode_Parser_Statement_Tokenizer_Type_Value |
|
30 | + */ |
|
31 | 31 | protected $value; |
32 | 32 | |
33 | 33 | public function getName() : string |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | { |
69 | 69 | $variable = $this->params->getInfo()->getVariableByIndex(0); |
70 | 70 | |
71 | - if($variable) |
|
71 | + if ($variable) |
|
72 | 72 | { |
73 | 73 | return $variable->getVariable(); |
74 | 74 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | protected function validateSyntax_assignment() : void |
98 | 98 | { |
99 | - if($this->params->getInfo()->isVariableAssignment()) |
|
99 | + if ($this->params->getInfo()->isVariableAssignment()) |
|
100 | 100 | { |
101 | 101 | return; |
102 | 102 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | $value = $info->getTokenByIndex(2); |
115 | 115 | |
116 | - if($value instanceof Mailcode_Parser_Statement_Tokenizer_Type_Value) |
|
116 | + if ($value instanceof Mailcode_Parser_Statement_Tokenizer_Type_Value) |
|
117 | 117 | { |
118 | 118 | $this->value = $value; |
119 | 119 | return; |
@@ -31,53 +31,53 @@ discard block |
||
31 | 31 | const VALIDATION_UNKNOWN_COMMAND_NAME = 48304; |
32 | 32 | const VALIDATION_INVALID_PARAMS_STATEMENT = 48305; |
33 | 33 | |
34 | - /** |
|
35 | - * @var string |
|
36 | - */ |
|
34 | + /** |
|
35 | + * @var string |
|
36 | + */ |
|
37 | 37 | protected $type = ''; |
38 | 38 | |
39 | - /** |
|
40 | - * @var string |
|
41 | - */ |
|
39 | + /** |
|
40 | + * @var string |
|
41 | + */ |
|
42 | 42 | protected $paramsString = ''; |
43 | 43 | |
44 | - /** |
|
45 | - * @var string |
|
46 | - */ |
|
44 | + /** |
|
45 | + * @var string |
|
46 | + */ |
|
47 | 47 | protected $matchedText = ''; |
48 | 48 | |
49 | - /** |
|
50 | - * @var string |
|
51 | - */ |
|
49 | + /** |
|
50 | + * @var string |
|
51 | + */ |
|
52 | 52 | protected $hash = ''; |
53 | 53 | |
54 | - /** |
|
55 | - * @var \AppUtils\OperationResult |
|
56 | - */ |
|
54 | + /** |
|
55 | + * @var \AppUtils\OperationResult |
|
56 | + */ |
|
57 | 57 | protected $validationResult = null; |
58 | 58 | |
59 | - /** |
|
60 | - * @var \Mailcode\Mailcode |
|
61 | - */ |
|
59 | + /** |
|
60 | + * @var \Mailcode\Mailcode |
|
61 | + */ |
|
62 | 62 | protected $mailcode; |
63 | 63 | |
64 | - /** |
|
65 | - * @var \Mailcode\Mailcode_Parser_Statement |
|
66 | - */ |
|
64 | + /** |
|
65 | + * @var \Mailcode\Mailcode_Parser_Statement |
|
66 | + */ |
|
67 | 67 | protected $params; |
68 | 68 | |
69 | - /** |
|
70 | - * @var string[] |
|
71 | - */ |
|
69 | + /** |
|
70 | + * @var string[] |
|
71 | + */ |
|
72 | 72 | protected $validations = array( |
73 | 73 | 'params', |
74 | 74 | 'type_supported', |
75 | 75 | 'type_unsupported' |
76 | 76 | ); |
77 | 77 | |
78 | - /** |
|
79 | - * @var string |
|
80 | - */ |
|
78 | + /** |
|
79 | + * @var string |
|
80 | + */ |
|
81 | 81 | protected $comment = ''; |
82 | 82 | |
83 | 83 | public function __construct(string $type='', string $paramsString='', string $matchedText='') |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | |
96 | 96 | } |
97 | 97 | |
98 | - /** |
|
99 | - * @return string The ID of the command = the name of the command class file. |
|
100 | - */ |
|
98 | + /** |
|
99 | + * @return string The ID of the command = the name of the command class file. |
|
100 | + */ |
|
101 | 101 | public function getID() : string |
102 | 102 | { |
103 | 103 | // account for commands with types: If_Variable should still return If. |
@@ -106,14 +106,14 @@ discard block |
||
106 | 106 | return array_shift($tokens); |
107 | 107 | } |
108 | 108 | |
109 | - /** |
|
110 | - * Sets an optional comment that is not used anywhere, but |
|
111 | - * can be used by the application to track why a command is |
|
112 | - * used somewhere. |
|
113 | - * |
|
114 | - * @param string $comment |
|
115 | - * @return Mailcode_Commands_Command |
|
116 | - */ |
|
109 | + /** |
|
110 | + * Sets an optional comment that is not used anywhere, but |
|
111 | + * can be used by the application to track why a command is |
|
112 | + * used somewhere. |
|
113 | + * |
|
114 | + * @param string $comment |
|
115 | + * @return Mailcode_Commands_Command |
|
116 | + */ |
|
117 | 117 | public function setComment(string $comment) : Mailcode_Commands_Command |
118 | 118 | { |
119 | 119 | $this->comment = $comment; |
@@ -121,34 +121,34 @@ discard block |
||
121 | 121 | return $this; |
122 | 122 | } |
123 | 123 | |
124 | - /** |
|
125 | - * Retrieves the previously set comment, if any. |
|
126 | - * |
|
127 | - * @return string |
|
128 | - */ |
|
124 | + /** |
|
125 | + * Retrieves the previously set comment, if any. |
|
126 | + * |
|
127 | + * @return string |
|
128 | + */ |
|
129 | 129 | public function getComment() : string |
130 | 130 | { |
131 | 131 | return $this->comment; |
132 | 132 | } |
133 | 133 | |
134 | - /** |
|
135 | - * Checks whether this is a dummy command, which is only |
|
136 | - * used to access information on the command type. It cannot |
|
137 | - * be used as an actual live command. |
|
138 | - * |
|
139 | - * @return bool |
|
140 | - */ |
|
134 | + /** |
|
135 | + * Checks whether this is a dummy command, which is only |
|
136 | + * used to access information on the command type. It cannot |
|
137 | + * be used as an actual live command. |
|
138 | + * |
|
139 | + * @return bool |
|
140 | + */ |
|
141 | 141 | public function isDummy() : bool |
142 | 142 | { |
143 | 143 | return $this->type === '__dummy'; |
144 | 144 | } |
145 | 145 | |
146 | - /** |
|
147 | - * Retrieves a hash of the actual matched command string, |
|
148 | - * which is used in collections to detect duplicate commands. |
|
149 | - * |
|
150 | - * @return string |
|
151 | - */ |
|
146 | + /** |
|
147 | + * Retrieves a hash of the actual matched command string, |
|
148 | + * which is used in collections to detect duplicate commands. |
|
149 | + * |
|
150 | + * @return string |
|
151 | + */ |
|
152 | 152 | public function getHash() : string |
153 | 153 | { |
154 | 154 | $this->requireNonDummy(); |
@@ -240,9 +240,9 @@ discard block |
||
240 | 240 | } |
241 | 241 | } |
242 | 242 | |
243 | - /** |
|
244 | - * @return string[] |
|
245 | - */ |
|
243 | + /** |
|
244 | + * @return string[] |
|
245 | + */ |
|
246 | 246 | abstract protected function getValidations() : array; |
247 | 247 | |
248 | 248 | protected function validateSyntax_params() : void |
@@ -429,22 +429,22 @@ discard block |
||
429 | 429 | return implode('', $parts); |
430 | 430 | } |
431 | 431 | |
432 | - /** |
|
433 | - * Retrieves the names of all the command's supported types: the part |
|
434 | - * between the command name and the colon. Example: {command type: params}. |
|
435 | - * |
|
436 | - * @return string[] |
|
437 | - */ |
|
432 | + /** |
|
433 | + * Retrieves the names of all the command's supported types: the part |
|
434 | + * between the command name and the colon. Example: {command type: params}. |
|
435 | + * |
|
436 | + * @return string[] |
|
437 | + */ |
|
438 | 438 | public function getSupportedTypes() : array |
439 | 439 | { |
440 | 440 | return array(); |
441 | 441 | } |
442 | 442 | |
443 | - /** |
|
444 | - * Retrieves all variable names used in the command. |
|
445 | - * |
|
446 | - * @return Mailcode_Variables_Collection_Regular |
|
447 | - */ |
|
443 | + /** |
|
444 | + * Retrieves all variable names used in the command. |
|
445 | + * |
|
446 | + * @return Mailcode_Variables_Collection_Regular |
|
447 | + */ |
|
448 | 448 | public function getVariables() : Mailcode_Variables_Collection_Regular |
449 | 449 | { |
450 | 450 | return Mailcode::create()->findVariables($this->paramsString); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | */ |
81 | 81 | protected $comment = ''; |
82 | 82 | |
83 | - public function __construct(string $type='', string $paramsString='', string $matchedText='') |
|
83 | + public function __construct(string $type = '', string $paramsString = '', string $matchedText = '') |
|
84 | 84 | { |
85 | 85 | $this->type = $type; |
86 | 86 | $this->paramsString = html_entity_decode($paramsString); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | { |
154 | 154 | $this->requireNonDummy(); |
155 | 155 | |
156 | - if($this->hash === '') { |
|
156 | + if ($this->hash === '') { |
|
157 | 157 | $this->hash = md5($this->matchedText); |
158 | 158 | } |
159 | 159 | |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | protected function requireNonDummy() : void |
164 | 164 | { |
165 | - if(!$this->isDummy()) |
|
165 | + if (!$this->isDummy()) |
|
166 | 166 | { |
167 | 167 | return; |
168 | 168 | } |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | { |
184 | 184 | $this->requireNonDummy(); |
185 | 185 | |
186 | - if(isset($this->validationResult)) |
|
186 | + if (isset($this->validationResult)) |
|
187 | 187 | { |
188 | 188 | return $this->validationResult; |
189 | 189 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | |
198 | 198 | public function getValidationResult() : \AppUtils\OperationResult |
199 | 199 | { |
200 | - if(isset($this->validationResult)) |
|
200 | + if (isset($this->validationResult)) |
|
201 | 201 | { |
202 | 202 | return $this->validationResult; |
203 | 203 | } |
@@ -213,11 +213,11 @@ discard block |
||
213 | 213 | { |
214 | 214 | $validations = array_merge($this->validations, $this->getValidations()); |
215 | 215 | |
216 | - foreach($validations as $validation) |
|
216 | + foreach ($validations as $validation) |
|
217 | 217 | { |
218 | 218 | $method = 'validateSyntax_'.$validation; |
219 | 219 | |
220 | - if(!method_exists($this, $method)) |
|
220 | + if (!method_exists($this, $method)) |
|
221 | 221 | { |
222 | 222 | throw new Mailcode_Exception( |
223 | 223 | 'Missing validation method', |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | $this->$method(); |
234 | 234 | |
235 | 235 | // break off at the first validation issue |
236 | - if(!$this->validationResult->isValid()) |
|
236 | + if (!$this->validationResult->isValid()) |
|
237 | 237 | { |
238 | 238 | return; |
239 | 239 | } |
@@ -247,12 +247,12 @@ discard block |
||
247 | 247 | |
248 | 248 | protected function validateSyntax_params() : void |
249 | 249 | { |
250 | - if(!$this->requiresParameters()) |
|
250 | + if (!$this->requiresParameters()) |
|
251 | 251 | { |
252 | 252 | return; |
253 | 253 | } |
254 | 254 | |
255 | - if(empty($this->paramsString)) |
|
255 | + if (empty($this->paramsString)) |
|
256 | 256 | { |
257 | 257 | $this->validationResult->makeError( |
258 | 258 | t('Parameters have to be specified.'), |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | |
264 | 264 | $this->params = $this->mailcode->getParser()->createStatement($this->paramsString); |
265 | 265 | |
266 | - if(!$this->params->isValid()) |
|
266 | + if (!$this->params->isValid()) |
|
267 | 267 | { |
268 | 268 | $error = $this->params->getValidationResult(); |
269 | 269 | |
@@ -276,14 +276,14 @@ discard block |
||
276 | 276 | |
277 | 277 | protected function validateSyntax_type_supported() : void |
278 | 278 | { |
279 | - if(!$this->supportsType() || empty($this->type)) |
|
279 | + if (!$this->supportsType() || empty($this->type)) |
|
280 | 280 | { |
281 | 281 | return; |
282 | 282 | } |
283 | 283 | |
284 | 284 | $types = $this->getSupportedTypes(); |
285 | 285 | |
286 | - if(!in_array($this->type, $types)) |
|
286 | + if (!in_array($this->type, $types)) |
|
287 | 287 | { |
288 | 288 | $this->validationResult->makeError( |
289 | 289 | t('The command addon %1$s is not supported.', $this->type).' '. |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | |
298 | 298 | protected function validateSyntax_type_unsupported() : void |
299 | 299 | { |
300 | - if($this->supportsType() || empty($this->type)) |
|
300 | + if ($this->supportsType() || empty($this->type)) |
|
301 | 301 | { |
302 | 302 | return; |
303 | 303 | } |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | |
316 | 316 | public function getType() : string |
317 | 317 | { |
318 | - if($this->supportsType()) |
|
318 | + if ($this->supportsType()) |
|
319 | 319 | { |
320 | 320 | return $this->type; |
321 | 321 | } |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | |
336 | 336 | public function getHighlighted() : string |
337 | 337 | { |
338 | - if(!$this->isValid()) |
|
338 | + if (!$this->isValid()) |
|
339 | 339 | { |
340 | 340 | return ''; |
341 | 341 | } |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | |
347 | 347 | public function getParamsString() : string |
348 | 348 | { |
349 | - if($this->requiresParameters()) |
|
349 | + if ($this->requiresParameters()) |
|
350 | 350 | { |
351 | 351 | return $this->paramsString; |
352 | 352 | } |
@@ -373,22 +373,22 @@ discard block |
||
373 | 373 | |
374 | 374 | public final function getCommandType() : string |
375 | 375 | { |
376 | - if($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
376 | + if ($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
377 | 377 | { |
378 | 378 | return 'Closing'; |
379 | 379 | } |
380 | 380 | |
381 | - if($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
381 | + if ($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
382 | 382 | { |
383 | 383 | return 'Opening'; |
384 | 384 | } |
385 | 385 | |
386 | - if($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
386 | + if ($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
387 | 387 | { |
388 | 388 | return 'Sibling'; |
389 | 389 | } |
390 | 390 | |
391 | - if($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
391 | + if ($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
392 | 392 | { |
393 | 393 | return 'Standalone'; |
394 | 394 | } |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | |
406 | 406 | public function getNormalized() : string |
407 | 407 | { |
408 | - if(!$this->isValid()) |
|
408 | + if (!$this->isValid()) |
|
409 | 409 | { |
410 | 410 | return ''; |
411 | 411 | } |
@@ -413,12 +413,12 @@ discard block |
||
413 | 413 | $parts = array(); |
414 | 414 | $parts[] = '{'.$this->getName(); |
415 | 415 | |
416 | - if($this->supportsType() && $this->hasType()) |
|
416 | + if ($this->supportsType() && $this->hasType()) |
|
417 | 417 | { |
418 | 418 | $parts[] = ' '.$this->getType(); |
419 | 419 | } |
420 | 420 | |
421 | - if($this->requiresParameters() && isset($this->params)) |
|
421 | + if ($this->requiresParameters() && isset($this->params)) |
|
422 | 422 | { |
423 | 423 | $parts[] = ': '; |
424 | 424 | $parts[] = $this->params->getNormalized(); |
@@ -24,9 +24,9 @@ discard block |
||
24 | 24 | |
25 | 25 | const VALIDATION_VARIABLE_MISSING = 52001; |
26 | 26 | |
27 | - /** |
|
28 | - * @var Mailcode_Variables_Variable|NULL |
|
29 | - */ |
|
27 | + /** |
|
28 | + * @var Mailcode_Variables_Variable|NULL |
|
29 | + */ |
|
30 | 30 | protected $variable; |
31 | 31 | |
32 | 32 | public function getName() : string |
@@ -54,13 +54,13 @@ discard block |
||
54 | 54 | return true; |
55 | 55 | } |
56 | 56 | |
57 | - /** |
|
58 | - * Retrieves the variable to show, provided the command |
|
59 | - * is valid. |
|
60 | - * |
|
61 | - * @throws Mailcode_Exception |
|
62 | - * @return Mailcode_Variables_Variable |
|
63 | - */ |
|
57 | + /** |
|
58 | + * Retrieves the variable to show, provided the command |
|
59 | + * is valid. |
|
60 | + * |
|
61 | + * @throws Mailcode_Exception |
|
62 | + * @return Mailcode_Variables_Variable |
|
63 | + */ |
|
64 | 64 | public function getVariable() : Mailcode_Variables_Variable |
65 | 65 | { |
66 | 66 | $this->validate(); |
@@ -77,13 +77,13 @@ discard block |
||
77 | 77 | ); |
78 | 78 | } |
79 | 79 | |
80 | - /** |
|
81 | - * Retrieves the full name of the variable to show, |
|
82 | - * provided the command is valid. |
|
83 | - * |
|
84 | - * @throws Mailcode_Exception |
|
85 | - * @return string |
|
86 | - */ |
|
80 | + /** |
|
81 | + * Retrieves the full name of the variable to show, |
|
82 | + * provided the command is valid. |
|
83 | + * |
|
84 | + * @throws Mailcode_Exception |
|
85 | + * @return string |
|
86 | + */ |
|
87 | 87 | public function getVariableName() : string |
88 | 88 | { |
89 | 89 | return $this->getVariable()->getFullName(); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | { |
66 | 66 | $this->validate(); |
67 | 67 | |
68 | - if(isset($this->variable)) |
|
68 | + if (isset($this->variable)) |
|
69 | 69 | { |
70 | 70 | return $this->variable; |
71 | 71 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | $var = $info->getVariableByIndex(0); |
97 | 97 | |
98 | - if($var) |
|
98 | + if ($var) |
|
99 | 99 | { |
100 | 100 | $this->variable = $var->getVariable(); |
101 | 101 | return; |
@@ -24,9 +24,9 @@ discard block |
||
24 | 24 | */ |
25 | 25 | abstract class Mailcode_Parser_Safeguard_Formatter |
26 | 26 | { |
27 | - /** |
|
28 | - * @var Mailcode_Parser_Safeguard |
|
29 | - */ |
|
27 | + /** |
|
28 | + * @var Mailcode_Parser_Safeguard |
|
29 | + */ |
|
30 | 30 | protected $safeguard; |
31 | 31 | |
32 | 32 | public function __construct(Mailcode_Parser_Safeguard $safeguard) |
@@ -36,13 +36,13 @@ discard block |
||
36 | 36 | |
37 | 37 | abstract public function format(string $subject) : string; |
38 | 38 | |
39 | - /** |
|
40 | - * Resolves a list of positions of needle in the haystack. |
|
41 | - * |
|
42 | - * @param string $needle |
|
43 | - * @param string $haystack |
|
44 | - * @return int[] |
|
45 | - */ |
|
39 | + /** |
|
40 | + * Resolves a list of positions of needle in the haystack. |
|
41 | + * |
|
42 | + * @param string $needle |
|
43 | + * @param string $haystack |
|
44 | + * @return int[] |
|
45 | + */ |
|
46 | 46 | protected function resolvePositions(string $needle, string $haystack) : array |
47 | 47 | { |
48 | 48 | $lastPos = 0; |
@@ -57,12 +57,12 @@ discard block |
||
57 | 57 | return $positions; |
58 | 58 | } |
59 | 59 | |
60 | - /** |
|
61 | - * Resolves the newline character used in the string. |
|
62 | - * |
|
63 | - * @param string $subject |
|
64 | - * @return string |
|
65 | - */ |
|
60 | + /** |
|
61 | + * Resolves the newline character used in the string. |
|
62 | + * |
|
63 | + * @param string $subject |
|
64 | + * @return string |
|
65 | + */ |
|
66 | 66 | protected function resolveNewlineChar(string $subject) : string |
67 | 67 | { |
68 | 68 | $eol = ConvertHelper::detectEOLCharacter($subject); |
@@ -75,13 +75,13 @@ discard block |
||
75 | 75 | return PHP_EOL; |
76 | 76 | } |
77 | 77 | |
78 | - /** |
|
79 | - * Resolves the list of placeholder strings that need |
|
80 | - * to be formatted. This includes only commands that |
|
81 | - * do not generate content. |
|
82 | - * |
|
83 | - * @return string[] |
|
84 | - */ |
|
78 | + /** |
|
79 | + * Resolves the list of placeholder strings that need |
|
80 | + * to be formatted. This includes only commands that |
|
81 | + * do not generate content. |
|
82 | + * |
|
83 | + * @return string[] |
|
84 | + */ |
|
85 | 85 | protected function resolvePlaceholderStrings() : array |
86 | 86 | { |
87 | 87 | $placeholders = $this->filterPlaceholders(); |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | return $result; |
97 | 97 | } |
98 | 98 | |
99 | - /** |
|
100 | - * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[] |
|
101 | - */ |
|
99 | + /** |
|
100 | + * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[] |
|
101 | + */ |
|
102 | 102 | protected function filterPlaceholders() |
103 | 103 | { |
104 | 104 | return $this->safeguard->getPlaceholders(); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $lastPos = 0; |
49 | 49 | $positions = array(); |
50 | 50 | |
51 | - while (($lastPos = mb_strpos($haystack, $needle, $lastPos))!== false) |
|
51 | + while (($lastPos = mb_strpos($haystack, $needle, $lastPos)) !== false) |
|
52 | 52 | { |
53 | 53 | $positions[] = $lastPos; |
54 | 54 | $lastPos = $lastPos + mb_strlen($needle); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | { |
68 | 68 | $eol = ConvertHelper::detectEOLCharacter($subject); |
69 | 69 | |
70 | - if($eol) |
|
70 | + if ($eol) |
|
71 | 71 | { |
72 | 72 | return $eol->getCharacter(); |
73 | 73 | } |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | |
89 | 89 | $result = array(); |
90 | 90 | |
91 | - foreach($placeholders as $placeholder) |
|
91 | + foreach ($placeholders as $placeholder) |
|
92 | 92 | { |
93 | 93 | $result[] = $placeholder->getReplacementText(); |
94 | 94 | } |
@@ -21,39 +21,39 @@ discard block |
||
21 | 21 | */ |
22 | 22 | class Mailcode_Parser_Safeguard_Formatter_SingleLines_Placeholder |
23 | 23 | { |
24 | - /** |
|
25 | - * @var int |
|
26 | - */ |
|
24 | + /** |
|
25 | + * @var int |
|
26 | + */ |
|
27 | 27 | protected $eolLength; |
28 | 28 | |
29 | - /** |
|
30 | - * @var int |
|
31 | - */ |
|
29 | + /** |
|
30 | + * @var int |
|
31 | + */ |
|
32 | 32 | protected $position; |
33 | 33 | |
34 | - /** |
|
35 | - * @var string |
|
36 | - */ |
|
34 | + /** |
|
35 | + * @var string |
|
36 | + */ |
|
37 | 37 | protected $subject; |
38 | 38 | |
39 | - /** |
|
40 | - * @var Mailcode_Parser_Safeguard_Formatter_SingleLines |
|
41 | - */ |
|
39 | + /** |
|
40 | + * @var Mailcode_Parser_Safeguard_Formatter_SingleLines |
|
41 | + */ |
|
42 | 42 | protected $formatter; |
43 | 43 | |
44 | - /** |
|
45 | - * @var boolean |
|
46 | - */ |
|
44 | + /** |
|
45 | + * @var boolean |
|
46 | + */ |
|
47 | 47 | protected $prepend = false; |
48 | 48 | |
49 | - /** |
|
50 | - * @var boolean |
|
51 | - */ |
|
49 | + /** |
|
50 | + * @var boolean |
|
51 | + */ |
|
52 | 52 | protected $append = false; |
53 | 53 | |
54 | - /** |
|
55 | - * @var int |
|
56 | - */ |
|
54 | + /** |
|
55 | + * @var int |
|
56 | + */ |
|
57 | 57 | protected $placeholderLength; |
58 | 58 | |
59 | 59 | public function __construct(Mailcode_Parser_Safeguard_Formatter_SingleLines $formatter, string $subject, int $placeholderLength, int $position) |
@@ -67,11 +67,11 @@ discard block |
||
67 | 67 | $this->analyzeAppend($subject); |
68 | 68 | } |
69 | 69 | |
70 | - /** |
|
71 | - * Whether an EOL character needs to be appended or prepended. |
|
72 | - * |
|
73 | - * @return bool |
|
74 | - */ |
|
70 | + /** |
|
71 | + * Whether an EOL character needs to be appended or prepended. |
|
72 | + * |
|
73 | + * @return bool |
|
74 | + */ |
|
75 | 75 | public function requiresAdjustment() : bool |
76 | 76 | { |
77 | 77 | return $this->requiresAppend() || $this->requiresPrepend(); |
@@ -90,21 +90,21 @@ discard block |
||
90 | 90 | protected function analyzePrepend(string $subject) : void |
91 | 91 | { |
92 | 92 | // we're at the beginning of the string |
93 | - if($this->position == 0) |
|
93 | + if ($this->position == 0) |
|
94 | 94 | { |
95 | 95 | return; |
96 | 96 | } |
97 | 97 | |
98 | 98 | $prevPos = $this->position - $this->eolLength; |
99 | 99 | |
100 | - if($prevPos < 0) |
|
100 | + if ($prevPos < 0) |
|
101 | 101 | { |
102 | 102 | $prevPos = 0; |
103 | 103 | } |
104 | 104 | |
105 | 105 | $prev = mb_substr($subject, $prevPos, $this->eolLength); |
106 | 106 | |
107 | - if($prev !== $this->formatter->getEOLChar()) |
|
107 | + if ($prev !== $this->formatter->getEOLChar()) |
|
108 | 108 | { |
109 | 109 | $this->prepend = true; |
110 | 110 | } |
@@ -117,21 +117,21 @@ discard block |
||
117 | 117 | $position = $this->position + $this->placeholderLength; |
118 | 118 | |
119 | 119 | // we're at the end of the string |
120 | - if($position >= $subjectLength) |
|
120 | + if ($position >= $subjectLength) |
|
121 | 121 | { |
122 | 122 | return; |
123 | 123 | } |
124 | 124 | |
125 | 125 | $nextPos = $position + $this->eolLength; |
126 | 126 | |
127 | - if($nextPos > $subjectLength) |
|
127 | + if ($nextPos > $subjectLength) |
|
128 | 128 | { |
129 | 129 | $nextPos = $subjectLength - $this->eolLength; |
130 | 130 | } |
131 | 131 | |
132 | 132 | $next = mb_substr($subject, $nextPos, $this->eolLength); |
133 | 133 | |
134 | - if($next !== $this->formatter->getEOLChar()) |
|
134 | + if ($next !== $this->formatter->getEOLChar()) |
|
135 | 135 | { |
136 | 136 | $this->append = true; |
137 | 137 | } |