@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | { |
24 | 24 | const ERROR_COMMAND_NAME_DOES_NOT_EXIST = 45901; |
25 | 25 | |
26 | - /** |
|
27 | - * @var Mailcode_Commands_Command[] |
|
28 | - */ |
|
26 | + /** |
|
27 | + * @var Mailcode_Commands_Command[] |
|
28 | + */ |
|
29 | 29 | private $commands = array(); |
30 | 30 | |
31 | - /** |
|
32 | - * Retrieves a list of all available command IDs. |
|
33 | - * |
|
34 | - * @return string[] |
|
35 | - */ |
|
31 | + /** |
|
32 | + * Retrieves a list of all available command IDs. |
|
33 | + * |
|
34 | + * @return string[] |
|
35 | + */ |
|
36 | 36 | public function getIDs() : array |
37 | 37 | { |
38 | 38 | static $ids = array(); |
@@ -45,13 +45,13 @@ discard block |
||
45 | 45 | return $ids; |
46 | 46 | } |
47 | 47 | |
48 | - /** |
|
49 | - * Retrieves a list of all available commands, sorted by label. |
|
50 | - * |
|
51 | - * NOTE: These instances are only used for information purposes. |
|
52 | - * |
|
53 | - * @return Mailcode_Commands_Command[] |
|
54 | - */ |
|
48 | + /** |
|
49 | + * Retrieves a list of all available commands, sorted by label. |
|
50 | + * |
|
51 | + * NOTE: These instances are only used for information purposes. |
|
52 | + * |
|
53 | + * @return Mailcode_Commands_Command[] |
|
54 | + */ |
|
55 | 55 | public function getAll() |
56 | 56 | { |
57 | 57 | if(!empty($this->commands)) { |
@@ -77,12 +77,12 @@ discard block |
||
77 | 77 | return $result; |
78 | 78 | } |
79 | 79 | |
80 | - /** |
|
81 | - * Gets an available command by its ID. |
|
82 | - * |
|
83 | - * @param string $id |
|
84 | - * @return Mailcode_Commands_Command |
|
85 | - */ |
|
80 | + /** |
|
81 | + * Gets an available command by its ID. |
|
82 | + * |
|
83 | + * @param string $id |
|
84 | + * @return Mailcode_Commands_Command |
|
85 | + */ |
|
86 | 86 | public function getByID(string $id) : Mailcode_Commands_Command |
87 | 87 | { |
88 | 88 | static $instances = array(); |
@@ -95,15 +95,15 @@ discard block |
||
95 | 95 | return $instances[$id]; |
96 | 96 | } |
97 | 97 | |
98 | - /** |
|
99 | - * Retrieves the ID of a command by its name. |
|
100 | - * |
|
101 | - * @param string $name |
|
102 | - * @throws Mailcode_Exception |
|
103 | - * @return string |
|
104 | - * |
|
105 | - * @see Mailcode_Commands::ERROR_COMMAND_NAME_DOES_NOT_EXIST |
|
106 | - */ |
|
98 | + /** |
|
99 | + * Retrieves the ID of a command by its name. |
|
100 | + * |
|
101 | + * @param string $name |
|
102 | + * @throws Mailcode_Exception |
|
103 | + * @return string |
|
104 | + * |
|
105 | + * @see Mailcode_Commands::ERROR_COMMAND_NAME_DOES_NOT_EXIST |
|
106 | + */ |
|
107 | 107 | public function getIDByName(string $name) : string |
108 | 108 | { |
109 | 109 | $items = $this->getAll(); |
@@ -132,12 +132,12 @@ discard block |
||
132 | 132 | return in_array($id, $ids); |
133 | 133 | } |
134 | 134 | |
135 | - /** |
|
136 | - * Checks wether the specified name exists. |
|
137 | - * |
|
138 | - * @param string $name For example: "showvar". |
|
139 | - * @return bool |
|
140 | - */ |
|
135 | + /** |
|
136 | + * Checks wether the specified name exists. |
|
137 | + * |
|
138 | + * @param string $name For example: "showvar". |
|
139 | + * @return bool |
|
140 | + */ |
|
141 | 141 | public function nameExists(string $name) : bool |
142 | 142 | { |
143 | 143 | $items = $this->getAll(); |
@@ -25,24 +25,24 @@ |
||
25 | 25 | { |
26 | 26 | const ERROR_PLACEHOLDER_TOO_LONG = 47901; |
27 | 27 | |
28 | - /** |
|
29 | - * @var int |
|
30 | - */ |
|
28 | + /** |
|
29 | + * @var int |
|
30 | + */ |
|
31 | 31 | protected $id; |
32 | 32 | |
33 | - /** |
|
34 | - * @var Mailcode_Parser_Safeguard |
|
35 | - */ |
|
33 | + /** |
|
34 | + * @var Mailcode_Parser_Safeguard |
|
35 | + */ |
|
36 | 36 | protected $safeguard; |
37 | 37 | |
38 | - /** |
|
39 | - * @var Mailcode_Commands_Command |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @var Mailcode_Commands_Command |
|
40 | + */ |
|
41 | 41 | protected $command; |
42 | 42 | |
43 | - /** |
|
44 | - * @var string |
|
45 | - */ |
|
43 | + /** |
|
44 | + * @var string |
|
45 | + */ |
|
46 | 46 | protected $replacement = ''; |
47 | 47 | |
48 | 48 | public function __construct(int $id, Mailcode_Commands_Command $command, Mailcode_Parser_Safeguard $safeguard) |
@@ -55,40 +55,40 @@ discard block |
||
55 | 55 | |
56 | 56 | const ERROR_EMPTY_DELIMITER = 47803; |
57 | 57 | |
58 | - /** |
|
59 | - * @var Mailcode_Parser |
|
60 | - */ |
|
58 | + /** |
|
59 | + * @var Mailcode_Parser |
|
60 | + */ |
|
61 | 61 | protected $parser; |
62 | 62 | |
63 | - /** |
|
64 | - * @var Mailcode_Collection |
|
65 | - */ |
|
63 | + /** |
|
64 | + * @var Mailcode_Collection |
|
65 | + */ |
|
66 | 66 | protected $commands; |
67 | 67 | |
68 | - /** |
|
69 | - * @var string |
|
70 | - */ |
|
68 | + /** |
|
69 | + * @var string |
|
70 | + */ |
|
71 | 71 | protected $originalString; |
72 | 72 | |
73 | - /** |
|
74 | - * @var Mailcode_Collection |
|
75 | - */ |
|
73 | + /** |
|
74 | + * @var Mailcode_Collection |
|
75 | + */ |
|
76 | 76 | protected $collection; |
77 | 77 | |
78 | - /** |
|
79 | - * Counter for the placeholders, global for all placeholders. |
|
80 | - * @var integer |
|
81 | - */ |
|
78 | + /** |
|
79 | + * Counter for the placeholders, global for all placeholders. |
|
80 | + * @var integer |
|
81 | + */ |
|
82 | 82 | private static $counter = 0; |
83 | 83 | |
84 | - /** |
|
85 | - * @var Mailcode_Parser_Safeguard_Placeholder[] |
|
86 | - */ |
|
84 | + /** |
|
85 | + * @var Mailcode_Parser_Safeguard_Placeholder[] |
|
86 | + */ |
|
87 | 87 | protected $placeholders; |
88 | 88 | |
89 | - /** |
|
90 | - * @var string |
|
91 | - */ |
|
89 | + /** |
|
90 | + * @var string |
|
91 | + */ |
|
92 | 92 | protected $delimiter = '__'; |
93 | 93 | |
94 | 94 | public function __construct(Mailcode_Parser $parser, string $subject) |
@@ -97,15 +97,15 @@ discard block |
||
97 | 97 | $this->originalString = $subject; |
98 | 98 | } |
99 | 99 | |
100 | - /** |
|
101 | - * Sets the delimiter character sequence used to prepend |
|
102 | - * and append to the placeholders. |
|
103 | - * |
|
104 | - * The delimiter's default is "__" (two underscores). |
|
105 | - * |
|
106 | - * @param string $delimiter |
|
107 | - * @return Mailcode_Parser_Safeguard |
|
108 | - */ |
|
100 | + /** |
|
101 | + * Sets the delimiter character sequence used to prepend |
|
102 | + * and append to the placeholders. |
|
103 | + * |
|
104 | + * The delimiter's default is "__" (two underscores). |
|
105 | + * |
|
106 | + * @param string $delimiter |
|
107 | + * @return Mailcode_Parser_Safeguard |
|
108 | + */ |
|
109 | 109 | public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard |
110 | 110 | { |
111 | 111 | if(empty($delimiter)) |
@@ -127,15 +127,15 @@ discard block |
||
127 | 127 | return $this->delimiter; |
128 | 128 | } |
129 | 129 | |
130 | - /** |
|
131 | - * Retrieves the safe string in which all commands have been replaced |
|
132 | - * by placeholder strings. |
|
133 | - * |
|
134 | - * @return string |
|
135 | - * @throws Mailcode_Exception |
|
136 | - * |
|
137 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
138 | - */ |
|
130 | + /** |
|
131 | + * Retrieves the safe string in which all commands have been replaced |
|
132 | + * by placeholder strings. |
|
133 | + * |
|
134 | + * @return string |
|
135 | + * @throws Mailcode_Exception |
|
136 | + * |
|
137 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
138 | + */ |
|
139 | 139 | public function makeSafe() : string |
140 | 140 | { |
141 | 141 | $this->requireValidCollection(); |
@@ -171,12 +171,12 @@ discard block |
||
171 | 171 | } |
172 | 172 | |
173 | 173 | |
174 | - /** |
|
175 | - * Retrieves all placeholders that have to be added to |
|
176 | - * the subject text. |
|
177 | - * |
|
178 | - * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[] |
|
179 | - */ |
|
174 | + /** |
|
175 | + * Retrieves all placeholders that have to be added to |
|
176 | + * the subject text. |
|
177 | + * |
|
178 | + * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[] |
|
179 | + */ |
|
180 | 180 | public function getPlaceholders() |
181 | 181 | { |
182 | 182 | if(isset($this->placeholders)) |
@@ -228,46 +228,46 @@ discard block |
||
228 | 228 | return str_replace($placeholderStrings, array_values($replaces), $string); |
229 | 229 | } |
230 | 230 | |
231 | - /** |
|
232 | - * Makes the string whole again after transforming or filtering it, |
|
233 | - * by replacing the command placeholders with the original commands. |
|
234 | - * |
|
235 | - * @param string $string |
|
236 | - * @return string |
|
237 | - * @throws Mailcode_Exception |
|
238 | - * |
|
239 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
240 | - * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
241 | - */ |
|
231 | + /** |
|
232 | + * Makes the string whole again after transforming or filtering it, |
|
233 | + * by replacing the command placeholders with the original commands. |
|
234 | + * |
|
235 | + * @param string $string |
|
236 | + * @return string |
|
237 | + * @throws Mailcode_Exception |
|
238 | + * |
|
239 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
240 | + * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
241 | + */ |
|
242 | 242 | public function makeWhole(string $string) : string |
243 | 243 | { |
244 | 244 | return $this->restore($string, false); |
245 | 245 | } |
246 | 246 | |
247 | - /** |
|
248 | - * Like makeWhole(), but replaces the commands with a syntax |
|
249 | - * highlighted version, meant for human readable texts only. |
|
250 | - * |
|
251 | - * Note: the commands lose their functionality (They cannot be |
|
252 | - * parsed from that string again). |
|
253 | - * |
|
254 | - * @param string $string |
|
255 | - * @return string |
|
256 | - * @throws Mailcode_Exception |
|
257 | - * |
|
258 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
259 | - * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
260 | - */ |
|
247 | + /** |
|
248 | + * Like makeWhole(), but replaces the commands with a syntax |
|
249 | + * highlighted version, meant for human readable texts only. |
|
250 | + * |
|
251 | + * Note: the commands lose their functionality (They cannot be |
|
252 | + * parsed from that string again). |
|
253 | + * |
|
254 | + * @param string $string |
|
255 | + * @return string |
|
256 | + * @throws Mailcode_Exception |
|
257 | + * |
|
258 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
259 | + * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
260 | + */ |
|
261 | 261 | public function makeHighlighted(string $string) : string |
262 | 262 | { |
263 | 263 | return $this->restore($string, true); |
264 | 264 | } |
265 | 265 | |
266 | - /** |
|
267 | - * Retrieves the commands collection contained in the string. |
|
268 | - * |
|
269 | - * @return Mailcode_Collection |
|
270 | - */ |
|
266 | + /** |
|
267 | + * Retrieves the commands collection contained in the string. |
|
268 | + * |
|
269 | + * @return Mailcode_Collection |
|
270 | + */ |
|
271 | 271 | public function getCollection() : Mailcode_Collection |
272 | 272 | { |
273 | 273 | if(isset($this->collection)) |
@@ -285,11 +285,11 @@ discard block |
||
285 | 285 | return $this->getCollection()->isValid(); |
286 | 286 | } |
287 | 287 | |
288 | - /** |
|
289 | - * @throws Mailcode_Exception |
|
290 | - * |
|
291 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
292 | - */ |
|
288 | + /** |
|
289 | + * @throws Mailcode_Exception |
|
290 | + * |
|
291 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
292 | + */ |
|
293 | 293 | protected function requireValidCollection() : void |
294 | 294 | { |
295 | 295 | if($this->getCollection()->isValid()) |
@@ -20,19 +20,19 @@ |
||
20 | 20 | */ |
21 | 21 | class Mailcode_Commands_Highlighter |
22 | 22 | { |
23 | - /** |
|
24 | - * @var Mailcode_Commands_Command |
|
25 | - */ |
|
23 | + /** |
|
24 | + * @var Mailcode_Commands_Command |
|
25 | + */ |
|
26 | 26 | protected $command; |
27 | 27 | |
28 | - /** |
|
29 | - * @var string[] |
|
30 | - */ |
|
28 | + /** |
|
29 | + * @var string[] |
|
30 | + */ |
|
31 | 31 | protected $parts = array(); |
32 | 32 | |
33 | 33 | public function __construct(Mailcode_Commands_Command $command) |
34 | 34 | { |
35 | - $this->command = $command; |
|
35 | + $this->command = $command; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function highlight() : string |
@@ -26,46 +26,46 @@ 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 | - * Creates a new mailcode instance. |
|
46 | - * @return Mailcode |
|
47 | - */ |
|
44 | + /** |
|
45 | + * Creates a new mailcode instance. |
|
46 | + * @return Mailcode |
|
47 | + */ |
|
48 | 48 | public static function create() : Mailcode |
49 | 49 | { |
50 | 50 | return new Mailcode(); |
51 | 51 | } |
52 | 52 | |
53 | - /** |
|
54 | - * Parses the string to detect all commands contained within. |
|
55 | - * |
|
56 | - * @param string $string |
|
57 | - * @return Mailcode_Collection |
|
58 | - */ |
|
53 | + /** |
|
54 | + * Parses the string to detect all commands contained within. |
|
55 | + * |
|
56 | + * @param string $string |
|
57 | + * @return Mailcode_Collection |
|
58 | + */ |
|
59 | 59 | public function parseString(string $string) : Mailcode_Collection |
60 | 60 | { |
61 | 61 | return $this->getParser()->parseString($string); |
62 | 62 | } |
63 | 63 | |
64 | - /** |
|
65 | - * Retrieves the string parser instance used to detect commands. |
|
66 | - * |
|
67 | - * @return Mailcode_Parser |
|
68 | - */ |
|
64 | + /** |
|
65 | + * Retrieves the string parser instance used to detect commands. |
|
66 | + * |
|
67 | + * @return Mailcode_Parser |
|
68 | + */ |
|
69 | 69 | public function getParser() : Mailcode_Parser |
70 | 70 | { |
71 | 71 | if(!isset($this->parser)) |
@@ -76,12 +76,12 @@ discard block |
||
76 | 76 | return $this->parser; |
77 | 77 | } |
78 | 78 | |
79 | - /** |
|
80 | - * Retrieves the commands collection, which is used to |
|
81 | - * access information on the available commands. |
|
82 | - * |
|
83 | - * @return Mailcode_Commands |
|
84 | - */ |
|
79 | + /** |
|
80 | + * Retrieves the commands collection, which is used to |
|
81 | + * access information on the available commands. |
|
82 | + * |
|
83 | + * @return Mailcode_Commands |
|
84 | + */ |
|
85 | 85 | public function getCommands() : Mailcode_Commands |
86 | 86 | { |
87 | 87 | if(!isset($this->commands)) |
@@ -97,12 +97,12 @@ discard block |
||
97 | 97 | return $this->getParser()->createSafeguard($subject); |
98 | 98 | } |
99 | 99 | |
100 | - /** |
|
101 | - * Attempts to find all variables in the target string. |
|
102 | - * |
|
103 | - * @param string $subject |
|
104 | - * @return Mailcode_Variables_Collection_Regular |
|
105 | - */ |
|
100 | + /** |
|
101 | + * Attempts to find all variables in the target string. |
|
102 | + * |
|
103 | + * @param string $subject |
|
104 | + * @return Mailcode_Variables_Collection_Regular |
|
105 | + */ |
|
106 | 106 | public function findVariables(string $subject) : Mailcode_Variables_Collection_Regular |
107 | 107 | { |
108 | 108 | return $this->createVariables()->parseString($subject); |
@@ -45,17 +45,17 @@ |
||
45 | 45 | |
46 | 46 | protected function validateSyntax_require_variable() |
47 | 47 | { |
48 | - $amount = $this->getVariables()->countVariables(); |
|
48 | + $amount = $this->getVariables()->countVariables(); |
|
49 | 49 | |
50 | - if($amount === 1) |
|
51 | - { |
|
52 | - return; |
|
53 | - } |
|
50 | + if($amount === 1) |
|
51 | + { |
|
52 | + return; |
|
53 | + } |
|
54 | 54 | |
55 | - $this->validationResult->makeError( |
|
55 | + $this->validationResult->makeError( |
|
56 | 56 | t('Command has %1$s variables, %2$s expected.', $amount, 1), |
57 | 57 | self::VALIDATION_VARIABLE_COUNT_MISMATCH |
58 | - ); |
|
58 | + ); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | protected function getValidations() : array |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | */ |
21 | 21 | class Mailcode_Variables_Collection_Regular extends Mailcode_Variables_Collection |
22 | 22 | { |
23 | - /** |
|
24 | - * @var Mailcode_Variables_Collection_Invalid |
|
25 | - */ |
|
23 | + /** |
|
24 | + * @var Mailcode_Variables_Collection_Invalid |
|
25 | + */ |
|
26 | 26 | protected $invalid; |
27 | 27 | |
28 | 28 | protected function init() : void |
@@ -47,30 +47,30 @@ discard block |
||
47 | 47 | return $this; |
48 | 48 | } |
49 | 49 | |
50 | - /** |
|
51 | - * Whether any of the variables in the collection are invalid. |
|
52 | - * |
|
53 | - * @return bool |
|
54 | - */ |
|
50 | + /** |
|
51 | + * Whether any of the variables in the collection are invalid. |
|
52 | + * |
|
53 | + * @return bool |
|
54 | + */ |
|
55 | 55 | public function hasInvalid() : bool |
56 | 56 | { |
57 | 57 | return isset($this->invalid) && $this->invalid->hasVariables(); |
58 | 58 | } |
59 | 59 | |
60 | - /** |
|
61 | - * Retrieves the collection of invalid variables, if any. |
|
62 | - * Behaves like a variables collection. |
|
63 | - * |
|
64 | - * @return Mailcode_Variables_Collection_Invalid |
|
65 | - */ |
|
60 | + /** |
|
61 | + * Retrieves the collection of invalid variables, if any. |
|
62 | + * Behaves like a variables collection. |
|
63 | + * |
|
64 | + * @return Mailcode_Variables_Collection_Invalid |
|
65 | + */ |
|
66 | 66 | public function getInvalid() : Mailcode_Variables_Collection_Invalid |
67 | 67 | { |
68 | 68 | return $this->invalid; |
69 | 69 | } |
70 | 70 | |
71 | - /** |
|
72 | - * @return Mailcode_Variables_Collection_Regular |
|
73 | - */ |
|
71 | + /** |
|
72 | + * @return Mailcode_Variables_Collection_Regular |
|
73 | + */ |
|
74 | 74 | public function mergeWith(Mailcode_Variables_Collection $collection) : Mailcode_Variables_Collection |
75 | 75 | { |
76 | 76 | parent::mergeWith($collection); |
@@ -20,11 +20,11 @@ discard block |
||
20 | 20 | */ |
21 | 21 | abstract class Mailcode_Variables_Collection |
22 | 22 | { |
23 | - /** |
|
24 | - * Stores variables by their hash. |
|
25 | - * |
|
26 | - * @var array[string]Mailcode_Variables_Variable |
|
27 | - */ |
|
23 | + /** |
|
24 | + * Stores variables by their hash. |
|
25 | + * |
|
26 | + * @var array[string]Mailcode_Variables_Variable |
|
27 | + */ |
|
28 | 28 | protected $variables = array(); |
29 | 29 | |
30 | 30 | public function __construct() |
@@ -56,12 +56,12 @@ discard block |
||
56 | 56 | return count($this->variables); |
57 | 57 | } |
58 | 58 | |
59 | - /** |
|
60 | - * Checks whether the collection contains a variable with the specified name. |
|
61 | - * |
|
62 | - * @param string $fullName The variable name, with or without $ sign. |
|
63 | - * @return bool |
|
64 | - */ |
|
59 | + /** |
|
60 | + * Checks whether the collection contains a variable with the specified name. |
|
61 | + * |
|
62 | + * @param string $fullName The variable name, with or without $ sign. |
|
63 | + * @return bool |
|
64 | + */ |
|
65 | 65 | public function hasVariableName(string $fullName) : bool |
66 | 66 | { |
67 | 67 | $fullName = $this->fixName($fullName); |
@@ -77,14 +77,14 @@ discard block |
||
77 | 77 | return false; |
78 | 78 | } |
79 | 79 | |
80 | - /** |
|
81 | - * Retrieves a collection of all variable instances for |
|
82 | - * the specified name (there can be several with differing |
|
83 | - * matched texts because of spacing). |
|
84 | - * |
|
85 | - * @param string $fullName |
|
86 | - * @return Mailcode_Variables_Collection |
|
87 | - */ |
|
80 | + /** |
|
81 | + * Retrieves a collection of all variable instances for |
|
82 | + * the specified name (there can be several with differing |
|
83 | + * matched texts because of spacing). |
|
84 | + * |
|
85 | + * @param string $fullName |
|
86 | + * @return Mailcode_Variables_Collection |
|
87 | + */ |
|
88 | 88 | public function getByFullName(string $fullName) : Mailcode_Variables_Collection |
89 | 89 | { |
90 | 90 | $fullName = $this->fixName($fullName); |
@@ -102,12 +102,12 @@ discard block |
||
102 | 102 | return $collection; |
103 | 103 | } |
104 | 104 | |
105 | - /** |
|
106 | - * Prepends the $ sign to a variable name if it does not have it. |
|
107 | - * |
|
108 | - * @param string $fullName |
|
109 | - * @return string |
|
110 | - */ |
|
105 | + /** |
|
106 | + * Prepends the $ sign to a variable name if it does not have it. |
|
107 | + * |
|
108 | + * @param string $fullName |
|
109 | + * @return string |
|
110 | + */ |
|
111 | 111 | protected function fixName(string $fullName) : string |
112 | 112 | { |
113 | 113 | if(substr($fullName, 0, 1) === '$') |
@@ -118,22 +118,22 @@ discard block |
||
118 | 118 | return '$'.$fullName; |
119 | 119 | } |
120 | 120 | |
121 | - /** |
|
122 | - * Retrieves all variables, grouped by their hash - meaning |
|
123 | - * unique matched strings. |
|
124 | - * |
|
125 | - * @return Mailcode_Variables_Variable[] |
|
126 | - */ |
|
121 | + /** |
|
122 | + * Retrieves all variables, grouped by their hash - meaning |
|
123 | + * unique matched strings. |
|
124 | + * |
|
125 | + * @return Mailcode_Variables_Variable[] |
|
126 | + */ |
|
127 | 127 | public function getGroupedByHash() |
128 | 128 | { |
129 | 129 | return $this->sortVariables($this->variables); |
130 | 130 | } |
131 | 131 | |
132 | - /** |
|
133 | - * Retrieves all variables, grouped by their name. |
|
134 | - * |
|
135 | - * @return Mailcode_Variables_Variable[] |
|
136 | - */ |
|
132 | + /** |
|
133 | + * Retrieves all variables, grouped by their name. |
|
134 | + * |
|
135 | + * @return Mailcode_Variables_Variable[] |
|
136 | + */ |
|
137 | 137 | public function getGroupedByName() |
138 | 138 | { |
139 | 139 | $entries = array(); |
@@ -146,10 +146,10 @@ discard block |
||
146 | 146 | return $this->sortVariables($entries); |
147 | 147 | } |
148 | 148 | |
149 | - /** |
|
150 | - * Retrieves the full names of the variables that are present in the collection. |
|
151 | - * @return string[] |
|
152 | - */ |
|
149 | + /** |
|
150 | + * Retrieves the full names of the variables that are present in the collection. |
|
151 | + * @return string[] |
|
152 | + */ |
|
153 | 153 | public function getNames() : array |
154 | 154 | { |
155 | 155 | $result = array(); |
@@ -167,13 +167,13 @@ discard block |
||
167 | 167 | return $result; |
168 | 168 | } |
169 | 169 | |
170 | - /** |
|
171 | - * Takes a list of variables and sorts them, throwing away |
|
172 | - * the source array's keys. |
|
173 | - * |
|
174 | - * @param array $entries |
|
175 | - * @return Mailcode_Variables_Variable[] |
|
176 | - */ |
|
170 | + /** |
|
171 | + * Takes a list of variables and sorts them, throwing away |
|
172 | + * the source array's keys. |
|
173 | + * |
|
174 | + * @param array $entries |
|
175 | + * @return Mailcode_Variables_Variable[] |
|
176 | + */ |
|
177 | 177 | protected function sortVariables(array $entries) |
178 | 178 | { |
179 | 179 | $result = array_values($entries); |
@@ -186,13 +186,13 @@ discard block |
||
186 | 186 | return $result; |
187 | 187 | } |
188 | 188 | |
189 | - /** |
|
190 | - * Merges the variables collection with the target collection |
|
191 | - * by inheriting all that collection's variables. |
|
192 | - * |
|
193 | - * @param Mailcode_Variables_Collection $collection |
|
194 | - * @return Mailcode_Variables_Collection |
|
195 | - */ |
|
189 | + /** |
|
190 | + * Merges the variables collection with the target collection |
|
191 | + * by inheriting all that collection's variables. |
|
192 | + * |
|
193 | + * @param Mailcode_Variables_Collection $collection |
|
194 | + * @return Mailcode_Variables_Collection |
|
195 | + */ |
|
196 | 196 | public function mergeWith(Mailcode_Variables_Collection $collection) : Mailcode_Variables_Collection |
197 | 197 | { |
198 | 198 | $variables = $collection->getGroupedByHash(); |
@@ -29,19 +29,19 @@ |
||
29 | 29 | const VALIDATION_COMMANDS_ALREADY_CLOSED = 49103; |
30 | 30 | const VALIDATION_UNCLOSED_COMMAND = 49104; |
31 | 31 | |
32 | - /** |
|
33 | - * @var Mailcode_Collection |
|
34 | - */ |
|
32 | + /** |
|
33 | + * @var Mailcode_Collection |
|
34 | + */ |
|
35 | 35 | protected $collection; |
36 | 36 | |
37 | - /** |
|
38 | - * @var OperationResult |
|
39 | - */ |
|
37 | + /** |
|
38 | + * @var OperationResult |
|
39 | + */ |
|
40 | 40 | protected $validationResult; |
41 | 41 | |
42 | - /** |
|
43 | - * @var Mailcode_Commands_Command[] |
|
44 | - */ |
|
42 | + /** |
|
43 | + * @var Mailcode_Commands_Command[] |
|
44 | + */ |
|
45 | 45 | protected $stack = array(); |
46 | 46 | |
47 | 47 | public function __construct(Mailcode_Collection $collection) |