@@ -12,7 +12,7 @@ |
||
12 | 12 | $autoload = realpath($root.'/../vendor/autoload.php'); |
13 | 13 | |
14 | 14 | // we need the autoloader to be present |
15 | - if($autoload === false) |
|
15 | + if ($autoload === false) |
|
16 | 16 | { |
17 | 17 | die('<b>ERROR:</b> Autoloader not present. Run composer update first.'); |
18 | 18 | } |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | public function getReplacementText() : string |
66 | 66 | { |
67 | - if(!empty($this->replacement)) |
|
67 | + if (!empty($this->replacement)) |
|
68 | 68 | { |
69 | 69 | return $this->replacement; |
70 | 70 | } |
@@ -82,13 +82,13 @@ discard block |
||
82 | 82 | // to total amount of zeroes to pad with to obtain the total length |
83 | 83 | $padLength = $this->getLength() - $length; |
84 | 84 | |
85 | - if($padLength < 0) |
|
85 | + if ($padLength < 0) |
|
86 | 86 | { |
87 | 87 | $padLength = 0; |
88 | 88 | } |
89 | 89 | |
90 | 90 | // create the zero-padded ID to fill the format string with |
91 | - $paddedID = str_pad((string)$this->id, $padLength, '0'); |
|
91 | + $paddedID = str_pad((string)$this->id, $padLength, '0'); |
|
92 | 92 | |
93 | 93 | $this->replacement = sprintf($format, $paddedID); |
94 | 94 |
@@ -25,24 +25,24 @@ discard block |
||
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) |
@@ -115,18 +115,18 @@ discard block |
||
115 | 115 | return $this->command; |
116 | 116 | } |
117 | 117 | |
118 | - /** |
|
119 | - * Serializes the placeholder's information into |
|
120 | - * an array with the following keys: |
|
121 | - * |
|
122 | - * - originalText |
|
123 | - * - replacementText |
|
124 | - * - normalizedText |
|
125 | - * - length |
|
126 | - * - id |
|
127 | - * |
|
128 | - * @return array<string,string|integer> |
|
129 | - */ |
|
118 | + /** |
|
119 | + * Serializes the placeholder's information into |
|
120 | + * an array with the following keys: |
|
121 | + * |
|
122 | + * - originalText |
|
123 | + * - replacementText |
|
124 | + * - normalizedText |
|
125 | + * - length |
|
126 | + * - id |
|
127 | + * |
|
128 | + * @return array<string,string|integer> |
|
129 | + */ |
|
130 | 130 | public function serialize() : array |
131 | 131 | { |
132 | 132 | return array( |
@@ -141,13 +141,11 @@ |
||
141 | 141 | if(!empty($matches[1][$index])) |
142 | 142 | { |
143 | 143 | $name = $matches[1][$index]; |
144 | - } |
|
145 | - else if(!empty($matches[2][$index])) |
|
144 | + } else if(!empty($matches[2][$index])) |
|
146 | 145 | { |
147 | 146 | $name = $matches[2][$index]; |
148 | 147 | $params = $matches[3][$index]; |
149 | - } |
|
150 | - else if(!empty($matches[4][$index])) |
|
148 | + } else if(!empty($matches[4][$index])) |
|
151 | 149 | { |
152 | 150 | $name = $matches[4][$index]; |
153 | 151 | $type = $matches[5][$index]; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | |
74 | 74 | $total = count($matches[0]); |
75 | 75 | |
76 | - for($i=0; $i < $total; $i++) |
|
76 | + for ($i = 0; $i < $total; $i++) |
|
77 | 77 | { |
78 | 78 | $match = $this->parseMatch($matches, $i); |
79 | 79 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | protected function prepareString(string $subject) : string |
87 | 87 | { |
88 | - if(!ConvertHelper::isStringHTML($subject)) |
|
88 | + if (!ConvertHelper::isStringHTML($subject)) |
|
89 | 89 | { |
90 | 90 | return $subject; |
91 | 91 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | { |
107 | 107 | $name = $match->getName(); |
108 | 108 | |
109 | - if(!$this->commands->nameExists($name)) |
|
109 | + if (!$this->commands->nameExists($name)) |
|
110 | 110 | { |
111 | 111 | $collection->addErrorMessage( |
112 | 112 | $match->getMatchedString(), |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $match->getMatchedString() |
124 | 124 | ); |
125 | 125 | |
126 | - if($cmd->isValid()) |
|
126 | + if ($cmd->isValid()) |
|
127 | 127 | { |
128 | 128 | $collection->addCommand($cmd); |
129 | 129 | return; |
@@ -153,16 +153,16 @@ discard block |
||
153 | 153 | // 5 = parameter type command, type |
154 | 154 | // 6 = parameter type command, params |
155 | 155 | |
156 | - if(!empty($matches[1][$index])) |
|
156 | + if (!empty($matches[1][$index])) |
|
157 | 157 | { |
158 | 158 | $name = $matches[1][$index]; |
159 | 159 | } |
160 | - else if(!empty($matches[2][$index])) |
|
160 | + else if (!empty($matches[2][$index])) |
|
161 | 161 | { |
162 | 162 | $name = $matches[2][$index]; |
163 | 163 | $params = $matches[3][$index]; |
164 | 164 | } |
165 | - else if(!empty($matches[4][$index])) |
|
165 | + else if (!empty($matches[4][$index])) |
|
166 | 166 | { |
167 | 167 | $name = $matches[4][$index]; |
168 | 168 | $type = $matches[5][$index]; |
@@ -28,14 +28,14 @@ discard block |
||
28 | 28 | '{\s*([a-z]+)\s+([a-z-]+)\s*:([^}]*)}' |
29 | 29 | ); |
30 | 30 | |
31 | - /** |
|
32 | - * @var Mailcode |
|
33 | - */ |
|
31 | + /** |
|
32 | + * @var Mailcode |
|
33 | + */ |
|
34 | 34 | protected $mailcode; |
35 | 35 | |
36 | - /** |
|
37 | - * @var Mailcode_Commands |
|
38 | - */ |
|
36 | + /** |
|
37 | + * @var Mailcode_Commands |
|
38 | + */ |
|
39 | 39 | protected $commands; |
40 | 40 | |
41 | 41 | public function __construct(Mailcode $mailcode) |
@@ -44,24 +44,24 @@ discard block |
||
44 | 44 | $this->commands = $this->mailcode->getCommands(); |
45 | 45 | } |
46 | 46 | |
47 | - /** |
|
48 | - * Gets the regex format string used to detect commands. |
|
49 | - * |
|
50 | - * @return string |
|
51 | - */ |
|
47 | + /** |
|
48 | + * Gets the regex format string used to detect commands. |
|
49 | + * |
|
50 | + * @return string |
|
51 | + */ |
|
52 | 52 | protected static function getRegex() : string |
53 | 53 | { |
54 | 54 | return '/'.implode('|', self::COMMAND_REGEX_PARTS).'/sixU'; |
55 | 55 | } |
56 | 56 | |
57 | - /** |
|
58 | - * Parses a string to detect all commands within. Returns a |
|
59 | - * collection instance that contains information on all the |
|
60 | - * commands. |
|
61 | - * |
|
62 | - * @param string $string |
|
63 | - * @return Mailcode_Collection A collection with all unique commands found. |
|
64 | - */ |
|
57 | + /** |
|
58 | + * Parses a string to detect all commands within. Returns a |
|
59 | + * collection instance that contains information on all the |
|
60 | + * commands. |
|
61 | + * |
|
62 | + * @param string $string |
|
63 | + * @return Mailcode_Collection A collection with all unique commands found. |
|
64 | + */ |
|
65 | 65 | public function parseString(string $string) : Mailcode_Collection |
66 | 66 | { |
67 | 67 | $collection = new Mailcode_Collection(); |
@@ -94,14 +94,14 @@ discard block |
||
94 | 94 | return preg_replace('%<style\b[^>]*>(.*?)</style>%six', '', $subject); |
95 | 95 | } |
96 | 96 | |
97 | - /** |
|
98 | - * Processes a single match found in the string: creates the command, |
|
99 | - * and adds it to the collection if it's a valid command, or to the list |
|
100 | - * of invalid commands otherwise. |
|
101 | - * |
|
102 | - * @param Mailcode_Parser_Match $match |
|
103 | - * @param Mailcode_Collection $collection |
|
104 | - */ |
|
97 | + /** |
|
98 | + * Processes a single match found in the string: creates the command, |
|
99 | + * and adds it to the collection if it's a valid command, or to the list |
|
100 | + * of invalid commands otherwise. |
|
101 | + * |
|
102 | + * @param Mailcode_Parser_Match $match |
|
103 | + * @param Mailcode_Collection $collection |
|
104 | + */ |
|
105 | 105 | protected function processMatch(Mailcode_Parser_Match $match, Mailcode_Collection $collection) : void |
106 | 106 | { |
107 | 107 | $name = $match->getName(); |
@@ -132,14 +132,14 @@ discard block |
||
132 | 132 | $collection->addInvalidCommand($cmd); |
133 | 133 | } |
134 | 134 | |
135 | - /** |
|
136 | - * Parses a single regex match: determines which named group |
|
137 | - * matches, and retrieves the according information. |
|
138 | - * |
|
139 | - * @param array[] $matches The regex results array. |
|
140 | - * @param int $index The matched index. |
|
141 | - * @return Mailcode_Parser_Match |
|
142 | - */ |
|
135 | + /** |
|
136 | + * Parses a single regex match: determines which named group |
|
137 | + * matches, and retrieves the according information. |
|
138 | + * |
|
139 | + * @param array[] $matches The regex results array. |
|
140 | + * @param int $index The matched index. |
|
141 | + * @return Mailcode_Parser_Match |
|
142 | + */ |
|
143 | 143 | protected function parseMatch(array $matches, int $index) : Mailcode_Parser_Match |
144 | 144 | { |
145 | 145 | $name = ''; // the command name, e.g. "showvar" |
@@ -177,26 +177,26 @@ discard block |
||
177 | 177 | ); |
178 | 178 | } |
179 | 179 | |
180 | - /** |
|
181 | - * Creates an instance of the safeguard tool, which |
|
182 | - * is used to safeguard commands in a string with placeholders. |
|
183 | - * |
|
184 | - * @param string $subject The string to use to safeguard commands in. |
|
185 | - * @return Mailcode_Parser_Safeguard |
|
186 | - * @see Mailcode_Parser_Safeguard |
|
187 | - */ |
|
180 | + /** |
|
181 | + * Creates an instance of the safeguard tool, which |
|
182 | + * is used to safeguard commands in a string with placeholders. |
|
183 | + * |
|
184 | + * @param string $subject The string to use to safeguard commands in. |
|
185 | + * @return Mailcode_Parser_Safeguard |
|
186 | + * @see Mailcode_Parser_Safeguard |
|
187 | + */ |
|
188 | 188 | public function createSafeguard(string $subject) : Mailcode_Parser_Safeguard |
189 | 189 | { |
190 | 190 | return new Mailcode_Parser_Safeguard($this, $subject); |
191 | 191 | } |
192 | 192 | |
193 | - /** |
|
194 | - * Creates a statement parser, which is used to validate arbitrary |
|
195 | - * command statements. |
|
196 | - * |
|
197 | - * @param string $statement |
|
198 | - * @return Mailcode_Parser_Statement |
|
199 | - */ |
|
193 | + /** |
|
194 | + * Creates a statement parser, which is used to validate arbitrary |
|
195 | + * command statements. |
|
196 | + * |
|
197 | + * @param string $statement |
|
198 | + * @return Mailcode_Parser_Statement |
|
199 | + */ |
|
200 | 200 | public function createStatement(string $statement) : Mailcode_Parser_Statement |
201 | 201 | { |
202 | 202 | return new Mailcode_Parser_Statement($statement); |
@@ -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); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection |
34 | 34 | { |
35 | - if(!$variable->isValid()) |
|
35 | + if (!$variable->isValid()) |
|
36 | 36 | { |
37 | 37 | return $this->addInvalid($variable); |
38 | 38 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | parent::mergeWith($collection); |
77 | 77 | |
78 | 78 | // also inherit any invalid variables |
79 | - if($collection instanceof Mailcode_Variables_Collection_Regular) |
|
79 | + if ($collection instanceof Mailcode_Variables_Collection_Regular) |
|
80 | 80 | { |
81 | 81 | $invalid = $collection->getInvalid(); |
82 | 82 |
@@ -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 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | */ |
24 | 24 | function init() : void |
25 | 25 | { |
26 | - if(!class_exists('\AppLocalize\Localization')) { |
|
26 | + if (!class_exists('\AppLocalize\Localization')) { |
|
27 | 27 | return; |
28 | 28 | } |
29 | 29 |
@@ -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 |
@@ -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) : void |
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,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_Type[] |
|
44 | - */ |
|
42 | + /** |
|
43 | + * @var Mailcode_Commands_Command_Type[] |
|
44 | + */ |
|
45 | 45 | protected $stack = array(); |
46 | 46 | |
47 | 47 | public function __construct(Mailcode_Collection $collection) |
@@ -62,7 +62,7 @@ |
||
62 | 62 | $keyword = $info->getKeywordByIndex(1); |
63 | 63 | $container = $info->getVariableByIndex(2); |
64 | 64 | |
65 | - if($variable && $keyword && $container && $keyword->isForIn()) |
|
65 | + if ($variable && $keyword && $container && $keyword->isForIn()) |
|
66 | 66 | { |
67 | 67 | return; |
68 | 68 | } |