@@ -26,51 +26,51 @@ 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 | - * @var Mailcode_Translator|NULL |
|
| 46 | - */ |
|
| 44 | + /** |
|
| 45 | + * @var Mailcode_Translator|NULL |
|
| 46 | + */ |
|
| 47 | 47 | protected $translator = null; |
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * Creates a new mailcode instance. |
|
| 51 | - * @return Mailcode |
|
| 52 | - */ |
|
| 49 | + /** |
|
| 50 | + * Creates a new mailcode instance. |
|
| 51 | + * @return Mailcode |
|
| 52 | + */ |
|
| 53 | 53 | public static function create() : Mailcode |
| 54 | 54 | { |
| 55 | 55 | return new Mailcode(); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * Parses the string to detect all commands contained within. |
|
| 60 | - * |
|
| 61 | - * @param string $string |
|
| 62 | - * @return Mailcode_Collection |
|
| 63 | - */ |
|
| 58 | + /** |
|
| 59 | + * Parses the string to detect all commands contained within. |
|
| 60 | + * |
|
| 61 | + * @param string $string |
|
| 62 | + * @return Mailcode_Collection |
|
| 63 | + */ |
|
| 64 | 64 | public function parseString(string $string) : Mailcode_Collection |
| 65 | 65 | { |
| 66 | 66 | return $this->getParser()->parseString($string); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * Retrieves the string parser instance used to detect commands. |
|
| 71 | - * |
|
| 72 | - * @return Mailcode_Parser |
|
| 73 | - */ |
|
| 69 | + /** |
|
| 70 | + * Retrieves the string parser instance used to detect commands. |
|
| 71 | + * |
|
| 72 | + * @return Mailcode_Parser |
|
| 73 | + */ |
|
| 74 | 74 | public function getParser() : Mailcode_Parser |
| 75 | 75 | { |
| 76 | 76 | if(!isset($this->parser)) |
@@ -81,12 +81,12 @@ discard block |
||
| 81 | 81 | return $this->parser; |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - /** |
|
| 85 | - * Retrieves the commands collection, which is used to |
|
| 86 | - * access information on the available commands. |
|
| 87 | - * |
|
| 88 | - * @return Mailcode_Commands |
|
| 89 | - */ |
|
| 84 | + /** |
|
| 85 | + * Retrieves the commands collection, which is used to |
|
| 86 | + * access information on the available commands. |
|
| 87 | + * |
|
| 88 | + * @return Mailcode_Commands |
|
| 89 | + */ |
|
| 90 | 90 | public function getCommands() : Mailcode_Commands |
| 91 | 91 | { |
| 92 | 92 | if(!isset($this->commands)) |
@@ -102,12 +102,12 @@ discard block |
||
| 102 | 102 | return $this->getParser()->createSafeguard($subject); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - /** |
|
| 106 | - * Attempts to find all variables in the target string. |
|
| 107 | - * |
|
| 108 | - * @param string $subject |
|
| 109 | - * @return Mailcode_Variables_Collection_Regular |
|
| 110 | - */ |
|
| 105 | + /** |
|
| 106 | + * Attempts to find all variables in the target string. |
|
| 107 | + * |
|
| 108 | + * @param string $subject |
|
| 109 | + * @return Mailcode_Variables_Collection_Regular |
|
| 110 | + */ |
|
| 111 | 111 | public function findVariables(string $subject) : Mailcode_Variables_Collection_Regular |
| 112 | 112 | { |
| 113 | 113 | return $this->createVariables()->parseString($subject); |
@@ -123,12 +123,12 @@ discard block |
||
| 123 | 123 | return $this->variables; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - /** |
|
| 127 | - * Creates the translator, which can be used to convert commands |
|
| 128 | - * to another supported syntax. |
|
| 129 | - * |
|
| 130 | - * @return Mailcode_Translator |
|
| 131 | - */ |
|
| 126 | + /** |
|
| 127 | + * Creates the translator, which can be used to convert commands |
|
| 128 | + * to another supported syntax. |
|
| 129 | + * |
|
| 130 | + * @return Mailcode_Translator |
|
| 131 | + */ |
|
| 132 | 132 | public function createTranslator() : Mailcode_Translator |
| 133 | 133 | { |
| 134 | 134 | if(!isset($this->translator)) |
@@ -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); |
@@ -29,24 +29,24 @@ 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 | - /** |
|
| 43 | - * @var Mailcode_Parser_Statement_Tokenizer|NULL |
|
| 44 | - */ |
|
| 42 | + /** |
|
| 43 | + * @var Mailcode_Parser_Statement_Tokenizer|NULL |
|
| 44 | + */ |
|
| 45 | 45 | protected $tokenizer; |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @var Mailcode_Parser_Statement_Info|NULL |
|
| 49 | - */ |
|
| 47 | + /** |
|
| 48 | + * @var Mailcode_Parser_Statement_Info|NULL |
|
| 49 | + */ |
|
| 50 | 50 | protected $info; |
| 51 | 51 | |
| 52 | 52 | public function __construct(string $statement) |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | if($unknown) |
| 103 | 103 | { |
| 104 | 104 | $this->result->makeError( |
| 105 | - t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')', |
|
| 105 | + t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')', |
|
| 106 | 106 | self::VALIDATION_UNQUOTED_STRING_LITERALS |
| 107 | 107 | ); |
| 108 | 108 | } |
@@ -57,45 +57,45 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | const ERROR_PLACEHOLDER_NOT_FOUND = 47804; |
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * @var Mailcode_Parser |
|
| 62 | - */ |
|
| 60 | + /** |
|
| 61 | + * @var Mailcode_Parser |
|
| 62 | + */ |
|
| 63 | 63 | protected $parser; |
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * @var Mailcode_Collection |
|
| 67 | - */ |
|
| 65 | + /** |
|
| 66 | + * @var Mailcode_Collection |
|
| 67 | + */ |
|
| 68 | 68 | protected $commands; |
| 69 | 69 | |
| 70 | - /** |
|
| 71 | - * @var string |
|
| 72 | - */ |
|
| 70 | + /** |
|
| 71 | + * @var string |
|
| 72 | + */ |
|
| 73 | 73 | protected $originalString; |
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * @var Mailcode_Collection |
|
| 77 | - */ |
|
| 75 | + /** |
|
| 76 | + * @var Mailcode_Collection |
|
| 77 | + */ |
|
| 78 | 78 | protected $collection; |
| 79 | 79 | |
| 80 | - /** |
|
| 81 | - * Counter for the placeholders, global for all placeholders. |
|
| 82 | - * @var integer |
|
| 83 | - */ |
|
| 80 | + /** |
|
| 81 | + * Counter for the placeholders, global for all placeholders. |
|
| 82 | + * @var integer |
|
| 83 | + */ |
|
| 84 | 84 | private static $counter = 0; |
| 85 | 85 | |
| 86 | - /** |
|
| 87 | - * @var Mailcode_Parser_Safeguard_Placeholder[] |
|
| 88 | - */ |
|
| 86 | + /** |
|
| 87 | + * @var Mailcode_Parser_Safeguard_Placeholder[] |
|
| 88 | + */ |
|
| 89 | 89 | protected $placeholders; |
| 90 | 90 | |
| 91 | - /** |
|
| 92 | - * @var string |
|
| 93 | - */ |
|
| 91 | + /** |
|
| 92 | + * @var string |
|
| 93 | + */ |
|
| 94 | 94 | protected $delimiter = '__'; |
| 95 | 95 | |
| 96 | - /** |
|
| 97 | - * @var string[]|NULL |
|
| 98 | - */ |
|
| 96 | + /** |
|
| 97 | + * @var string[]|NULL |
|
| 98 | + */ |
|
| 99 | 99 | protected $placeholderStrings; |
| 100 | 100 | |
| 101 | 101 | public function __construct(Mailcode_Parser $parser, string $subject) |
@@ -104,25 +104,25 @@ discard block |
||
| 104 | 104 | $this->originalString = $subject; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - /** |
|
| 108 | - * Retrieves the string the safeguard was created for. |
|
| 109 | - * |
|
| 110 | - * @return string |
|
| 111 | - */ |
|
| 107 | + /** |
|
| 108 | + * Retrieves the string the safeguard was created for. |
|
| 109 | + * |
|
| 110 | + * @return string |
|
| 111 | + */ |
|
| 112 | 112 | public function getOriginalString() : string |
| 113 | 113 | { |
| 114 | 114 | return $this->originalString; |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - /** |
|
| 118 | - * Sets the delimiter character sequence used to prepend |
|
| 119 | - * and append to the placeholders. |
|
| 120 | - * |
|
| 121 | - * The delimiter's default is "__" (two underscores). |
|
| 122 | - * |
|
| 123 | - * @param string $delimiter |
|
| 124 | - * @return Mailcode_Parser_Safeguard |
|
| 125 | - */ |
|
| 117 | + /** |
|
| 118 | + * Sets the delimiter character sequence used to prepend |
|
| 119 | + * and append to the placeholders. |
|
| 120 | + * |
|
| 121 | + * The delimiter's default is "__" (two underscores). |
|
| 122 | + * |
|
| 123 | + * @param string $delimiter |
|
| 124 | + * @return Mailcode_Parser_Safeguard |
|
| 125 | + */ |
|
| 126 | 126 | public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard |
| 127 | 127 | { |
| 128 | 128 | if(empty($delimiter)) |
@@ -144,15 +144,15 @@ discard block |
||
| 144 | 144 | return $this->delimiter; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - /** |
|
| 148 | - * Retrieves the safe string in which all commands have been replaced |
|
| 149 | - * by placeholder strings. |
|
| 150 | - * |
|
| 151 | - * @return string |
|
| 152 | - * @throws Mailcode_Exception |
|
| 153 | - * |
|
| 154 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 155 | - */ |
|
| 147 | + /** |
|
| 148 | + * Retrieves the safe string in which all commands have been replaced |
|
| 149 | + * by placeholder strings. |
|
| 150 | + * |
|
| 151 | + * @return string |
|
| 152 | + * @throws Mailcode_Exception |
|
| 153 | + * |
|
| 154 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 155 | + */ |
|
| 156 | 156 | public function makeSafe() : string |
| 157 | 157 | { |
| 158 | 158 | $this->requireValidCollection(); |
@@ -162,10 +162,10 @@ discard block |
||
| 162 | 162 | return str_replace(array_values($replaces), array_keys($replaces), $this->originalString); |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - /** |
|
| 166 | - * @param bool $highlighted |
|
| 167 | - * @return string[]string |
|
| 168 | - */ |
|
| 165 | + /** |
|
| 166 | + * @param bool $highlighted |
|
| 167 | + * @return string[]string |
|
| 168 | + */ |
|
| 169 | 169 | protected function getReplaces(bool $highlighted=false) : array |
| 170 | 170 | { |
| 171 | 171 | $placeholders = $this->getPlaceholders(); |
@@ -192,12 +192,12 @@ discard block |
||
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | |
| 195 | - /** |
|
| 196 | - * Retrieves all placeholders that have to be added to |
|
| 197 | - * the subject text. |
|
| 198 | - * |
|
| 199 | - * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[] |
|
| 200 | - */ |
|
| 195 | + /** |
|
| 196 | + * Retrieves all placeholders that have to be added to |
|
| 197 | + * the subject text. |
|
| 198 | + * |
|
| 199 | + * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[] |
|
| 200 | + */ |
|
| 201 | 201 | public function getPlaceholders() |
| 202 | 202 | { |
| 203 | 203 | if(isset($this->placeholders)) |
@@ -249,46 +249,46 @@ discard block |
||
| 249 | 249 | return str_replace($placeholderStrings, array_values($replaces), $string); |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | - /** |
|
| 253 | - * Makes the string whole again after transforming or filtering it, |
|
| 254 | - * by replacing the command placeholders with the original commands. |
|
| 255 | - * |
|
| 256 | - * @param string $string |
|
| 257 | - * @return string |
|
| 258 | - * @throws Mailcode_Exception |
|
| 259 | - * |
|
| 260 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 261 | - * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
| 262 | - */ |
|
| 252 | + /** |
|
| 253 | + * Makes the string whole again after transforming or filtering it, |
|
| 254 | + * by replacing the command placeholders with the original commands. |
|
| 255 | + * |
|
| 256 | + * @param string $string |
|
| 257 | + * @return string |
|
| 258 | + * @throws Mailcode_Exception |
|
| 259 | + * |
|
| 260 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 261 | + * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
| 262 | + */ |
|
| 263 | 263 | public function makeWhole(string $string) : string |
| 264 | 264 | { |
| 265 | 265 | return $this->restore($string, false); |
| 266 | 266 | } |
| 267 | 267 | |
| 268 | - /** |
|
| 269 | - * Like makeWhole(), but replaces the commands with a syntax |
|
| 270 | - * highlighted version, meant for human readable texts only. |
|
| 271 | - * |
|
| 272 | - * Note: the commands lose their functionality (They cannot be |
|
| 273 | - * parsed from that string again). |
|
| 274 | - * |
|
| 275 | - * @param string $string |
|
| 276 | - * @return string |
|
| 277 | - * @throws Mailcode_Exception |
|
| 278 | - * |
|
| 279 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 280 | - * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
| 281 | - */ |
|
| 268 | + /** |
|
| 269 | + * Like makeWhole(), but replaces the commands with a syntax |
|
| 270 | + * highlighted version, meant for human readable texts only. |
|
| 271 | + * |
|
| 272 | + * Note: the commands lose their functionality (They cannot be |
|
| 273 | + * parsed from that string again). |
|
| 274 | + * |
|
| 275 | + * @param string $string |
|
| 276 | + * @return string |
|
| 277 | + * @throws Mailcode_Exception |
|
| 278 | + * |
|
| 279 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 280 | + * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
| 281 | + */ |
|
| 282 | 282 | public function makeHighlighted(string $string) : string |
| 283 | 283 | { |
| 284 | 284 | return $this->restore($string, true); |
| 285 | 285 | } |
| 286 | 286 | |
| 287 | - /** |
|
| 288 | - * Retrieves the commands collection contained in the string. |
|
| 289 | - * |
|
| 290 | - * @return Mailcode_Collection |
|
| 291 | - */ |
|
| 287 | + /** |
|
| 288 | + * Retrieves the commands collection contained in the string. |
|
| 289 | + * |
|
| 290 | + * @return Mailcode_Collection |
|
| 291 | + */ |
|
| 292 | 292 | public function getCollection() : Mailcode_Collection |
| 293 | 293 | { |
| 294 | 294 | if(isset($this->collection)) |
@@ -306,11 +306,11 @@ discard block |
||
| 306 | 306 | return $this->getCollection()->isValid(); |
| 307 | 307 | } |
| 308 | 308 | |
| 309 | - /** |
|
| 310 | - * @throws Mailcode_Exception |
|
| 311 | - * |
|
| 312 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 313 | - */ |
|
| 309 | + /** |
|
| 310 | + * @throws Mailcode_Exception |
|
| 311 | + * |
|
| 312 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 313 | + */ |
|
| 314 | 314 | protected function requireValidCollection() : void |
| 315 | 315 | { |
| 316 | 316 | if($this->getCollection()->isValid()) |
@@ -329,11 +329,11 @@ discard block |
||
| 329 | 329 | ); |
| 330 | 330 | } |
| 331 | 331 | |
| 332 | - /** |
|
| 333 | - * Retrieves a list of all placeholder IDs used in the text. |
|
| 334 | - * |
|
| 335 | - * @return string[] |
|
| 336 | - */ |
|
| 332 | + /** |
|
| 333 | + * Retrieves a list of all placeholder IDs used in the text. |
|
| 334 | + * |
|
| 335 | + * @return string[] |
|
| 336 | + */ |
|
| 337 | 337 | public function getPlaceholderStrings() : array |
| 338 | 338 | { |
| 339 | 339 | if(isset($this->placeholderStrings)) |
@@ -360,13 +360,13 @@ discard block |
||
| 360 | 360 | return in_array($subject, $ids); |
| 361 | 361 | } |
| 362 | 362 | |
| 363 | - /** |
|
| 364 | - * Retrieves a placeholder instance by its ID. |
|
| 365 | - * |
|
| 366 | - * @param int $id |
|
| 367 | - * @throws Mailcode_Exception If the placeholder was not found. |
|
| 368 | - * @return Mailcode_Parser_Safeguard_Placeholder |
|
| 369 | - */ |
|
| 363 | + /** |
|
| 364 | + * Retrieves a placeholder instance by its ID. |
|
| 365 | + * |
|
| 366 | + * @param int $id |
|
| 367 | + * @throws Mailcode_Exception If the placeholder was not found. |
|
| 368 | + * @return Mailcode_Parser_Safeguard_Placeholder |
|
| 369 | + */ |
|
| 370 | 370 | public function getPlaceholderByID(int $id) : Mailcode_Parser_Safeguard_Placeholder |
| 371 | 371 | { |
| 372 | 372 | $placeholders = $this->getPlaceholders(); |
@@ -389,13 +389,13 @@ discard block |
||
| 389 | 389 | ); |
| 390 | 390 | } |
| 391 | 391 | |
| 392 | - /** |
|
| 393 | - * Retrieves a placeholder instance by its replacement text. |
|
| 394 | - * |
|
| 395 | - * @param string $string |
|
| 396 | - * @throws Mailcode_Exception |
|
| 397 | - * @return Mailcode_Parser_Safeguard_Placeholder |
|
| 398 | - */ |
|
| 392 | + /** |
|
| 393 | + * Retrieves a placeholder instance by its replacement text. |
|
| 394 | + * |
|
| 395 | + * @param string $string |
|
| 396 | + * @throws Mailcode_Exception |
|
| 397 | + * @return Mailcode_Parser_Safeguard_Placeholder |
|
| 398 | + */ |
|
| 399 | 399 | public function getPlaceholderByString(string $string) : Mailcode_Parser_Safeguard_Placeholder |
| 400 | 400 | { |
| 401 | 401 | $placeholders = $this->getPlaceholders(); |
@@ -24,9 +24,9 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | const VALIDATION_VARIABLE_COUNT_MISMATCH = 52001; |
| 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 |
@@ -24,17 +24,17 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | const ERROR_UNEXPECTED_COMMAND_TYPE = 50002; |
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * @var Mailcode_Renderer |
|
| 29 | - */ |
|
| 27 | + /** |
|
| 28 | + * @var Mailcode_Renderer |
|
| 29 | + */ |
|
| 30 | 30 | protected static $renderer; |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * Creates a ShowVariable command. |
|
| 34 | - * |
|
| 35 | - * @param string $variableName A variable name, with or without the $ sign prepended. |
|
| 36 | - * @return Mailcode_Commands_Command_ShowVariable |
|
| 37 | - */ |
|
| 32 | + /** |
|
| 33 | + * Creates a ShowVariable command. |
|
| 34 | + * |
|
| 35 | + * @param string $variableName A variable name, with or without the $ sign prepended. |
|
| 36 | + * @return Mailcode_Commands_Command_ShowVariable |
|
| 37 | + */ |
|
| 38 | 38 | public static function showVar(string $variableName) : Mailcode_Commands_Command_ShowVariable |
| 39 | 39 | { |
| 40 | 40 | $variableName = self::_filterVariableName($variableName); |
@@ -50,12 +50,12 @@ discard block |
||
| 50 | 50 | return $cmd; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * Creates a ShowSnippet command. |
|
| 55 | - * |
|
| 56 | - * @param string $snippetName A snippet name, with or without the $ sign prepended. |
|
| 57 | - * @return Mailcode_Commands_Command_ShowSnippet |
|
| 58 | - */ |
|
| 53 | + /** |
|
| 54 | + * Creates a ShowSnippet command. |
|
| 55 | + * |
|
| 56 | + * @param string $snippetName A snippet name, with or without the $ sign prepended. |
|
| 57 | + * @return Mailcode_Commands_Command_ShowSnippet |
|
| 58 | + */ |
|
| 59 | 59 | public static function showSnippet(string $snippetName) : Mailcode_Commands_Command_ShowSnippet |
| 60 | 60 | { |
| 61 | 61 | $snippetName = self::_filterVariableName($snippetName); |
@@ -71,17 +71,17 @@ discard block |
||
| 71 | 71 | return $cmd; |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * Creates a SetVariable command. |
|
| 76 | - * |
|
| 77 | - * @param string $variableName A variable name, with or without the $ sign prepended. |
|
| 78 | - * @param string $value |
|
| 79 | - * @param bool $quoteValue Whether to treat the value as a string literal, and add quotes to it. |
|
| 80 | - * @return Mailcode_Commands_Command_SetVariable |
|
| 81 | - * @throws Mailcode_Factory_Exception |
|
| 82 | - * |
|
| 83 | - * @see Mailcode_Factory::ERROR_INVALID_COMMAND_CREATED |
|
| 84 | - */ |
|
| 74 | + /** |
|
| 75 | + * Creates a SetVariable command. |
|
| 76 | + * |
|
| 77 | + * @param string $variableName A variable name, with or without the $ sign prepended. |
|
| 78 | + * @param string $value |
|
| 79 | + * @param bool $quoteValue Whether to treat the value as a string literal, and add quotes to it. |
|
| 80 | + * @return Mailcode_Commands_Command_SetVariable |
|
| 81 | + * @throws Mailcode_Factory_Exception |
|
| 82 | + * |
|
| 83 | + * @see Mailcode_Factory::ERROR_INVALID_COMMAND_CREATED |
|
| 84 | + */ |
|
| 85 | 85 | public static function setVar(string $variableName, string $value, bool $quoteValue=true) : Mailcode_Commands_Command_SetVariable |
| 86 | 86 | { |
| 87 | 87 | $variableName = self::_filterVariableName($variableName); |
@@ -104,14 +104,14 @@ discard block |
||
| 104 | 104 | return $cmd; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - /** |
|
| 108 | - * Like setVar(), but treats the value as a string literal |
|
| 109 | - * and automatically adds quotes to it. |
|
| 110 | - * |
|
| 111 | - * @param string $variableName |
|
| 112 | - * @param string $value |
|
| 113 | - * @return Mailcode_Commands_Command_SetVariable |
|
| 114 | - */ |
|
| 107 | + /** |
|
| 108 | + * Like setVar(), but treats the value as a string literal |
|
| 109 | + * and automatically adds quotes to it. |
|
| 110 | + * |
|
| 111 | + * @param string $variableName |
|
| 112 | + * @param string $value |
|
| 113 | + * @return Mailcode_Commands_Command_SetVariable |
|
| 114 | + */ |
|
| 115 | 115 | public static function setVarString(string $variableName, string $value) : Mailcode_Commands_Command_SetVariable |
| 116 | 116 | { |
| 117 | 117 | return self::setVar($variableName, $value, true); |
@@ -378,12 +378,12 @@ discard block |
||
| 378 | 378 | return '$'.ltrim($name, '$'); |
| 379 | 379 | } |
| 380 | 380 | |
| 381 | - /** |
|
| 382 | - * Quotes a string literal: adds the quotes, and escapes any quotes already present in it. |
|
| 383 | - * |
|
| 384 | - * @param string $string |
|
| 385 | - * @return string |
|
| 386 | - */ |
|
| 381 | + /** |
|
| 382 | + * Quotes a string literal: adds the quotes, and escapes any quotes already present in it. |
|
| 383 | + * |
|
| 384 | + * @param string $string |
|
| 385 | + * @return string |
|
| 386 | + */ |
|
| 387 | 387 | protected static function _quoteString(string $string) : string |
| 388 | 388 | { |
| 389 | 389 | return '"'.str_replace('"', '\"', $string).'"'; |
@@ -416,23 +416,23 @@ discard block |
||
| 416 | 416 | ); |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | - /** |
|
| 420 | - * Creates a renderer instance, which can be used to easily |
|
| 421 | - * create and convert commands to strings. |
|
| 422 | - * |
|
| 423 | - * @return Mailcode_Renderer |
|
| 424 | - */ |
|
| 419 | + /** |
|
| 420 | + * Creates a renderer instance, which can be used to easily |
|
| 421 | + * create and convert commands to strings. |
|
| 422 | + * |
|
| 423 | + * @return Mailcode_Renderer |
|
| 424 | + */ |
|
| 425 | 425 | public static function createRenderer() : Mailcode_Renderer |
| 426 | 426 | { |
| 427 | 427 | return new Mailcode_Renderer(); |
| 428 | 428 | } |
| 429 | 429 | |
| 430 | - /** |
|
| 431 | - * Creates a printer instance, which works like the renderer, |
|
| 432 | - * but outputs the generated strings to standard output. |
|
| 433 | - * |
|
| 434 | - * @return Mailcode_Printer |
|
| 435 | - */ |
|
| 430 | + /** |
|
| 431 | + * Creates a printer instance, which works like the renderer, |
|
| 432 | + * but outputs the generated strings to standard output. |
|
| 433 | + * |
|
| 434 | + * @return Mailcode_Printer |
|
| 435 | + */ |
|
| 436 | 436 | public static function createPrinter() : Mailcode_Printer |
| 437 | 437 | { |
| 438 | 438 | return new Mailcode_Printer(); |
@@ -24,9 +24,9 @@ discard block |
||
| 24 | 24 | { |
| 25 | 25 | const ERROR_CANNOT_RETRIEVE_FIRST_ERROR = 52301; |
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * @var Mailcode_Commands_Command[] |
|
| 29 | - */ |
|
| 27 | + /** |
|
| 28 | + * @var Mailcode_Commands_Command[] |
|
| 29 | + */ |
|
| 30 | 30 | protected $commands = array(); |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -34,17 +34,17 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | protected $errors = array(); |
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @var OperationResult|NULL |
|
| 39 | - */ |
|
| 37 | + /** |
|
| 38 | + * @var OperationResult|NULL |
|
| 39 | + */ |
|
| 40 | 40 | protected $validationResult; |
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * Adds a command to the collection. |
|
| 44 | - * |
|
| 45 | - * @param Mailcode_Commands_Command $command |
|
| 46 | - * @return Mailcode_Collection |
|
| 47 | - */ |
|
| 42 | + /** |
|
| 43 | + * Adds a command to the collection. |
|
| 44 | + * |
|
| 45 | + * @param Mailcode_Commands_Command $command |
|
| 46 | + * @return Mailcode_Collection |
|
| 47 | + */ |
|
| 48 | 48 | public function addCommand(Mailcode_Commands_Command $command) : Mailcode_Collection |
| 49 | 49 | { |
| 50 | 50 | $this->commands[] = $command; |
@@ -56,21 +56,21 @@ discard block |
||
| 56 | 56 | return $this; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - /** |
|
| 60 | - * Whether there are any commands in the collection. |
|
| 61 | - * |
|
| 62 | - * @return bool |
|
| 63 | - */ |
|
| 59 | + /** |
|
| 60 | + * Whether there are any commands in the collection. |
|
| 61 | + * |
|
| 62 | + * @return bool |
|
| 63 | + */ |
|
| 64 | 64 | public function hasCommands() : bool |
| 65 | 65 | { |
| 66 | 66 | return !empty($this->commands); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * Counts the amount of commands in the collection. |
|
| 71 | - * |
|
| 72 | - * @return int |
|
| 73 | - */ |
|
| 69 | + /** |
|
| 70 | + * Counts the amount of commands in the collection. |
|
| 71 | + * |
|
| 72 | + * @return int |
|
| 73 | + */ |
|
| 74 | 74 | public function countCommands() : int |
| 75 | 75 | { |
| 76 | 76 | return count($this->commands); |
@@ -90,9 +90,9 @@ discard block |
||
| 90 | 90 | $this->errors[] = new Mailcode_Collection_Error_Command($command); |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - /** |
|
| 94 | - * @return Mailcode_Collection_Error[] |
|
| 95 | - */ |
|
| 93 | + /** |
|
| 94 | + * @return Mailcode_Collection_Error[] |
|
| 95 | + */ |
|
| 96 | 96 | public function getErrors() |
| 97 | 97 | { |
| 98 | 98 | $result = $this->getValidationResult(); |
@@ -134,25 +134,25 @@ discard block |
||
| 134 | 134 | return empty($errors); |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - /** |
|
| 138 | - * Retrieves all commands that were detected, in the exact order |
|
| 139 | - * they were found. |
|
| 140 | - * |
|
| 141 | - * @return \Mailcode\Mailcode_Commands_Command[] |
|
| 142 | - */ |
|
| 137 | + /** |
|
| 138 | + * Retrieves all commands that were detected, in the exact order |
|
| 139 | + * they were found. |
|
| 140 | + * |
|
| 141 | + * @return \Mailcode\Mailcode_Commands_Command[] |
|
| 142 | + */ |
|
| 143 | 143 | public function getCommands() |
| 144 | 144 | { |
| 145 | - return $this->commands; |
|
| 145 | + return $this->commands; |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - /** |
|
| 149 | - * Retrieves all unique commands by their matched |
|
| 150 | - * string hash: this ensures only commands that were |
|
| 151 | - * written the exact same way (including spacing) |
|
| 152 | - * are returned. |
|
| 153 | - * |
|
| 154 | - * @return \Mailcode\Mailcode_Commands_Command[] |
|
| 155 | - */ |
|
| 148 | + /** |
|
| 149 | + * Retrieves all unique commands by their matched |
|
| 150 | + * string hash: this ensures only commands that were |
|
| 151 | + * written the exact same way (including spacing) |
|
| 152 | + * are returned. |
|
| 153 | + * |
|
| 154 | + * @return \Mailcode\Mailcode_Commands_Command[] |
|
| 155 | + */ |
|
| 156 | 156 | public function getGroupedByHash() |
| 157 | 157 | { |
| 158 | 158 | $hashes = array(); |
@@ -170,12 +170,12 @@ discard block |
||
| 170 | 170 | return array_values($hashes); |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | - /** |
|
| 174 | - * Adds several commands at once. |
|
| 175 | - * |
|
| 176 | - * @param Mailcode_Commands_Command[] $commands |
|
| 177 | - * @return Mailcode_Collection |
|
| 178 | - */ |
|
| 173 | + /** |
|
| 174 | + * Adds several commands at once. |
|
| 175 | + * |
|
| 176 | + * @param Mailcode_Commands_Command[] $commands |
|
| 177 | + * @return Mailcode_Collection |
|
| 178 | + */ |
|
| 179 | 179 | public function addCommands(array $commands) : Mailcode_Collection |
| 180 | 180 | { |
| 181 | 181 | foreach($commands as $command) |
@@ -234,11 +234,11 @@ discard block |
||
| 234 | 234 | return false; |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - /** |
|
| 238 | - * Retrieves only show variable commands in the collection, if any. |
|
| 239 | - * |
|
| 240 | - * @return \Mailcode\Mailcode_Commands_Command_ShowVariable[] |
|
| 241 | - */ |
|
| 237 | + /** |
|
| 238 | + * Retrieves only show variable commands in the collection, if any. |
|
| 239 | + * |
|
| 240 | + * @return \Mailcode\Mailcode_Commands_Command_ShowVariable[] |
|
| 241 | + */ |
|
| 242 | 242 | public function getShowVariableCommands() |
| 243 | 243 | { |
| 244 | 244 | $result = array(); |