@@ -20,19 +20,19 @@ |
||
20 | 20 | */ |
21 | 21 | abstract class Mailcode_Collection_Error |
22 | 22 | { |
23 | - /** |
|
24 | - * @var integer |
|
25 | - */ |
|
23 | + /** |
|
24 | + * @var integer |
|
25 | + */ |
|
26 | 26 | protected $code = 0; |
27 | 27 | |
28 | - /** |
|
29 | - * @var string |
|
30 | - */ |
|
28 | + /** |
|
29 | + * @var string |
|
30 | + */ |
|
31 | 31 | protected $matchedText = ''; |
32 | 32 | |
33 | - /** |
|
34 | - * @var string |
|
35 | - */ |
|
33 | + /** |
|
34 | + * @var string |
|
35 | + */ |
|
36 | 36 | protected $message = ''; |
37 | 37 | |
38 | 38 | public function getCode() : int |
@@ -24,12 +24,12 @@ discard block |
||
24 | 24 | |
25 | 25 | const ERROR_UNEXPECTED_COMMAND_TYPE = 50002; |
26 | 26 | |
27 | - /** |
|
28 | - * Creates a ShowVariable command. |
|
29 | - * |
|
30 | - * @param string $variableName A variable name, with or without the $ sign prepended. |
|
31 | - * @return Mailcode_Commands_Command_ShowVariable |
|
32 | - */ |
|
27 | + /** |
|
28 | + * Creates a ShowVariable command. |
|
29 | + * |
|
30 | + * @param string $variableName A variable name, with or without the $ sign prepended. |
|
31 | + * @return Mailcode_Commands_Command_ShowVariable |
|
32 | + */ |
|
33 | 33 | public static function showVariable(string $variableName) : Mailcode_Commands_Command_ShowVariable |
34 | 34 | { |
35 | 35 | $variableName = self::_filterVariableName($variableName); |
@@ -45,17 +45,17 @@ discard block |
||
45 | 45 | return $cmd; |
46 | 46 | } |
47 | 47 | |
48 | - /** |
|
49 | - * Creates a SetVariable command. |
|
50 | - * |
|
51 | - * @param string $variableName A variable name, with or without the $ sign prepended. |
|
52 | - * @param string $value |
|
53 | - * @param bool $quoteValue Whether to treat the value as a string literal, and add quotes to it. |
|
54 | - * @return Mailcode_Commands_Command_SetVariable |
|
55 | - * @throws Mailcode_Factory_Exception |
|
56 | - * |
|
57 | - * @see Mailcode_Factory::ERROR_INVALID_COMMAND_CREATED |
|
58 | - */ |
|
48 | + /** |
|
49 | + * Creates a SetVariable command. |
|
50 | + * |
|
51 | + * @param string $variableName A variable name, with or without the $ sign prepended. |
|
52 | + * @param string $value |
|
53 | + * @param bool $quoteValue Whether to treat the value as a string literal, and add quotes to it. |
|
54 | + * @return Mailcode_Commands_Command_SetVariable |
|
55 | + * @throws Mailcode_Factory_Exception |
|
56 | + * |
|
57 | + * @see Mailcode_Factory::ERROR_INVALID_COMMAND_CREATED |
|
58 | + */ |
|
59 | 59 | public static function setVariable(string $variableName, string $value, bool $quoteValue=true) : Mailcode_Commands_Command_SetVariable |
60 | 60 | { |
61 | 61 | $variableName = self::_filterVariableName($variableName); |
@@ -265,12 +265,12 @@ discard block |
||
265 | 265 | return '$'.ltrim($name, '$'); |
266 | 266 | } |
267 | 267 | |
268 | - /** |
|
269 | - * Quotes a string literal: adds the quotes, and escapes any quotes already present in it. |
|
270 | - * |
|
271 | - * @param string $string |
|
272 | - * @return string |
|
273 | - */ |
|
268 | + /** |
|
269 | + * Quotes a string literal: adds the quotes, and escapes any quotes already present in it. |
|
270 | + * |
|
271 | + * @param string $string |
|
272 | + * @return string |
|
273 | + */ |
|
274 | 274 | protected static function _quoteString(string $string) : string |
275 | 275 | { |
276 | 276 | return '"'.str_replace('"', '\"', $string).'"'; |
@@ -30,44 +30,44 @@ discard block |
||
30 | 30 | const VALIDATION_UNKNOWN_COMMAND_NAME = 48304; |
31 | 31 | const VALIDATION_INVALID_PARAMS_STATEMENT = 48305; |
32 | 32 | |
33 | - /** |
|
34 | - * @var string |
|
35 | - */ |
|
33 | + /** |
|
34 | + * @var string |
|
35 | + */ |
|
36 | 36 | protected $type = ''; |
37 | 37 | |
38 | - /** |
|
39 | - * @var string |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @var string |
|
40 | + */ |
|
41 | 41 | protected $paramsString = ''; |
42 | 42 | |
43 | - /** |
|
44 | - * @var string |
|
45 | - */ |
|
43 | + /** |
|
44 | + * @var string |
|
45 | + */ |
|
46 | 46 | protected $matchedText = ''; |
47 | 47 | |
48 | - /** |
|
49 | - * @var string |
|
50 | - */ |
|
48 | + /** |
|
49 | + * @var string |
|
50 | + */ |
|
51 | 51 | protected $hash = ''; |
52 | 52 | |
53 | - /** |
|
54 | - * @var \AppUtils\OperationResult |
|
55 | - */ |
|
53 | + /** |
|
54 | + * @var \AppUtils\OperationResult |
|
55 | + */ |
|
56 | 56 | protected $validationResult = null; |
57 | 57 | |
58 | - /** |
|
59 | - * @var \Mailcode\Mailcode |
|
60 | - */ |
|
58 | + /** |
|
59 | + * @var \Mailcode\Mailcode |
|
60 | + */ |
|
61 | 61 | protected $mailcode; |
62 | 62 | |
63 | - /** |
|
64 | - * @var \Mailcode\Mailcode_Parser_Statement |
|
65 | - */ |
|
63 | + /** |
|
64 | + * @var \Mailcode\Mailcode_Parser_Statement |
|
65 | + */ |
|
66 | 66 | protected $params; |
67 | 67 | |
68 | - /** |
|
69 | - * @var string[] |
|
70 | - */ |
|
68 | + /** |
|
69 | + * @var string[] |
|
70 | + */ |
|
71 | 71 | protected $validations = array( |
72 | 72 | 'params', |
73 | 73 | 'type_supported', |
@@ -89,33 +89,33 @@ discard block |
||
89 | 89 | |
90 | 90 | } |
91 | 91 | |
92 | - /** |
|
93 | - * @return string The ID of the command = the name of the command class file. |
|
94 | - */ |
|
92 | + /** |
|
93 | + * @return string The ID of the command = the name of the command class file. |
|
94 | + */ |
|
95 | 95 | public function getID() : string |
96 | 96 | { |
97 | 97 | $tokens = explode('_', get_class($this)); |
98 | 98 | return array_pop($tokens); |
99 | 99 | } |
100 | 100 | |
101 | - /** |
|
102 | - * Checks whether this is a dummy command, which is only |
|
103 | - * used to access information on the command type. It cannot |
|
104 | - * be used as an actual live command. |
|
105 | - * |
|
106 | - * @return bool |
|
107 | - */ |
|
101 | + /** |
|
102 | + * Checks whether this is a dummy command, which is only |
|
103 | + * used to access information on the command type. It cannot |
|
104 | + * be used as an actual live command. |
|
105 | + * |
|
106 | + * @return bool |
|
107 | + */ |
|
108 | 108 | public function isDummy() : bool |
109 | 109 | { |
110 | 110 | return $this->type === '__dummy'; |
111 | 111 | } |
112 | 112 | |
113 | - /** |
|
114 | - * Retrieves a hash of the actual matched command string, |
|
115 | - * which is used in collections to detect duplicate commands. |
|
116 | - * |
|
117 | - * @return string |
|
118 | - */ |
|
113 | + /** |
|
114 | + * Retrieves a hash of the actual matched command string, |
|
115 | + * which is used in collections to detect duplicate commands. |
|
116 | + * |
|
117 | + * @return string |
|
118 | + */ |
|
119 | 119 | public function getHash() : string |
120 | 120 | { |
121 | 121 | $this->requireNonDummy(); |
@@ -207,9 +207,9 @@ discard block |
||
207 | 207 | } |
208 | 208 | } |
209 | 209 | |
210 | - /** |
|
211 | - * @return string[] |
|
212 | - */ |
|
210 | + /** |
|
211 | + * @return string[] |
|
212 | + */ |
|
213 | 213 | abstract protected function getValidations() : array; |
214 | 214 | |
215 | 215 | protected function validateSyntax_params() : void |
@@ -364,12 +364,12 @@ discard block |
||
364 | 364 | return implode('', $parts); |
365 | 365 | } |
366 | 366 | |
367 | - /** |
|
368 | - * Retrieves the names of all the command's supported types: the part |
|
369 | - * between the command name and the colon. Example: {command type: params}. |
|
370 | - * |
|
371 | - * @return string[] |
|
372 | - */ |
|
367 | + /** |
|
368 | + * Retrieves the names of all the command's supported types: the part |
|
369 | + * between the command name and the colon. Example: {command type: params}. |
|
370 | + * |
|
371 | + * @return string[] |
|
372 | + */ |
|
373 | 373 | public function getSupportedTypes() : array |
374 | 374 | { |
375 | 375 | return array(); |
@@ -24,9 +24,9 @@ discard block |
||
24 | 24 | |
25 | 25 | const VALIDATION_VARIABLE_COUNT_MISMATCH = 48401; |
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 |
@@ -49,15 +49,15 @@ discard block |
||
49 | 49 | return true; |
50 | 50 | } |
51 | 51 | |
52 | - /** |
|
53 | - * Retrieves the variable to show. |
|
54 | - * |
|
55 | - * NOTE: Only available once the command has been |
|
56 | - * validated. Always use isValid() first. |
|
57 | - * |
|
58 | - * @throws Mailcode_Exception |
|
59 | - * @return Mailcode_Variables_Variable |
|
60 | - */ |
|
52 | + /** |
|
53 | + * Retrieves the variable to show. |
|
54 | + * |
|
55 | + * NOTE: Only available once the command has been |
|
56 | + * validated. Always use isValid() first. |
|
57 | + * |
|
58 | + * @throws Mailcode_Exception |
|
59 | + * @return Mailcode_Variables_Variable |
|
60 | + */ |
|
61 | 61 | public function getVariable() : Mailcode_Variables_Variable |
62 | 62 | { |
63 | 63 | $this->validate(); |
@@ -74,15 +74,15 @@ discard block |
||
74 | 74 | ); |
75 | 75 | } |
76 | 76 | |
77 | - /** |
|
78 | - * Retrieves the full name of the variable to show. |
|
79 | - * |
|
80 | - * NOTE: Only available once the command has been |
|
81 | - * validated. Always use isValid() first. |
|
82 | - * |
|
83 | - * @throws Mailcode_Exception |
|
84 | - * @return string |
|
85 | - */ |
|
77 | + /** |
|
78 | + * Retrieves the full name of the variable to show. |
|
79 | + * |
|
80 | + * NOTE: Only available once the command has been |
|
81 | + * validated. Always use isValid() first. |
|
82 | + * |
|
83 | + * @throws Mailcode_Exception |
|
84 | + * @return string |
|
85 | + */ |
|
86 | 86 | public function getVariableName() : string |
87 | 87 | { |
88 | 88 | return $this->getVariable()->getFullName(); |
@@ -90,19 +90,19 @@ discard block |
||
90 | 90 | |
91 | 91 | protected function validateSyntax_require_variable() : void |
92 | 92 | { |
93 | - $vars = $this->getVariables()->getGroupedByName(); |
|
94 | - $amount = count($vars); |
|
93 | + $vars = $this->getVariables()->getGroupedByName(); |
|
94 | + $amount = count($vars); |
|
95 | 95 | |
96 | - if($amount === 1) |
|
97 | - { |
|
98 | - $this->variable = array_pop($vars); |
|
99 | - return; |
|
100 | - } |
|
96 | + if($amount === 1) |
|
97 | + { |
|
98 | + $this->variable = array_pop($vars); |
|
99 | + return; |
|
100 | + } |
|
101 | 101 | |
102 | - $this->validationResult->makeError( |
|
102 | + $this->validationResult->makeError( |
|
103 | 103 | t('Command has %1$s variables, %2$s expected.', $amount, 1), |
104 | 104 | self::VALIDATION_VARIABLE_COUNT_MISMATCH |
105 | - ); |
|
105 | + ); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | protected function getValidations() : array |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | { |
23 | 23 | const VALIDATION_VARIABLE_COUNT_MISMATCH = 49201; |
24 | 24 | |
25 | - /** |
|
26 | - * @var Mailcode_Variables_Variable |
|
27 | - */ |
|
25 | + /** |
|
26 | + * @var Mailcode_Variables_Variable |
|
27 | + */ |
|
28 | 28 | protected $variable; |
29 | 29 | |
30 | 30 | public function getName() : string |
@@ -57,11 +57,11 @@ discard block |
||
57 | 57 | return $this->type === 'variable'; |
58 | 58 | } |
59 | 59 | |
60 | - /** |
|
61 | - * Available only if the command is of type "variable". |
|
62 | - * |
|
63 | - * @return Mailcode_Variables_Variable|NULL |
|
64 | - */ |
|
60 | + /** |
|
61 | + * Available only if the command is of type "variable". |
|
62 | + * |
|
63 | + * @return Mailcode_Variables_Variable|NULL |
|
64 | + */ |
|
65 | 65 | public function getVariable() : ?Mailcode_Variables_Variable |
66 | 66 | { |
67 | 67 | if(isset($this->variable)) |
@@ -20,19 +20,19 @@ discard block |
||
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 |
@@ -68,11 +68,11 @@ discard block |
||
68 | 68 | } |
69 | 69 | } |
70 | 70 | |
71 | - /** |
|
72 | - * @param string[] $classes |
|
73 | - * @param string $content |
|
74 | - * @return string |
|
75 | - */ |
|
71 | + /** |
|
72 | + * @param string[] $classes |
|
73 | + * @param string $content |
|
74 | + * @return string |
|
75 | + */ |
|
76 | 76 | protected function renderTag(array $classes, string $content) : string |
77 | 77 | { |
78 | 78 | $parts = array(); |
@@ -32,34 +32,34 @@ |
||
32 | 32 | const VALIDATION_ERROR_PATH_UNDERSCORE = 48203; |
33 | 33 | const VALIDATION_ERROR_NAME_UNDERSCORE = 48204; |
34 | 34 | |
35 | - /** |
|
36 | - * @var string |
|
37 | - */ |
|
35 | + /** |
|
36 | + * @var string |
|
37 | + */ |
|
38 | 38 | protected $path; |
39 | 39 | |
40 | - /** |
|
41 | - * @var string |
|
42 | - */ |
|
40 | + /** |
|
41 | + * @var string |
|
42 | + */ |
|
43 | 43 | protected $name; |
44 | 44 | |
45 | - /** |
|
46 | - * @var string |
|
47 | - */ |
|
45 | + /** |
|
46 | + * @var string |
|
47 | + */ |
|
48 | 48 | protected $matchedText; |
49 | 49 | |
50 | - /** |
|
51 | - * @var string |
|
52 | - */ |
|
50 | + /** |
|
51 | + * @var string |
|
52 | + */ |
|
53 | 53 | protected $hash = ''; |
54 | 54 | |
55 | - /** |
|
56 | - * @var OperationResult |
|
57 | - */ |
|
55 | + /** |
|
56 | + * @var OperationResult |
|
57 | + */ |
|
58 | 58 | protected $validationResult = null; |
59 | 59 | |
60 | - /** |
|
61 | - * @var array<string> |
|
62 | - */ |
|
60 | + /** |
|
61 | + * @var array<string> |
|
62 | + */ |
|
63 | 63 | protected $validations = array( |
64 | 64 | 'number_path', |
65 | 65 | 'number_name', |
@@ -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() |
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() |
141 | 141 | { |
142 | 142 | $entries = array(); |
@@ -149,19 +149,19 @@ discard block |
||
149 | 149 | return $this->sortVariables($entries); |
150 | 150 | } |
151 | 151 | |
152 | - /** |
|
153 | - * Retrieves all variables, in the order they were addded. |
|
154 | - * @return \Mailcode\Mailcode_Variables_Variable[] |
|
155 | - */ |
|
152 | + /** |
|
153 | + * Retrieves all variables, in the order they were addded. |
|
154 | + * @return \Mailcode\Mailcode_Variables_Variable[] |
|
155 | + */ |
|
156 | 156 | public function getAll() |
157 | 157 | { |
158 | 158 | return $this->variables; |
159 | 159 | } |
160 | 160 | |
161 | - /** |
|
162 | - * Retrieves the full names of the variables that are present in the collection. |
|
163 | - * @return string[] |
|
164 | - */ |
|
161 | + /** |
|
162 | + * Retrieves the full names of the variables that are present in the collection. |
|
163 | + * @return string[] |
|
164 | + */ |
|
165 | 165 | public function getNames() : array |
166 | 166 | { |
167 | 167 | $result = array(); |
@@ -179,13 +179,13 @@ discard block |
||
179 | 179 | return $result; |
180 | 180 | } |
181 | 181 | |
182 | - /** |
|
183 | - * Takes a list of variables and sorts them, throwing away |
|
184 | - * the source array's keys. |
|
185 | - * |
|
186 | - * @param Mailcode_Variables_Variable[] $entries |
|
187 | - * @return Mailcode_Variables_Variable[] |
|
188 | - */ |
|
182 | + /** |
|
183 | + * Takes a list of variables and sorts them, throwing away |
|
184 | + * the source array's keys. |
|
185 | + * |
|
186 | + * @param Mailcode_Variables_Variable[] $entries |
|
187 | + * @return Mailcode_Variables_Variable[] |
|
188 | + */ |
|
189 | 189 | protected function sortVariables(array $entries) |
190 | 190 | { |
191 | 191 | $result = array_values($entries); |
@@ -198,13 +198,13 @@ discard block |
||
198 | 198 | return $result; |
199 | 199 | } |
200 | 200 | |
201 | - /** |
|
202 | - * Merges the variables collection with the target collection |
|
203 | - * by inheriting all that collection's variables. |
|
204 | - * |
|
205 | - * @param Mailcode_Variables_Collection $collection |
|
206 | - * @return Mailcode_Variables_Collection |
|
207 | - */ |
|
201 | + /** |
|
202 | + * Merges the variables collection with the target collection |
|
203 | + * by inheriting all that collection's variables. |
|
204 | + * |
|
205 | + * @param Mailcode_Variables_Collection $collection |
|
206 | + * @return Mailcode_Variables_Collection |
|
207 | + */ |
|
208 | 208 | public function mergeWith(Mailcode_Variables_Collection $collection) : Mailcode_Variables_Collection |
209 | 209 | { |
210 | 210 | $variables = $collection->getGroupedByHash(); |
@@ -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(); |
@@ -145,10 +145,10 @@ discard block |
||
145 | 145 | return str_replace(array_values($replaces), array_keys($replaces), $this->originalString); |
146 | 146 | } |
147 | 147 | |
148 | - /** |
|
149 | - * @param bool $highlighted |
|
150 | - * @return string[]string |
|
151 | - */ |
|
148 | + /** |
|
149 | + * @param bool $highlighted |
|
150 | + * @return string[]string |
|
151 | + */ |
|
152 | 152 | protected function getReplaces(bool $highlighted=false) : array |
153 | 153 | { |
154 | 154 | $placeholders = $this->getPlaceholders(); |
@@ -175,12 +175,12 @@ discard block |
||
175 | 175 | } |
176 | 176 | |
177 | 177 | |
178 | - /** |
|
179 | - * Retrieves all placeholders that have to be added to |
|
180 | - * the subject text. |
|
181 | - * |
|
182 | - * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[] |
|
183 | - */ |
|
178 | + /** |
|
179 | + * Retrieves all placeholders that have to be added to |
|
180 | + * the subject text. |
|
181 | + * |
|
182 | + * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[] |
|
183 | + */ |
|
184 | 184 | public function getPlaceholders() |
185 | 185 | { |
186 | 186 | if(isset($this->placeholders)) |
@@ -232,46 +232,46 @@ discard block |
||
232 | 232 | return str_replace($placeholderStrings, array_values($replaces), $string); |
233 | 233 | } |
234 | 234 | |
235 | - /** |
|
236 | - * Makes the string whole again after transforming or filtering it, |
|
237 | - * by replacing the command placeholders with the original commands. |
|
238 | - * |
|
239 | - * @param string $string |
|
240 | - * @return string |
|
241 | - * @throws Mailcode_Exception |
|
242 | - * |
|
243 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
244 | - * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
245 | - */ |
|
235 | + /** |
|
236 | + * Makes the string whole again after transforming or filtering it, |
|
237 | + * by replacing the command placeholders with the original commands. |
|
238 | + * |
|
239 | + * @param string $string |
|
240 | + * @return string |
|
241 | + * @throws Mailcode_Exception |
|
242 | + * |
|
243 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
244 | + * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
245 | + */ |
|
246 | 246 | public function makeWhole(string $string) : string |
247 | 247 | { |
248 | 248 | return $this->restore($string, false); |
249 | 249 | } |
250 | 250 | |
251 | - /** |
|
252 | - * Like makeWhole(), but replaces the commands with a syntax |
|
253 | - * highlighted version, meant for human readable texts only. |
|
254 | - * |
|
255 | - * Note: the commands lose their functionality (They cannot be |
|
256 | - * parsed from that string again). |
|
257 | - * |
|
258 | - * @param string $string |
|
259 | - * @return string |
|
260 | - * @throws Mailcode_Exception |
|
261 | - * |
|
262 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
263 | - * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
264 | - */ |
|
251 | + /** |
|
252 | + * Like makeWhole(), but replaces the commands with a syntax |
|
253 | + * highlighted version, meant for human readable texts only. |
|
254 | + * |
|
255 | + * Note: the commands lose their functionality (They cannot be |
|
256 | + * parsed from that string again). |
|
257 | + * |
|
258 | + * @param string $string |
|
259 | + * @return string |
|
260 | + * @throws Mailcode_Exception |
|
261 | + * |
|
262 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
263 | + * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
264 | + */ |
|
265 | 265 | public function makeHighlighted(string $string) : string |
266 | 266 | { |
267 | 267 | return $this->restore($string, true); |
268 | 268 | } |
269 | 269 | |
270 | - /** |
|
271 | - * Retrieves the commands collection contained in the string. |
|
272 | - * |
|
273 | - * @return Mailcode_Collection |
|
274 | - */ |
|
270 | + /** |
|
271 | + * Retrieves the commands collection contained in the string. |
|
272 | + * |
|
273 | + * @return Mailcode_Collection |
|
274 | + */ |
|
275 | 275 | public function getCollection() : Mailcode_Collection |
276 | 276 | { |
277 | 277 | if(isset($this->collection)) |
@@ -289,11 +289,11 @@ discard block |
||
289 | 289 | return $this->getCollection()->isValid(); |
290 | 290 | } |
291 | 291 | |
292 | - /** |
|
293 | - * @throws Mailcode_Exception |
|
294 | - * |
|
295 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
296 | - */ |
|
292 | + /** |
|
293 | + * @throws Mailcode_Exception |
|
294 | + * |
|
295 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
296 | + */ |
|
297 | 297 | protected function requireValidCollection() : void |
298 | 298 | { |
299 | 299 | if($this->getCollection()->isValid()) |