@@ -24,7 +24,7 @@ |
||
24 | 24 | { |
25 | 25 | public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection |
26 | 26 | { |
27 | - if($variable->isValid()) |
|
27 | + if ($variable->isValid()) |
|
28 | 28 | { |
29 | 29 | return $this; |
30 | 30 | } |
@@ -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(); |
@@ -66,9 +66,9 @@ discard block |
||
66 | 66 | { |
67 | 67 | $fullName = $this->fixName($fullName); |
68 | 68 | |
69 | - foreach($this->variables as $variable) |
|
69 | + foreach ($this->variables as $variable) |
|
70 | 70 | { |
71 | - if($variable->getFullName() === $fullName) |
|
71 | + if ($variable->getFullName() === $fullName) |
|
72 | 72 | { |
73 | 73 | return true; |
74 | 74 | } |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | |
92 | 92 | $collection = new Mailcode_Variables_Collection_Regular(); |
93 | 93 | |
94 | - foreach($this->variables as $variable) |
|
94 | + foreach ($this->variables as $variable) |
|
95 | 95 | { |
96 | - if($variable->getFullName() === $fullName) |
|
96 | + if ($variable->getFullName() === $fullName) |
|
97 | 97 | { |
98 | 98 | $collection->add($variable); |
99 | 99 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | */ |
111 | 111 | protected function fixName(string $fullName) : string |
112 | 112 | { |
113 | - if(substr($fullName, 0, 1) === '$') |
|
113 | + if (substr($fullName, 0, 1) === '$') |
|
114 | 114 | { |
115 | 115 | return $fullName; |
116 | 116 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | { |
139 | 139 | $entries = array(); |
140 | 140 | |
141 | - foreach($this->variables as $variable) |
|
141 | + foreach ($this->variables as $variable) |
|
142 | 142 | { |
143 | 143 | $entries[$variable->getFullName()] = $variable; |
144 | 144 | } |
@@ -154,11 +154,11 @@ discard block |
||
154 | 154 | { |
155 | 155 | $result = array(); |
156 | 156 | |
157 | - foreach($this->variables as $variable) |
|
157 | + foreach ($this->variables as $variable) |
|
158 | 158 | { |
159 | 159 | $name = $variable->getFullName(); |
160 | 160 | |
161 | - if(!in_array($name, $result)) |
|
161 | + if (!in_array($name, $result)) |
|
162 | 162 | { |
163 | 163 | $result[] = $name; |
164 | 164 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | { |
198 | 198 | $variables = $collection->getGroupedByHash(); |
199 | 199 | |
200 | - foreach($variables as $variable) |
|
200 | + foreach ($variables as $variable) |
|
201 | 201 | { |
202 | 202 | $this->add($variable); |
203 | 203 | } |
@@ -35,12 +35,12 @@ |
||
35 | 35 | $matches = array(); |
36 | 36 | preg_match_all(self::REGEX_VARIABLE_NAME, $subject, $matches, PREG_PATTERN_ORDER); |
37 | 37 | |
38 | - if(!isset($matches[0]) || empty($matches[0])) |
|
38 | + if (!isset($matches[0]) || empty($matches[0])) |
|
39 | 39 | { |
40 | 40 | return $collection; |
41 | 41 | } |
42 | 42 | |
43 | - foreach($matches[0] as $idx => $matchedText) |
|
43 | + foreach ($matches[0] as $idx => $matchedText) |
|
44 | 44 | { |
45 | 45 | $path = $matches[1][$idx]; |
46 | 46 | $name = $matches[2][$idx]; |
@@ -22,12 +22,12 @@ |
||
22 | 22 | { |
23 | 23 | const REGEX_VARIABLE_NAME = '/\$\s*([A-Z0-9_]+)\s*\.\s*([A-Z0-9_]+)/sx'; |
24 | 24 | |
25 | - /** |
|
26 | - * Parses the specified string to find all variable names contained within, if any. |
|
27 | - * |
|
28 | - * @param string $subject |
|
29 | - * @return Mailcode_Variables_Collection_Regular |
|
30 | - */ |
|
25 | + /** |
|
26 | + * Parses the specified string to find all variable names contained within, if any. |
|
27 | + * |
|
28 | + * @param string $subject |
|
29 | + * @return Mailcode_Variables_Collection_Regular |
|
30 | + */ |
|
31 | 31 | public function parseString(string $subject) : Mailcode_Variables_Collection_Regular |
32 | 32 | { |
33 | 33 | $collection = new Mailcode_Variables_Collection_Regular(); |
@@ -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) |
@@ -60,11 +60,11 @@ discard block |
||
60 | 60 | |
61 | 61 | $commands = $this->collection->getCommands(); |
62 | 62 | |
63 | - foreach($commands as $command) |
|
63 | + foreach ($commands as $command) |
|
64 | 64 | { |
65 | 65 | $method = 'validate_'.$command->getCommandType(); |
66 | 66 | |
67 | - if(!method_exists($this, $method)) |
|
67 | + if (!method_exists($this, $method)) |
|
68 | 68 | { |
69 | 69 | throw new Mailcode_Exception( |
70 | 70 | 'Unknown command type validation method.', |
@@ -79,13 +79,13 @@ discard block |
||
79 | 79 | |
80 | 80 | $this->$method($command); |
81 | 81 | |
82 | - if(!$this->validationResult->isValid()) |
|
82 | + if (!$this->validationResult->isValid()) |
|
83 | 83 | { |
84 | 84 | break; |
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
88 | - if($this->validationResult->isValid()) |
|
88 | + if ($this->validationResult->isValid()) |
|
89 | 89 | { |
90 | 90 | $this->validate_Unclosed(); |
91 | 91 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | { |
98 | 98 | $leftover = $this->getOpenCommand(); |
99 | 99 | |
100 | - if($leftover === null) |
|
100 | + if ($leftover === null) |
|
101 | 101 | { |
102 | 102 | return; |
103 | 103 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | protected function getOpenCommand() : ?Mailcode_Commands_Command_Type_Opening |
115 | 115 | { |
116 | - if(empty($this->stack)) |
|
116 | + if (empty($this->stack)) |
|
117 | 117 | { |
118 | 118 | return null; |
119 | 119 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | |
125 | 125 | $cmd = $this->stack[$idx]; |
126 | 126 | |
127 | - if($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
|
127 | + if ($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
|
128 | 128 | { |
129 | 129 | return $cmd; |
130 | 130 | } |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | { |
149 | 149 | $parent = $this->getOpenCommand(); |
150 | 150 | |
151 | - if($parent === null) |
|
151 | + if ($parent === null) |
|
152 | 152 | { |
153 | 153 | $this->validationResult->makeError( |
154 | 154 | t( |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | return; |
163 | 163 | } |
164 | 164 | |
165 | - if($parent->getName() !== $command->getParentName()) |
|
165 | + if ($parent->getName() !== $command->getParentName()) |
|
166 | 166 | { |
167 | 167 | $this->validationResult->makeError( |
168 | 168 | t( |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | |
182 | 182 | protected function validate_Closing(Mailcode_Commands_Command_Type_Closing $command) |
183 | 183 | { |
184 | - if(empty($this->stack)) |
|
184 | + if (empty($this->stack)) |
|
185 | 185 | { |
186 | 186 | $this->validationResult->makeError( |
187 | 187 | t('All open commands have already been ended.'), |
@@ -29,34 +29,34 @@ discard block |
||
29 | 29 | const VALIDATION_ADDON_NOT_SUPPORTED = 48303; |
30 | 30 | const VALIDATION_UNKNOWN_COMMAND_NAME = 48304; |
31 | 31 | |
32 | - /** |
|
33 | - * @var string |
|
34 | - */ |
|
32 | + /** |
|
33 | + * @var string |
|
34 | + */ |
|
35 | 35 | protected $type = ''; |
36 | 36 | |
37 | - /** |
|
38 | - * @var string |
|
39 | - */ |
|
37 | + /** |
|
38 | + * @var string |
|
39 | + */ |
|
40 | 40 | protected $paramsString = ''; |
41 | 41 | |
42 | - /** |
|
43 | - * @var string |
|
44 | - */ |
|
42 | + /** |
|
43 | + * @var string |
|
44 | + */ |
|
45 | 45 | protected $matchedText = ''; |
46 | 46 | |
47 | - /** |
|
48 | - * @var string |
|
49 | - */ |
|
47 | + /** |
|
48 | + * @var string |
|
49 | + */ |
|
50 | 50 | protected $hash = ''; |
51 | 51 | |
52 | - /** |
|
53 | - * @var \AppUtils\OperationResult |
|
54 | - */ |
|
52 | + /** |
|
53 | + * @var \AppUtils\OperationResult |
|
54 | + */ |
|
55 | 55 | protected $validationResult = null; |
56 | 56 | |
57 | - /** |
|
58 | - * @var \Mailcode\Mailcode |
|
59 | - */ |
|
57 | + /** |
|
58 | + * @var \Mailcode\Mailcode |
|
59 | + */ |
|
60 | 60 | protected $mailcode; |
61 | 61 | |
62 | 62 | public function __construct(string $type='', string $paramsString='', string $matchedText='') |
@@ -67,33 +67,33 @@ discard block |
||
67 | 67 | $this->mailcode = Mailcode::create(); |
68 | 68 | } |
69 | 69 | |
70 | - /** |
|
71 | - * @return string The ID of the command = the name of the command class file. |
|
72 | - */ |
|
70 | + /** |
|
71 | + * @return string The ID of the command = the name of the command class file. |
|
72 | + */ |
|
73 | 73 | public function getID() : string |
74 | 74 | { |
75 | 75 | $tokens = explode('_', get_class($this)); |
76 | 76 | return array_pop($tokens); |
77 | 77 | } |
78 | 78 | |
79 | - /** |
|
80 | - * Checks whether this is a dummy command, which is only |
|
81 | - * used to access information on the command type. It cannot |
|
82 | - * be used as an actual live command. |
|
83 | - * |
|
84 | - * @return bool |
|
85 | - */ |
|
79 | + /** |
|
80 | + * Checks whether this is a dummy command, which is only |
|
81 | + * used to access information on the command type. It cannot |
|
82 | + * be used as an actual live command. |
|
83 | + * |
|
84 | + * @return bool |
|
85 | + */ |
|
86 | 86 | public function isDummy() : bool |
87 | 87 | { |
88 | 88 | return $this->type === '__dummy'; |
89 | 89 | } |
90 | 90 | |
91 | - /** |
|
92 | - * Retrieves a hash of the actual matched command string, |
|
93 | - * which is used in collections to detect duplicate commands. |
|
94 | - * |
|
95 | - * @return string |
|
96 | - */ |
|
91 | + /** |
|
92 | + * Retrieves a hash of the actual matched command string, |
|
93 | + * which is used in collections to detect duplicate commands. |
|
94 | + * |
|
95 | + * @return string |
|
96 | + */ |
|
97 | 97 | public function getHash() : string |
98 | 98 | { |
99 | 99 | $this->requireNonDummy(); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | */ |
60 | 60 | protected $mailcode; |
61 | 61 | |
62 | - public function __construct(string $type='', string $paramsString='', string $matchedText='') |
|
62 | + public function __construct(string $type = '', string $paramsString = '', string $matchedText = '') |
|
63 | 63 | { |
64 | 64 | $this->type = $type; |
65 | 65 | $this->paramsString = $paramsString; |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | { |
99 | 99 | $this->requireNonDummy(); |
100 | 100 | |
101 | - if($this->hash === '') { |
|
101 | + if ($this->hash === '') { |
|
102 | 102 | $this->hash = md5($this->matchedText); |
103 | 103 | } |
104 | 104 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | protected function requireNonDummy() : void |
109 | 109 | { |
110 | - if(!$this->isDummy()) |
|
110 | + if (!$this->isDummy()) |
|
111 | 111 | { |
112 | 112 | return; |
113 | 113 | } |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | { |
129 | 129 | $this->requireNonDummy(); |
130 | 130 | |
131 | - if(isset($this->validationResult)) |
|
131 | + if (isset($this->validationResult)) |
|
132 | 132 | { |
133 | 133 | return $this->validationResult; |
134 | 134 | } |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | |
143 | 143 | public function getValidationResult() : \AppUtils\OperationResult |
144 | 144 | { |
145 | - if(isset($this->validationResult)) |
|
145 | + if (isset($this->validationResult)) |
|
146 | 146 | { |
147 | 147 | return $this->validationResult; |
148 | 148 | } |
@@ -165,11 +165,11 @@ discard block |
||
165 | 165 | { |
166 | 166 | $validations = array_merge($this->validations, $this->getValidations()); |
167 | 167 | |
168 | - foreach($validations as $validation) |
|
168 | + foreach ($validations as $validation) |
|
169 | 169 | { |
170 | 170 | $method = 'validateSyntax_'.$validation; |
171 | 171 | |
172 | - if(!method_exists($this, $method)) |
|
172 | + if (!method_exists($this, $method)) |
|
173 | 173 | { |
174 | 174 | throw new Mailcode_Exception( |
175 | 175 | 'Missing validation method', |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | $this->$method(); |
186 | 186 | |
187 | 187 | // break off at the first validation issue |
188 | - if(!$this->validationResult->isValid()) |
|
188 | + if (!$this->validationResult->isValid()) |
|
189 | 189 | { |
190 | 190 | return; |
191 | 191 | } |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | |
197 | 197 | protected function validateSyntax_params() |
198 | 198 | { |
199 | - if($this->requiresParameters() && empty($this->paramsString)) |
|
199 | + if ($this->requiresParameters() && empty($this->paramsString)) |
|
200 | 200 | { |
201 | 201 | $this->validationResult->makeError( |
202 | 202 | t('Parameters have to be specified.'), |
@@ -208,14 +208,14 @@ discard block |
||
208 | 208 | |
209 | 209 | protected function validateSyntax_type_supported() |
210 | 210 | { |
211 | - if(!$this->supportsType() || empty($this->type)) |
|
211 | + if (!$this->supportsType() || empty($this->type)) |
|
212 | 212 | { |
213 | 213 | return; |
214 | 214 | } |
215 | 215 | |
216 | 216 | $types = $this->getSupportedTypes(); |
217 | 217 | |
218 | - if(!in_array($this->type, $types)) |
|
218 | + if (!in_array($this->type, $types)) |
|
219 | 219 | { |
220 | 220 | $this->validationResult->makeError( |
221 | 221 | t('The command addon %1$s is not supported.', $this->type).' '. |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | |
230 | 230 | protected function validateSyntax_type_unsupported() |
231 | 231 | { |
232 | - if($this->supportsType() || empty($this->type)) |
|
232 | + if ($this->supportsType() || empty($this->type)) |
|
233 | 233 | { |
234 | 234 | return; |
235 | 235 | } |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | { |
245 | 245 | $vars = $this->getVariables(); |
246 | 246 | |
247 | - if(!$vars->hasInvalid()) |
|
247 | + if (!$vars->hasInvalid()) |
|
248 | 248 | { |
249 | 249 | return; |
250 | 250 | } |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | |
265 | 265 | public function getType() : string |
266 | 266 | { |
267 | - if($this->supportsType()) |
|
267 | + if ($this->supportsType()) |
|
268 | 268 | { |
269 | 269 | return $this->type; |
270 | 270 | } |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | |
291 | 291 | public function getParamsString() : string |
292 | 292 | { |
293 | - if($this->requiresParameters()) |
|
293 | + if ($this->requiresParameters()) |
|
294 | 294 | { |
295 | 295 | return $this->paramsString; |
296 | 296 | } |
@@ -26,19 +26,19 @@ |
||
26 | 26 | const VALIDATION_VARIABLE_LEFT_UNRECOGNIZED = 48504; |
27 | 27 | const VALIDATION_ASSIGNMENT_STATEMENT_INVALID = 48505; |
28 | 28 | |
29 | - /** |
|
30 | - * @var string[] |
|
31 | - */ |
|
29 | + /** |
|
30 | + * @var string[] |
|
31 | + */ |
|
32 | 32 | protected $parts = array(); |
33 | 33 | |
34 | - /** |
|
35 | - * @var Mailcode_Variables_Variable |
|
36 | - */ |
|
34 | + /** |
|
35 | + * @var Mailcode_Variables_Variable |
|
36 | + */ |
|
37 | 37 | protected $leftVar; |
38 | 38 | |
39 | - /** |
|
40 | - * @var Mailcode_Parser_Statement |
|
41 | - */ |
|
39 | + /** |
|
40 | + * @var Mailcode_Parser_Statement |
|
41 | + */ |
|
42 | 42 | protected $statement; |
43 | 43 | |
44 | 44 | public function getName() : string |
@@ -65,12 +65,12 @@ discard block |
||
65 | 65 | { |
66 | 66 | $amount = substr_count($this->paramsString, '='); |
67 | 67 | |
68 | - if($amount === 1) |
|
68 | + if ($amount === 1) |
|
69 | 69 | { |
70 | 70 | return; |
71 | 71 | } |
72 | 72 | |
73 | - if($amount < 1) |
|
73 | + if ($amount < 1) |
|
74 | 74 | { |
75 | 75 | $this->validationResult->makeError( |
76 | 76 | t('The quality operator (=) is missing.'), |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | { |
91 | 91 | $this->parts = \AppUtils\ConvertHelper::explodeTrim('=', $this->paramsString); |
92 | 92 | |
93 | - if(count($this->parts) === 2) |
|
93 | + if (count($this->parts) === 2) |
|
94 | 94 | { |
95 | 95 | return; |
96 | 96 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | // any variables we may find have already been validated. |
107 | 107 | $vars = $this->mailcode->findVariables($this->parts[0])->getGroupedByName(); |
108 | 108 | |
109 | - if(count($vars) === 1) |
|
109 | + if (count($vars) === 1) |
|
110 | 110 | { |
111 | 111 | $this->leftVar = array_shift($vars); |
112 | 112 | return; |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | { |
123 | 123 | $this->statement = $this->mailcode->getParser()->createStatement($this->parts[1]); |
124 | 124 | |
125 | - if($this->statement->isValid()) |
|
125 | + if ($this->statement->isValid()) |
|
126 | 126 | { |
127 | 127 | return; |
128 | 128 | } |
@@ -76,8 +76,7 @@ |
||
76 | 76 | t('The quality operator (=) is missing.'), |
77 | 77 | self::VALIDATION_MISSING_EQUALS_SIGN |
78 | 78 | ); |
79 | - } |
|
80 | - else |
|
79 | + } else |
|
81 | 80 | { |
82 | 81 | $this->validationResult->makeError( |
83 | 82 | t('Only a single equality operator (=) should be used for variable assignment.'), |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | { |
47 | 47 | $amount = $this->getVariables()->countVariables(); |
48 | 48 | |
49 | - if($amount >= 1) |
|
49 | + if ($amount >= 1) |
|
50 | 50 | { |
51 | 51 | return; |
52 | 52 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | { |
62 | 62 | $validations = array(); |
63 | 63 | |
64 | - if($this->getType() === 'variable') |
|
64 | + if ($this->getType() === 'variable') |
|
65 | 65 | { |
66 | 66 | $validations[] = 'require_variable'; |
67 | 67 | } |
@@ -32,29 +32,29 @@ |
||
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 | 60 | public function __construct(string $path, string $name, string $matchedText) |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | |
87 | 87 | public function getHash() : string |
88 | 88 | { |
89 | - if(empty($this->hash)) |
|
89 | + if (empty($this->hash)) |
|
90 | 90 | { |
91 | 91 | $this->hash = md5($this->matchedText); |
92 | 92 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | |
102 | 102 | public function getValidationResult() : OperationResult |
103 | 103 | { |
104 | - if(isset($this->validationResult)) |
|
104 | + if (isset($this->validationResult)) |
|
105 | 105 | { |
106 | 106 | return $this->validationResult; |
107 | 107 | } |
@@ -122,11 +122,11 @@ discard block |
||
122 | 122 | |
123 | 123 | protected function validate() : void |
124 | 124 | { |
125 | - foreach($this->validations as $validation) |
|
125 | + foreach ($this->validations as $validation) |
|
126 | 126 | { |
127 | 127 | $method = 'validate_'.$validation; |
128 | 128 | |
129 | - if(!method_exists($this, $method)) |
|
129 | + if (!method_exists($this, $method)) |
|
130 | 130 | { |
131 | 131 | throw new Mailcode_Exception( |
132 | 132 | 'Unknown validation method', |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | |
142 | 142 | $this->$method(); |
143 | 143 | |
144 | - if(!$this->validationResult->isValid()) |
|
144 | + if (!$this->validationResult->isValid()) |
|
145 | 145 | { |
146 | 146 | return; |
147 | 147 | } |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | |
171 | 171 | protected function validateNumber(string $value, int $errorCode) |
172 | 172 | { |
173 | - if(!is_numeric(substr($value, 0, 1))) |
|
173 | + if (!is_numeric(substr($value, 0, 1))) |
|
174 | 174 | { |
175 | 175 | return; |
176 | 176 | } |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | $length = strlen($value); |
191 | 191 | |
192 | 192 | // trimming underscores does not change the length: no underscores at start or end of string. |
193 | - if(strlen(trim($value, '_')) == $length) |
|
193 | + if (strlen(trim($value, '_')) == $length) |
|
194 | 194 | { |
195 | 195 | return; |
196 | 196 | } |
@@ -29,14 +29,14 @@ discard block |
||
29 | 29 | |
30 | 30 | const VALIDATION_UNQUOTED_STRING_LITERALS = 48802; |
31 | 31 | |
32 | - /** |
|
33 | - * @var string |
|
34 | - */ |
|
32 | + /** |
|
33 | + * @var string |
|
34 | + */ |
|
35 | 35 | protected $statement; |
36 | 36 | |
37 | - /** |
|
38 | - * @var OperationResult |
|
39 | - */ |
|
37 | + /** |
|
38 | + * @var OperationResult |
|
39 | + */ |
|
40 | 40 | protected $result; |
41 | 41 | |
42 | 42 | protected $operands = array( |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | if(!empty($leftover)) |
98 | 98 | { |
99 | 99 | $this->result->makeError( |
100 | - t('Unquoted string literals found:').' "'.$leftover.'"', |
|
100 | + t('Unquoted string literals found:').' "'.$leftover.'"', |
|
101 | 101 | self::VALIDATION_UNQUOTED_STRING_LITERALS |
102 | 102 | ); |
103 | 103 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | |
64 | 64 | public function getValidationResult() : OperationResult |
65 | 65 | { |
66 | - if(isset($this->result)) |
|
66 | + if (isset($this->result)) |
|
67 | 67 | { |
68 | 68 | return $this->result; |
69 | 69 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | { |
80 | 80 | $statement = trim($this->statement); |
81 | 81 | |
82 | - if(empty($statement)) |
|
82 | + if (empty($statement)) |
|
83 | 83 | { |
84 | 84 | $this->result->makeError( |
85 | 85 | t('Empty statement'), |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $leftover = $this->removeTokens($tokenized); |
95 | 95 | $leftover = str_replace(' ', '', $leftover); |
96 | 96 | |
97 | - if(!empty($leftover)) |
|
97 | + if (!empty($leftover)) |
|
98 | 98 | { |
99 | 99 | $this->result->makeError( |
100 | 100 | t('Unquoted string literals found:').' "'.$leftover.'"', |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $matches = array(); |
119 | 119 | preg_match_all('/'.sprintf($this->token, '[A-Z0-9_]+').'/sx', $statement, $matches, PREG_PATTERN_ORDER); |
120 | 120 | |
121 | - foreach($matches[0] as $match) |
|
121 | + foreach ($matches[0] as $match) |
|
122 | 122 | { |
123 | 123 | $statement = str_replace($match, '', $statement); |
124 | 124 | } |
@@ -140,11 +140,11 @@ discard block |
||
140 | 140 | { |
141 | 141 | $tokenized = trim($statement); |
142 | 142 | |
143 | - foreach($this->tokens as $token) |
|
143 | + foreach ($this->tokens as $token) |
|
144 | 144 | { |
145 | 145 | $method = 'tokenize_'.$token; |
146 | 146 | |
147 | - if(!method_exists($this, $method)) |
|
147 | + if (!method_exists($this, $method)) |
|
148 | 148 | { |
149 | 149 | throw new Mailcode_Exception( |
150 | 150 | 'Unknown statement token.', |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | { |
173 | 173 | $vars = Mailcode::create()->findVariables($tokenized)->getGroupedByHash(); |
174 | 174 | |
175 | - foreach($vars as $var) |
|
175 | + foreach ($vars as $var) |
|
176 | 176 | { |
177 | 177 | $tokenized = str_replace($var->getMatchedText(), $this->getToken('VARIABLE'), $tokenized); |
178 | 178 | } |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | |
183 | 183 | protected function tokenize_operands(string $tokenized) : string |
184 | 184 | { |
185 | - foreach($this->operands as $operand) |
|
185 | + foreach ($this->operands as $operand) |
|
186 | 186 | { |
187 | 187 | $tokenized = str_replace($operand, $this->getToken('OPERAND'), $tokenized); |
188 | 188 | } |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | $matches = array(); |
196 | 196 | preg_match_all('/"(.*)"/sx', $tokenized, $matches, PREG_PATTERN_ORDER); |
197 | 197 | |
198 | - foreach($matches[0] as $match) |
|
198 | + foreach ($matches[0] as $match) |
|
199 | 199 | { |
200 | 200 | $tokenized = str_replace($match, $this->getToken('STRING_LITERAL'), $tokenized); |
201 | 201 | } |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | $matches = array(); |
209 | 209 | preg_match_all('/[0-9]+\s*[.,]\s*[0-9]+|[0-9]+/sx', $tokenized, $matches, PREG_PATTERN_ORDER); |
210 | 210 | |
211 | - foreach($matches[0] as $match) |
|
211 | + foreach ($matches[0] as $match) |
|
212 | 212 | { |
213 | 213 | $tokenized = str_replace($match, $this->getToken('NUMBER'), $tokenized); |
214 | 214 | } |