@@ -31,27 +31,27 @@ discard block |
||
31 | 31 | const VALIDATION_CANNOT_MIX_LOGIC_KEYWORDS = 60701; |
32 | 32 | const VALIDATION_INVALID_SUB_COMMAND = 60702; |
33 | 33 | |
34 | - /** |
|
35 | - * @var string |
|
36 | - */ |
|
34 | + /** |
|
35 | + * @var string |
|
36 | + */ |
|
37 | 37 | private $paramsString; |
38 | 38 | |
39 | - /** |
|
40 | - * @var string[] |
|
41 | - */ |
|
39 | + /** |
|
40 | + * @var string[] |
|
41 | + */ |
|
42 | 42 | private $names = array( |
43 | 43 | 'and', |
44 | 44 | 'or' |
45 | 45 | ); |
46 | 46 | |
47 | - /** |
|
48 | - * @var Mailcode_Commands_LogicKeywords_Keyword[] |
|
49 | - */ |
|
47 | + /** |
|
48 | + * @var Mailcode_Commands_LogicKeywords_Keyword[] |
|
49 | + */ |
|
50 | 50 | private $keywords = array(); |
51 | 51 | |
52 | - /** |
|
53 | - * @var string |
|
54 | - */ |
|
52 | + /** |
|
53 | + * @var string |
|
54 | + */ |
|
55 | 55 | private $mainParams = ''; |
56 | 56 | |
57 | 57 | public function __construct(Mailcode_Commands_Command $command, string $paramsString) |
@@ -136,9 +136,9 @@ discard block |
||
136 | 136 | } |
137 | 137 | } |
138 | 138 | |
139 | - /** |
|
140 | - * @return string[] |
|
141 | - */ |
|
139 | + /** |
|
140 | + * @return string[] |
|
141 | + */ |
|
142 | 142 | private function detectParameters() : array |
143 | 143 | { |
144 | 144 | $params = $this->paramsString; |
@@ -156,13 +156,13 @@ discard block |
||
156 | 156 | return $stack; |
157 | 157 | } |
158 | 158 | |
159 | - /** |
|
160 | - * @param string $params |
|
161 | - * @param Mailcode_Commands_LogicKeywords_Keyword $keyword |
|
162 | - * @param string[] $stack |
|
163 | - * @throws Mailcode_Exception |
|
164 | - * @return string |
|
165 | - */ |
|
159 | + /** |
|
160 | + * @param string $params |
|
161 | + * @param Mailcode_Commands_LogicKeywords_Keyword $keyword |
|
162 | + * @param string[] $stack |
|
163 | + * @throws Mailcode_Exception |
|
164 | + * @return string |
|
165 | + */ |
|
166 | 166 | private function detectParamsKeyword(string $params, Mailcode_Commands_LogicKeywords_Keyword $keyword, array &$stack) : string |
167 | 167 | { |
168 | 168 | $search = $keyword->getMatchedString(); |
@@ -187,22 +187,22 @@ discard block |
||
187 | 187 | return $params; |
188 | 188 | } |
189 | 189 | |
190 | - /** |
|
191 | - * Extracts the parameters string to use for the |
|
192 | - * original command itself, omitting all the logic |
|
193 | - * keywords for the sub-commands. |
|
194 | - * |
|
195 | - * @return string |
|
196 | - */ |
|
190 | + /** |
|
191 | + * Extracts the parameters string to use for the |
|
192 | + * original command itself, omitting all the logic |
|
193 | + * keywords for the sub-commands. |
|
194 | + * |
|
195 | + * @return string |
|
196 | + */ |
|
197 | 197 | public function getMainParamsString() : string |
198 | 198 | { |
199 | 199 | return $this->mainParams; |
200 | 200 | } |
201 | 201 | |
202 | - /** |
|
203 | - * Retrieves the detected keyword names. |
|
204 | - * @return string[] |
|
205 | - */ |
|
202 | + /** |
|
203 | + * Retrieves the detected keyword names. |
|
204 | + * @return string[] |
|
205 | + */ |
|
206 | 206 | public function getDetectedNames() : array |
207 | 207 | { |
208 | 208 | $names = array(); |
@@ -220,23 +220,23 @@ discard block |
||
220 | 220 | return $names; |
221 | 221 | } |
222 | 222 | |
223 | - /** |
|
224 | - * Retrieves all keywords that were detected in the |
|
225 | - * command's parameters string, if any. |
|
226 | - * |
|
227 | - * @return Mailcode_Commands_LogicKeywords_Keyword[] |
|
228 | - */ |
|
223 | + /** |
|
224 | + * Retrieves all keywords that were detected in the |
|
225 | + * command's parameters string, if any. |
|
226 | + * |
|
227 | + * @return Mailcode_Commands_LogicKeywords_Keyword[] |
|
228 | + */ |
|
229 | 229 | public function getKeywords() : array |
230 | 230 | { |
231 | 231 | return $this->keywords; |
232 | 232 | } |
233 | 233 | |
234 | - /** |
|
235 | - * Detects any keyword statements in the parameters by keyword name. |
|
236 | - * |
|
237 | - * @param string $name |
|
238 | - * @return Mailcode_Commands_LogicKeywords_Keyword[] |
|
239 | - */ |
|
234 | + /** |
|
235 | + * Detects any keyword statements in the parameters by keyword name. |
|
236 | + * |
|
237 | + * @param string $name |
|
238 | + * @return Mailcode_Commands_LogicKeywords_Keyword[] |
|
239 | + */ |
|
240 | 240 | private function detectKeywords(string $name) : array |
241 | 241 | { |
242 | 242 | $regex = sprintf('/%1$s\s+([a-z\-0-9]+):|%1$s:/x', $name); |
@@ -26,39 +26,39 @@ discard block |
||
26 | 26 | const ERROR_CANNOT_GET_INVALID_COMMAND = 60601; |
27 | 27 | const ERROR_CANNOT_OVERWRITE_PARAMETERS = 60602; |
28 | 28 | |
29 | - /** |
|
30 | - * @var Mailcode_Commands_LogicKeywords |
|
31 | - */ |
|
29 | + /** |
|
30 | + * @var Mailcode_Commands_LogicKeywords |
|
31 | + */ |
|
32 | 32 | private $keywords; |
33 | 33 | |
34 | - /** |
|
35 | - * @var string |
|
36 | - */ |
|
34 | + /** |
|
35 | + * @var string |
|
36 | + */ |
|
37 | 37 | private $name; |
38 | 38 | |
39 | - /** |
|
40 | - * @var string |
|
41 | - */ |
|
39 | + /** |
|
40 | + * @var string |
|
41 | + */ |
|
42 | 42 | private $keywordType; |
43 | 43 | |
44 | - /** |
|
45 | - * @var string |
|
46 | - */ |
|
44 | + /** |
|
45 | + * @var string |
|
46 | + */ |
|
47 | 47 | private $matchedString; |
48 | 48 | |
49 | - /** |
|
50 | - * @var string |
|
51 | - */ |
|
49 | + /** |
|
50 | + * @var string |
|
51 | + */ |
|
52 | 52 | private $params = ''; |
53 | 53 | |
54 | - /** |
|
55 | - * @var boolean |
|
56 | - */ |
|
54 | + /** |
|
55 | + * @var boolean |
|
56 | + */ |
|
57 | 57 | private $paramsSet = false; |
58 | 58 | |
59 | - /** |
|
60 | - * @var Mailcode_Collection |
|
61 | - */ |
|
59 | + /** |
|
60 | + * @var Mailcode_Collection |
|
61 | + */ |
|
62 | 62 | private $collection; |
63 | 63 | |
64 | 64 | public function __construct(Mailcode_Commands_LogicKeywords $keywords, string $name, string $matchedString, string $type) |
@@ -69,10 +69,10 @@ discard block |
||
69 | 69 | $this->matchedString = $matchedString; |
70 | 70 | } |
71 | 71 | |
72 | - /** |
|
73 | - * The keyword name, e.g. "and". Always lowercase. |
|
74 | - * @return string |
|
75 | - */ |
|
72 | + /** |
|
73 | + * The keyword name, e.g. "and". Always lowercase. |
|
74 | + * @return string |
|
75 | + */ |
|
76 | 76 | public function getName() : string |
77 | 77 | { |
78 | 78 | return $this->name; |
@@ -95,24 +95,24 @@ discard block |
||
95 | 95 | return $string; |
96 | 96 | } |
97 | 97 | |
98 | - /** |
|
99 | - * The full string that was matched in the command's parameters |
|
100 | - * string. Examples: "and:", "and variable:"... |
|
101 | - * |
|
102 | - * @return string |
|
103 | - */ |
|
98 | + /** |
|
99 | + * The full string that was matched in the command's parameters |
|
100 | + * string. Examples: "and:", "and variable:"... |
|
101 | + * |
|
102 | + * @return string |
|
103 | + */ |
|
104 | 104 | public function getMatchedString() : string |
105 | 105 | { |
106 | 106 | return $this->matchedString; |
107 | 107 | } |
108 | 108 | |
109 | - /** |
|
110 | - * Sets the parameters string matching this logic keyword, |
|
111 | - * which is used to build the actual sub-command. Set by |
|
112 | - * the LogicKeywords class instance. |
|
113 | - * |
|
114 | - * @param string $params |
|
115 | - */ |
|
109 | + /** |
|
110 | + * Sets the parameters string matching this logic keyword, |
|
111 | + * which is used to build the actual sub-command. Set by |
|
112 | + * the LogicKeywords class instance. |
|
113 | + * |
|
114 | + * @param string $params |
|
115 | + */ |
|
116 | 116 | public function setParamsString(string $params) : void |
117 | 117 | { |
118 | 118 | if($this->paramsSet) |
@@ -130,13 +130,13 @@ discard block |
||
130 | 130 | $this->createCommand(); |
131 | 131 | } |
132 | 132 | |
133 | - /** |
|
134 | - * Retrieves the full command string used to create |
|
135 | - * the actual command. For opening commands like IF, |
|
136 | - * this includes the closing {end} command. |
|
137 | - * |
|
138 | - * @return string |
|
139 | - */ |
|
133 | + /** |
|
134 | + * Retrieves the full command string used to create |
|
135 | + * the actual command. For opening commands like IF, |
|
136 | + * this includes the closing {end} command. |
|
137 | + * |
|
138 | + * @return string |
|
139 | + */ |
|
140 | 140 | public function getCommandString() : string |
141 | 141 | { |
142 | 142 | $command = $this->keywords->getCommand(); |
@@ -169,12 +169,12 @@ discard block |
||
169 | 169 | } |
170 | 170 | } |
171 | 171 | |
172 | - /** |
|
173 | - * Retrieves the command for the keyword. |
|
174 | - * |
|
175 | - * @throws Mailcode_Exception |
|
176 | - * @return Mailcode_Commands_Command |
|
177 | - */ |
|
172 | + /** |
|
173 | + * Retrieves the command for the keyword. |
|
174 | + * |
|
175 | + * @throws Mailcode_Exception |
|
176 | + * @return Mailcode_Commands_Command |
|
177 | + */ |
|
178 | 178 | public function getCommand() : Mailcode_Commands_Command |
179 | 179 | { |
180 | 180 | $command = $this->collection->getFirstCommand(); |