@@ -26,51 +26,51 @@ discard block |
||
26 | 26 | */ |
27 | 27 | class Mailcode |
28 | 28 | { |
29 | - /** |
|
30 | - * @var Mailcode_Parser|NULL |
|
31 | - */ |
|
29 | + /** |
|
30 | + * @var Mailcode_Parser|NULL |
|
31 | + */ |
|
32 | 32 | protected $parser = null; |
33 | 33 | |
34 | - /** |
|
35 | - * @var Mailcode_Commands|NULL |
|
36 | - */ |
|
34 | + /** |
|
35 | + * @var Mailcode_Commands|NULL |
|
36 | + */ |
|
37 | 37 | protected $commands = null; |
38 | 38 | |
39 | - /** |
|
40 | - * @var Mailcode_Variables|NULL |
|
41 | - */ |
|
39 | + /** |
|
40 | + * @var Mailcode_Variables|NULL |
|
41 | + */ |
|
42 | 42 | protected $variables = null; |
43 | 43 | |
44 | - /** |
|
45 | - * @var Mailcode_Translator|NULL |
|
46 | - */ |
|
44 | + /** |
|
45 | + * @var Mailcode_Translator|NULL |
|
46 | + */ |
|
47 | 47 | protected $translator = null; |
48 | 48 | |
49 | - /** |
|
50 | - * Creates a new mailcode instance. |
|
51 | - * @return Mailcode |
|
52 | - */ |
|
49 | + /** |
|
50 | + * Creates a new mailcode instance. |
|
51 | + * @return Mailcode |
|
52 | + */ |
|
53 | 53 | public static function create() : Mailcode |
54 | 54 | { |
55 | 55 | return new Mailcode(); |
56 | 56 | } |
57 | 57 | |
58 | - /** |
|
59 | - * Parses the string to detect all commands contained within. |
|
60 | - * |
|
61 | - * @param string $string |
|
62 | - * @return Mailcode_Collection |
|
63 | - */ |
|
58 | + /** |
|
59 | + * Parses the string to detect all commands contained within. |
|
60 | + * |
|
61 | + * @param string $string |
|
62 | + * @return Mailcode_Collection |
|
63 | + */ |
|
64 | 64 | public function parseString(string $string) : Mailcode_Collection |
65 | 65 | { |
66 | 66 | return $this->getParser()->parseString($string); |
67 | 67 | } |
68 | 68 | |
69 | - /** |
|
70 | - * Retrieves the string parser instance used to detect commands. |
|
71 | - * |
|
72 | - * @return Mailcode_Parser |
|
73 | - */ |
|
69 | + /** |
|
70 | + * Retrieves the string parser instance used to detect commands. |
|
71 | + * |
|
72 | + * @return Mailcode_Parser |
|
73 | + */ |
|
74 | 74 | public function getParser() : Mailcode_Parser |
75 | 75 | { |
76 | 76 | if(!isset($this->parser)) |
@@ -81,12 +81,12 @@ discard block |
||
81 | 81 | return $this->parser; |
82 | 82 | } |
83 | 83 | |
84 | - /** |
|
85 | - * Retrieves the commands collection, which is used to |
|
86 | - * access information on the available commands. |
|
87 | - * |
|
88 | - * @return Mailcode_Commands |
|
89 | - */ |
|
84 | + /** |
|
85 | + * Retrieves the commands collection, which is used to |
|
86 | + * access information on the available commands. |
|
87 | + * |
|
88 | + * @return Mailcode_Commands |
|
89 | + */ |
|
90 | 90 | public function getCommands() : Mailcode_Commands |
91 | 91 | { |
92 | 92 | if(!isset($this->commands)) |
@@ -129,12 +129,12 @@ discard block |
||
129 | 129 | return $this->variables; |
130 | 130 | } |
131 | 131 | |
132 | - /** |
|
133 | - * Creates the translator, which can be used to convert commands |
|
134 | - * to another supported syntax. |
|
135 | - * |
|
136 | - * @return Mailcode_Translator |
|
137 | - */ |
|
132 | + /** |
|
133 | + * Creates the translator, which can be used to convert commands |
|
134 | + * to another supported syntax. |
|
135 | + * |
|
136 | + * @return Mailcode_Translator |
|
137 | + */ |
|
138 | 138 | public function createTranslator() : Mailcode_Translator |
139 | 139 | { |
140 | 140 | if(!isset($this->translator)) |
@@ -145,12 +145,12 @@ discard block |
||
145 | 145 | return $this->translator; |
146 | 146 | } |
147 | 147 | |
148 | - /** |
|
149 | - * Creates the styler, which can be used to retrieve the |
|
150 | - * CSS required to style the highlighted commands in HTML. |
|
151 | - * |
|
152 | - * @return Mailcode_Styler |
|
153 | - */ |
|
148 | + /** |
|
149 | + * Creates the styler, which can be used to retrieve the |
|
150 | + * CSS required to style the highlighted commands in HTML. |
|
151 | + * |
|
152 | + * @return Mailcode_Styler |
|
153 | + */ |
|
154 | 154 | public function createStyler() : Mailcode_Styler |
155 | 155 | { |
156 | 156 | return new Mailcode_Styler(); |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | */ |
21 | 21 | abstract class Mailcode_Variables_Collection |
22 | 22 | { |
23 | - /** |
|
24 | - * @var Mailcode_Variables_Variable[] |
|
25 | - */ |
|
23 | + /** |
|
24 | + * @var Mailcode_Variables_Variable[] |
|
25 | + */ |
|
26 | 26 | protected $variables = array(); |
27 | 27 | |
28 | 28 | public function __construct() |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | return count($this->variables); |
53 | 53 | } |
54 | 54 | |
55 | - /** |
|
56 | - * Checks whether the collection contains a variable with the specified name. |
|
57 | - * |
|
58 | - * @param string $fullName The variable name, with or without $ sign. |
|
59 | - * @return bool |
|
60 | - */ |
|
55 | + /** |
|
56 | + * Checks whether the collection contains a variable with the specified name. |
|
57 | + * |
|
58 | + * @param string $fullName The variable name, with or without $ sign. |
|
59 | + * @return bool |
|
60 | + */ |
|
61 | 61 | public function hasVariableName(string $fullName) : bool |
62 | 62 | { |
63 | 63 | $fullName = $this->fixName($fullName); |
@@ -73,14 +73,14 @@ discard block |
||
73 | 73 | return false; |
74 | 74 | } |
75 | 75 | |
76 | - /** |
|
77 | - * Retrieves a collection of all variable instances for |
|
78 | - * the specified name (there can be several with differing |
|
79 | - * matched texts because of spacing). |
|
80 | - * |
|
81 | - * @param string $fullName |
|
82 | - * @return Mailcode_Variables_Collection |
|
83 | - */ |
|
76 | + /** |
|
77 | + * Retrieves a collection of all variable instances for |
|
78 | + * the specified name (there can be several with differing |
|
79 | + * matched texts because of spacing). |
|
80 | + * |
|
81 | + * @param string $fullName |
|
82 | + * @return Mailcode_Variables_Collection |
|
83 | + */ |
|
84 | 84 | public function getByFullName(string $fullName) : Mailcode_Variables_Collection |
85 | 85 | { |
86 | 86 | $fullName = $this->fixName($fullName); |
@@ -98,12 +98,12 @@ discard block |
||
98 | 98 | return $collection; |
99 | 99 | } |
100 | 100 | |
101 | - /** |
|
102 | - * Prepends the $ sign to a variable name if it does not have it. |
|
103 | - * |
|
104 | - * @param string $fullName |
|
105 | - * @return string |
|
106 | - */ |
|
101 | + /** |
|
102 | + * Prepends the $ sign to a variable name if it does not have it. |
|
103 | + * |
|
104 | + * @param string $fullName |
|
105 | + * @return string |
|
106 | + */ |
|
107 | 107 | protected function fixName(string $fullName) : string |
108 | 108 | { |
109 | 109 | if(substr($fullName, 0, 1) === '$') |
@@ -114,12 +114,12 @@ discard block |
||
114 | 114 | return '$'.$fullName; |
115 | 115 | } |
116 | 116 | |
117 | - /** |
|
118 | - * Retrieves all variables, grouped by their hash - meaning |
|
119 | - * unique matched strings. |
|
120 | - * |
|
121 | - * @return Mailcode_Variables_Variable[] |
|
122 | - */ |
|
117 | + /** |
|
118 | + * Retrieves all variables, grouped by their hash - meaning |
|
119 | + * unique matched strings. |
|
120 | + * |
|
121 | + * @return Mailcode_Variables_Variable[] |
|
122 | + */ |
|
123 | 123 | public function getGroupedByHash() : array |
124 | 124 | { |
125 | 125 | $entries = array(); |
@@ -132,11 +132,11 @@ discard block |
||
132 | 132 | return $this->sortVariables($entries); |
133 | 133 | } |
134 | 134 | |
135 | - /** |
|
136 | - * Retrieves all variables, grouped by their name. |
|
137 | - * |
|
138 | - * @return Mailcode_Variables_Variable[] |
|
139 | - */ |
|
135 | + /** |
|
136 | + * Retrieves all variables, grouped by their name. |
|
137 | + * |
|
138 | + * @return Mailcode_Variables_Variable[] |
|
139 | + */ |
|
140 | 140 | public function getGroupedByName() : array |
141 | 141 | { |
142 | 142 | $entries = array(); |
@@ -168,19 +168,19 @@ discard block |
||
168 | 168 | return $this->sortVariables($entries); |
169 | 169 | } |
170 | 170 | |
171 | - /** |
|
172 | - * Retrieves all variables, in the order they were addded. |
|
173 | - * @return Mailcode_Variables_Variable[] |
|
174 | - */ |
|
171 | + /** |
|
172 | + * Retrieves all variables, in the order they were addded. |
|
173 | + * @return Mailcode_Variables_Variable[] |
|
174 | + */ |
|
175 | 175 | public function getAll() |
176 | 176 | { |
177 | 177 | return $this->variables; |
178 | 178 | } |
179 | 179 | |
180 | - /** |
|
181 | - * Retrieves the full names of the variables that are present in the collection. |
|
182 | - * @return string[] |
|
183 | - */ |
|
180 | + /** |
|
181 | + * Retrieves the full names of the variables that are present in the collection. |
|
182 | + * @return string[] |
|
183 | + */ |
|
184 | 184 | public function getNames() : array |
185 | 185 | { |
186 | 186 | $result = array(); |
@@ -198,13 +198,13 @@ discard block |
||
198 | 198 | return $result; |
199 | 199 | } |
200 | 200 | |
201 | - /** |
|
202 | - * Takes a list of variables and sorts them, throwing away |
|
203 | - * the source array's keys. |
|
204 | - * |
|
205 | - * @param Mailcode_Variables_Variable[] $entries |
|
206 | - * @return Mailcode_Variables_Variable[] |
|
207 | - */ |
|
201 | + /** |
|
202 | + * Takes a list of variables and sorts them, throwing away |
|
203 | + * the source array's keys. |
|
204 | + * |
|
205 | + * @param Mailcode_Variables_Variable[] $entries |
|
206 | + * @return Mailcode_Variables_Variable[] |
|
207 | + */ |
|
208 | 208 | protected function sortVariables(array $entries) |
209 | 209 | { |
210 | 210 | $result = array_values($entries); |
@@ -217,13 +217,13 @@ discard block |
||
217 | 217 | return $result; |
218 | 218 | } |
219 | 219 | |
220 | - /** |
|
221 | - * Merges the variables collection with the target collection |
|
222 | - * by inheriting all that collection's variables. |
|
223 | - * |
|
224 | - * @param Mailcode_Variables_Collection $collection |
|
225 | - * @return Mailcode_Variables_Collection |
|
226 | - */ |
|
220 | + /** |
|
221 | + * Merges the variables collection with the target collection |
|
222 | + * by inheriting all that collection's variables. |
|
223 | + * |
|
224 | + * @param Mailcode_Variables_Collection $collection |
|
225 | + * @return Mailcode_Variables_Collection |
|
226 | + */ |
|
227 | 227 | public function mergeWith(Mailcode_Variables_Collection $collection) : Mailcode_Variables_Collection |
228 | 228 | { |
229 | 229 | $variables = $collection->getGroupedByHash(); |
@@ -43,44 +43,44 @@ discard block |
||
43 | 43 | |
44 | 44 | const META_URL_ENCODING = 'url_encoding'; |
45 | 45 | |
46 | - /** |
|
47 | - * @var string |
|
48 | - */ |
|
46 | + /** |
|
47 | + * @var string |
|
48 | + */ |
|
49 | 49 | protected $type = ''; |
50 | 50 | |
51 | - /** |
|
52 | - * @var string |
|
53 | - */ |
|
51 | + /** |
|
52 | + * @var string |
|
53 | + */ |
|
54 | 54 | protected $paramsString = ''; |
55 | 55 | |
56 | - /** |
|
57 | - * @var string |
|
58 | - */ |
|
56 | + /** |
|
57 | + * @var string |
|
58 | + */ |
|
59 | 59 | protected $matchedText = ''; |
60 | 60 | |
61 | - /** |
|
62 | - * @var string |
|
63 | - */ |
|
61 | + /** |
|
62 | + * @var string |
|
63 | + */ |
|
64 | 64 | protected $hash = ''; |
65 | 65 | |
66 | - /** |
|
67 | - * @var OperationResult |
|
68 | - */ |
|
66 | + /** |
|
67 | + * @var OperationResult |
|
68 | + */ |
|
69 | 69 | protected $validationResult = null; |
70 | 70 | |
71 | - /** |
|
72 | - * @var \Mailcode\Mailcode |
|
73 | - */ |
|
71 | + /** |
|
72 | + * @var \Mailcode\Mailcode |
|
73 | + */ |
|
74 | 74 | protected $mailcode; |
75 | 75 | |
76 | - /** |
|
77 | - * @var \Mailcode\Mailcode_Parser_Statement |
|
78 | - */ |
|
76 | + /** |
|
77 | + * @var \Mailcode\Mailcode_Parser_Statement |
|
78 | + */ |
|
79 | 79 | protected $params; |
80 | 80 | |
81 | - /** |
|
82 | - * @var string[] |
|
83 | - */ |
|
81 | + /** |
|
82 | + * @var string[] |
|
83 | + */ |
|
84 | 84 | protected $validations = array( |
85 | 85 | 'params_empty', |
86 | 86 | 'params_keywords', |
@@ -89,24 +89,24 @@ discard block |
||
89 | 89 | 'type_unsupported' |
90 | 90 | ); |
91 | 91 | |
92 | - /** |
|
93 | - * @var string |
|
94 | - */ |
|
92 | + /** |
|
93 | + * @var string |
|
94 | + */ |
|
95 | 95 | protected $comment = ''; |
96 | 96 | |
97 | - /** |
|
98 | - * @var Mailcode_Commands_LogicKeywords|NULL |
|
99 | - */ |
|
97 | + /** |
|
98 | + * @var Mailcode_Commands_LogicKeywords|NULL |
|
99 | + */ |
|
100 | 100 | protected $logicKeywords; |
101 | 101 | |
102 | - /** |
|
103 | - * @var Mailcode_Parser_Statement_Validator |
|
104 | - */ |
|
102 | + /** |
|
103 | + * @var Mailcode_Parser_Statement_Validator |
|
104 | + */ |
|
105 | 105 | protected $validator; |
106 | 106 | |
107 | - /** |
|
108 | - * @var boolean |
|
109 | - */ |
|
107 | + /** |
|
108 | + * @var boolean |
|
109 | + */ |
|
110 | 110 | private $validated = false; |
111 | 111 | |
112 | 112 | /** |
@@ -141,13 +141,13 @@ discard block |
||
141 | 141 | |
142 | 142 | } |
143 | 143 | |
144 | - /** |
|
145 | - * Sets the command's parent opening command, if any. |
|
146 | - * NOTE: This is set automatically by the parser, and |
|
147 | - * should not be called manually. |
|
148 | - * |
|
149 | - * @param Mailcode_Commands_Command $command |
|
150 | - */ |
|
144 | + /** |
|
145 | + * Sets the command's parent opening command, if any. |
|
146 | + * NOTE: This is set automatically by the parser, and |
|
147 | + * should not be called manually. |
|
148 | + * |
|
149 | + * @param Mailcode_Commands_Command $command |
|
150 | + */ |
|
151 | 151 | public function setParent(Mailcode_Commands_Command $command) : void |
152 | 152 | { |
153 | 153 | $this->parent = $command; |
@@ -163,9 +163,9 @@ discard block |
||
163 | 163 | return $this->parent; |
164 | 164 | } |
165 | 165 | |
166 | - /** |
|
167 | - * @return string The ID of the command = the name of the command class file. |
|
168 | - */ |
|
166 | + /** |
|
167 | + * @return string The ID of the command = the name of the command class file. |
|
168 | + */ |
|
169 | 169 | public function getID() : string |
170 | 170 | { |
171 | 171 | // account for commands with types: If_Variable should still return If. |
@@ -174,14 +174,14 @@ discard block |
||
174 | 174 | return array_shift($tokens); |
175 | 175 | } |
176 | 176 | |
177 | - /** |
|
178 | - * Sets an optional comment that is not used anywhere, but |
|
179 | - * can be used by the application to track why a command is |
|
180 | - * used somewhere. |
|
181 | - * |
|
182 | - * @param string $comment |
|
183 | - * @return Mailcode_Commands_Command |
|
184 | - */ |
|
177 | + /** |
|
178 | + * Sets an optional comment that is not used anywhere, but |
|
179 | + * can be used by the application to track why a command is |
|
180 | + * used somewhere. |
|
181 | + * |
|
182 | + * @param string $comment |
|
183 | + * @return Mailcode_Commands_Command |
|
184 | + */ |
|
185 | 185 | public function setComment(string $comment) : Mailcode_Commands_Command |
186 | 186 | { |
187 | 187 | $this->comment = $comment; |
@@ -189,23 +189,23 @@ discard block |
||
189 | 189 | return $this; |
190 | 190 | } |
191 | 191 | |
192 | - /** |
|
193 | - * Retrieves the previously set comment, if any. |
|
194 | - * |
|
195 | - * @return string |
|
196 | - */ |
|
192 | + /** |
|
193 | + * Retrieves the previously set comment, if any. |
|
194 | + * |
|
195 | + * @return string |
|
196 | + */ |
|
197 | 197 | public function getComment() : string |
198 | 198 | { |
199 | 199 | return $this->comment; |
200 | 200 | } |
201 | 201 | |
202 | - /** |
|
203 | - * Checks whether this is a dummy command, which is only |
|
204 | - * used to access information on the command type. It cannot |
|
205 | - * be used as an actual live command. |
|
206 | - * |
|
207 | - * @return bool |
|
208 | - */ |
|
202 | + /** |
|
203 | + * Checks whether this is a dummy command, which is only |
|
204 | + * used to access information on the command type. It cannot |
|
205 | + * be used as an actual live command. |
|
206 | + * |
|
207 | + * @return bool |
|
208 | + */ |
|
209 | 209 | public function isDummy() : bool |
210 | 210 | { |
211 | 211 | return $this->type === '__dummy'; |
@@ -319,9 +319,9 @@ discard block |
||
319 | 319 | return $this->validationResult->isValid(); |
320 | 320 | } |
321 | 321 | |
322 | - /** |
|
323 | - * @return string[] |
|
324 | - */ |
|
322 | + /** |
|
323 | + * @return string[] |
|
324 | + */ |
|
325 | 325 | abstract protected function getValidations() : array; |
326 | 326 | |
327 | 327 | protected function _validateNesting() : void |
@@ -409,12 +409,12 @@ discard block |
||
409 | 409 | |
410 | 410 | abstract public function supportsURLEncoding() : bool; |
411 | 411 | |
412 | - /** |
|
413 | - * Whether the command allows using logic keywords like "and:" or "or:" |
|
414 | - * in the command parameters. |
|
415 | - * |
|
416 | - * @return bool |
|
417 | - */ |
|
412 | + /** |
|
413 | + * Whether the command allows using logic keywords like "and:" or "or:" |
|
414 | + * in the command parameters. |
|
415 | + * |
|
416 | + * @return bool |
|
417 | + */ |
|
418 | 418 | abstract public function supportsLogicKeywords() : bool; |
419 | 419 | |
420 | 420 | abstract public function generatesContent() : bool; |
@@ -460,22 +460,22 @@ discard block |
||
460 | 460 | return $normalizer->normalize(); |
461 | 461 | } |
462 | 462 | |
463 | - /** |
|
464 | - * Retrieves the names of all the command's supported types: the part |
|
465 | - * between the command name and the colon. Example: {command type: params}. |
|
466 | - * |
|
467 | - * @return string[] |
|
468 | - */ |
|
463 | + /** |
|
464 | + * Retrieves the names of all the command's supported types: the part |
|
465 | + * between the command name and the colon. Example: {command type: params}. |
|
466 | + * |
|
467 | + * @return string[] |
|
468 | + */ |
|
469 | 469 | public function getSupportedTypes() : array |
470 | 470 | { |
471 | 471 | return array(); |
472 | 472 | } |
473 | 473 | |
474 | - /** |
|
475 | - * Retrieves all variable names used in the command. |
|
476 | - * |
|
477 | - * @return Mailcode_Variables_Collection_Regular |
|
478 | - */ |
|
474 | + /** |
|
475 | + * Retrieves all variable names used in the command. |
|
476 | + * |
|
477 | + * @return Mailcode_Variables_Collection_Regular |
|
478 | + */ |
|
479 | 479 | public function getVariables() : Mailcode_Variables_Collection_Regular |
480 | 480 | { |
481 | 481 | return Mailcode::create()->findVariables($this->paramsString, $this); |
@@ -500,26 +500,26 @@ discard block |
||
500 | 500 | ); |
501 | 501 | } |
502 | 502 | |
503 | - /** |
|
504 | - * Sets a parameter for the translation backend. The backend can use |
|
505 | - * these to allow command-specific configurations. |
|
506 | - * |
|
507 | - * @param string $name |
|
508 | - * @param mixed $value |
|
509 | - * @return $this |
|
510 | - */ |
|
503 | + /** |
|
504 | + * Sets a parameter for the translation backend. The backend can use |
|
505 | + * these to allow command-specific configurations. |
|
506 | + * |
|
507 | + * @param string $name |
|
508 | + * @param mixed $value |
|
509 | + * @return $this |
|
510 | + */ |
|
511 | 511 | public function setTranslationParam(string $name, $value) |
512 | 512 | { |
513 | 513 | $this->translationParams[$name] = $value; |
514 | 514 | return $this; |
515 | 515 | } |
516 | 516 | |
517 | - /** |
|
518 | - * Retrieves a previously set translation parameter. |
|
519 | - * |
|
520 | - * @param string $name |
|
521 | - * @return mixed |
|
522 | - */ |
|
517 | + /** |
|
518 | + * Retrieves a previously set translation parameter. |
|
519 | + * |
|
520 | + * @param string $name |
|
521 | + * @return mixed |
|
522 | + */ |
|
523 | 523 | public function getTranslationParam(string $name) |
524 | 524 | { |
525 | 525 | if(isset($this->translationParams[$name])) |
@@ -22,9 +22,9 @@ |
||
22 | 22 | { |
23 | 23 | const REGEX_VARIABLE_NAME = '/\$\s*([A-Z0-9_]+)\s*\.\s*([A-Z0-9_]+)|\$\s*([A-Z0-9_]+)/six'; |
24 | 24 | |
25 | - /** |
|
26 | - * @var Mailcode_Variables_Collection_Regular |
|
27 | - */ |
|
25 | + /** |
|
26 | + * @var Mailcode_Variables_Collection_Regular |
|
27 | + */ |
|
28 | 28 | protected $collection; |
29 | 29 | |
30 | 30 | /** |