@@ -22,24 +22,24 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | class Mailcode_Parser_Safeguard_Restorer |
| 24 | 24 | { |
| 25 | - /** |
|
| 26 | - * @var Mailcode_Parser_Safeguard |
|
| 27 | - */ |
|
| 25 | + /** |
|
| 26 | + * @var Mailcode_Parser_Safeguard |
|
| 27 | + */ |
|
| 28 | 28 | private $safeguard; |
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * @var bool |
|
| 32 | - */ |
|
| 30 | + /** |
|
| 31 | + * @var bool |
|
| 32 | + */ |
|
| 33 | 33 | private $highlighted; |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @var bool |
|
| 37 | - */ |
|
| 35 | + /** |
|
| 36 | + * @var bool |
|
| 37 | + */ |
|
| 38 | 38 | private $normalize; |
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * @var array<string,string> |
|
| 42 | - */ |
|
| 40 | + /** |
|
| 41 | + * @var array<string,string> |
|
| 42 | + */ |
|
| 43 | 43 | private $replaces = array(); |
| 44 | 44 | |
| 45 | 45 | public function __construct(Mailcode_Parser_Safeguard $safeguard, bool $highlighted, bool $normalize) |
@@ -49,9 +49,9 @@ discard block |
||
| 49 | 49 | $this->normalize = $normalize; |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @return array<string,string> |
|
| 54 | - */ |
|
| 52 | + /** |
|
| 53 | + * @return array<string,string> |
|
| 54 | + */ |
|
| 55 | 55 | public function getReplaces() : array |
| 56 | 56 | { |
| 57 | 57 | $placeholders = $this->safeguard->getPlaceholders(); |
@@ -74,12 +74,10 @@ |
||
| 74 | 74 | if($this->highlighted) |
| 75 | 75 | { |
| 76 | 76 | $replace = $this->processPlaceholder_highlighted($placeholder, $needle); |
| 77 | - } |
|
| 78 | - else if($this->normalize) |
|
| 77 | + } else if($this->normalize) |
|
| 79 | 78 | { |
| 80 | 79 | $replace = $placeholder->getNormalizedText(); |
| 81 | - } |
|
| 82 | - else |
|
| 80 | + } else |
|
| 83 | 81 | { |
| 84 | 82 | $replace = $placeholder->getOriginalText(); |
| 85 | 83 | } |
@@ -61,50 +61,50 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | const ERROR_NOT_A_SINGLE_LINES_FORMATTER = 47806; |
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * @var Mailcode_Parser |
|
| 66 | - */ |
|
| 64 | + /** |
|
| 65 | + * @var Mailcode_Parser |
|
| 66 | + */ |
|
| 67 | 67 | protected $parser; |
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * @var Mailcode_Collection |
|
| 71 | - */ |
|
| 69 | + /** |
|
| 70 | + * @var Mailcode_Collection |
|
| 71 | + */ |
|
| 72 | 72 | protected $commands; |
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * @var string |
|
| 76 | - */ |
|
| 74 | + /** |
|
| 75 | + * @var string |
|
| 76 | + */ |
|
| 77 | 77 | protected $originalString; |
| 78 | 78 | |
| 79 | - /** |
|
| 80 | - * @var Mailcode_Collection |
|
| 81 | - */ |
|
| 79 | + /** |
|
| 80 | + * @var Mailcode_Collection |
|
| 81 | + */ |
|
| 82 | 82 | protected $collection; |
| 83 | 83 | |
| 84 | - /** |
|
| 85 | - * Counter for the placeholders, global for all placeholders. |
|
| 86 | - * @var integer |
|
| 87 | - */ |
|
| 84 | + /** |
|
| 85 | + * Counter for the placeholders, global for all placeholders. |
|
| 86 | + * @var integer |
|
| 87 | + */ |
|
| 88 | 88 | private static $counter = 0; |
| 89 | 89 | |
| 90 | - /** |
|
| 91 | - * @var Mailcode_Parser_Safeguard_Placeholder[] |
|
| 92 | - */ |
|
| 90 | + /** |
|
| 91 | + * @var Mailcode_Parser_Safeguard_Placeholder[] |
|
| 92 | + */ |
|
| 93 | 93 | protected $placeholders; |
| 94 | 94 | |
| 95 | - /** |
|
| 96 | - * @var string |
|
| 97 | - */ |
|
| 95 | + /** |
|
| 96 | + * @var string |
|
| 97 | + */ |
|
| 98 | 98 | protected $delimiter = '__'; |
| 99 | 99 | |
| 100 | - /** |
|
| 101 | - * @var string[]|NULL |
|
| 102 | - */ |
|
| 100 | + /** |
|
| 101 | + * @var string[]|NULL |
|
| 102 | + */ |
|
| 103 | 103 | protected $placeholderStrings; |
| 104 | 104 | |
| 105 | - /** |
|
| 106 | - * @var Mailcode_Parser_Safeguard_Formatter |
|
| 107 | - */ |
|
| 105 | + /** |
|
| 106 | + * @var Mailcode_Parser_Safeguard_Formatter |
|
| 107 | + */ |
|
| 108 | 108 | protected $formatter; |
| 109 | 109 | |
| 110 | 110 | public function __construct(Mailcode_Parser $parser, string $subject) |
@@ -113,25 +113,25 @@ discard block |
||
| 113 | 113 | $this->originalString = $subject; |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | - /** |
|
| 117 | - * Retrieves the string the safeguard was created for. |
|
| 118 | - * |
|
| 119 | - * @return string |
|
| 120 | - */ |
|
| 116 | + /** |
|
| 117 | + * Retrieves the string the safeguard was created for. |
|
| 118 | + * |
|
| 119 | + * @return string |
|
| 120 | + */ |
|
| 121 | 121 | public function getOriginalString() : string |
| 122 | 122 | { |
| 123 | 123 | return $this->originalString; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - /** |
|
| 127 | - * Sets the delimiter character sequence used to prepend |
|
| 128 | - * and append to the placeholders. |
|
| 129 | - * |
|
| 130 | - * The delimiter's default is "__" (two underscores). |
|
| 131 | - * |
|
| 132 | - * @param string $delimiter |
|
| 133 | - * @return Mailcode_Parser_Safeguard |
|
| 134 | - */ |
|
| 126 | + /** |
|
| 127 | + * Sets the delimiter character sequence used to prepend |
|
| 128 | + * and append to the placeholders. |
|
| 129 | + * |
|
| 130 | + * The delimiter's default is "__" (two underscores). |
|
| 131 | + * |
|
| 132 | + * @param string $delimiter |
|
| 133 | + * @return Mailcode_Parser_Safeguard |
|
| 134 | + */ |
|
| 135 | 135 | public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard |
| 136 | 136 | { |
| 137 | 137 | if(empty($delimiter)) |
@@ -153,15 +153,15 @@ discard block |
||
| 153 | 153 | return $this->delimiter; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - /** |
|
| 157 | - * Retrieves the safe string in which all commands have been replaced |
|
| 158 | - * by placeholder strings. |
|
| 159 | - * |
|
| 160 | - * @return string |
|
| 161 | - * @throws Mailcode_Exception |
|
| 162 | - * |
|
| 163 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 164 | - */ |
|
| 156 | + /** |
|
| 157 | + * Retrieves the safe string in which all commands have been replaced |
|
| 158 | + * by placeholder strings. |
|
| 159 | + * |
|
| 160 | + * @return string |
|
| 161 | + * @throws Mailcode_Exception |
|
| 162 | + * |
|
| 163 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 164 | + */ |
|
| 165 | 165 | public function makeSafe() : string |
| 166 | 166 | { |
| 167 | 167 | $this->requireValidCollection(); |
@@ -169,16 +169,16 @@ discard block |
||
| 169 | 169 | return $this->makeSafePartial(); |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | - /** |
|
| 173 | - * Like makeSafe(), but allows partial (invalid) commands: use this |
|
| 174 | - * if the subject string may contain only part of the whole set of |
|
| 175 | - * commands. |
|
| 176 | - * |
|
| 177 | - * Example: parsing a text with an opening if statement, without the |
|
| 178 | - * matching end statement. |
|
| 179 | - * |
|
| 180 | - * @return string |
|
| 181 | - */ |
|
| 172 | + /** |
|
| 173 | + * Like makeSafe(), but allows partial (invalid) commands: use this |
|
| 174 | + * if the subject string may contain only part of the whole set of |
|
| 175 | + * commands. |
|
| 176 | + * |
|
| 177 | + * Example: parsing a text with an opening if statement, without the |
|
| 178 | + * matching end statement. |
|
| 179 | + * |
|
| 180 | + * @return string |
|
| 181 | + */ |
|
| 182 | 182 | public function makeSafePartial() : string |
| 183 | 183 | { |
| 184 | 184 | $replaces = $this->getReplaces(); |
@@ -233,10 +233,10 @@ discard block |
||
| 233 | 233 | throw $this->exceptionWrongFormatter(Mailcode_Parser_Safeguard_Formatter_HTMLHighlighting::class); |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | - /** |
|
| 237 | - * Enables the formatter that ensures that all commands that |
|
| 238 | - * @return Mailcode_Parser_Safeguard_Formatter_SingleLines |
|
| 239 | - */ |
|
| 236 | + /** |
|
| 237 | + * Enables the formatter that ensures that all commands that |
|
| 238 | + * @return Mailcode_Parser_Safeguard_Formatter_SingleLines |
|
| 239 | + */ |
|
| 240 | 240 | public function selectSingleLinesFormatter() : Mailcode_Parser_Safeguard_Formatter_SingleLines |
| 241 | 241 | { |
| 242 | 242 | $formatter = $this->selectFormatter('SingleLines'); |
@@ -261,25 +261,25 @@ discard block |
||
| 261 | 261 | ); |
| 262 | 262 | } |
| 263 | 263 | |
| 264 | - /** |
|
| 265 | - * Retrieves an associative array with pairs of |
|
| 266 | - * [placeholder string => replacement text]. |
|
| 267 | - * |
|
| 268 | - * @param bool $highlighted |
|
| 269 | - * @return string[]string |
|
| 270 | - */ |
|
| 264 | + /** |
|
| 265 | + * Retrieves an associative array with pairs of |
|
| 266 | + * [placeholder string => replacement text]. |
|
| 267 | + * |
|
| 268 | + * @param bool $highlighted |
|
| 269 | + * @return string[]string |
|
| 270 | + */ |
|
| 271 | 271 | protected function getReplaces(bool $highlighted=false, bool $normalize=false) : array |
| 272 | 272 | { |
| 273 | 273 | $restorer = new Mailcode_Parser_Safeguard_Restorer($this, $highlighted, $normalize); |
| 274 | 274 | return $restorer->getReplaces(); |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | - /** |
|
| 278 | - * Retrieves all placeholders that have to be added to |
|
| 279 | - * the subject text. |
|
| 280 | - * |
|
| 281 | - * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[] |
|
| 282 | - */ |
|
| 277 | + /** |
|
| 278 | + * Retrieves all placeholders that have to be added to |
|
| 279 | + * the subject text. |
|
| 280 | + * |
|
| 281 | + * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[] |
|
| 282 | + */ |
|
| 283 | 283 | public function getPlaceholders() |
| 284 | 284 | { |
| 285 | 285 | if(isset($this->placeholders)) |
@@ -334,17 +334,17 @@ discard block |
||
| 334 | 334 | return str_replace($placeholderStrings, array_values($replaces), $string); |
| 335 | 335 | } |
| 336 | 336 | |
| 337 | - /** |
|
| 338 | - * Makes the string whole again after transforming or filtering it, |
|
| 339 | - * by replacing the command placeholders with the original commands. |
|
| 340 | - * |
|
| 341 | - * @param string $string |
|
| 342 | - * @return string |
|
| 343 | - * @throws Mailcode_Exception |
|
| 344 | - * |
|
| 345 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 346 | - * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
| 347 | - */ |
|
| 337 | + /** |
|
| 338 | + * Makes the string whole again after transforming or filtering it, |
|
| 339 | + * by replacing the command placeholders with the original commands. |
|
| 340 | + * |
|
| 341 | + * @param string $string |
|
| 342 | + * @return string |
|
| 343 | + * @throws Mailcode_Exception |
|
| 344 | + * |
|
| 345 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 346 | + * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
| 347 | + */ |
|
| 348 | 348 | public function makeWhole(string $string) : string |
| 349 | 349 | { |
| 350 | 350 | return $this->restore( |
@@ -354,15 +354,15 @@ discard block |
||
| 354 | 354 | ); |
| 355 | 355 | } |
| 356 | 356 | |
| 357 | - /** |
|
| 358 | - * Like `makeWhole()`, but ignores missing command placeholders. |
|
| 359 | - * |
|
| 360 | - * @param string $string |
|
| 361 | - * @return string |
|
| 362 | - * @throws Mailcode_Exception |
|
| 363 | - * |
|
| 364 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 365 | - */ |
|
| 357 | + /** |
|
| 358 | + * Like `makeWhole()`, but ignores missing command placeholders. |
|
| 359 | + * |
|
| 360 | + * @param string $string |
|
| 361 | + * @return string |
|
| 362 | + * @throws Mailcode_Exception |
|
| 363 | + * |
|
| 364 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 365 | + */ |
|
| 366 | 366 | public function makeWholePartial(string $string) : string |
| 367 | 367 | { |
| 368 | 368 | return $this->restore( |
@@ -372,20 +372,20 @@ discard block |
||
| 372 | 372 | ); |
| 373 | 373 | } |
| 374 | 374 | |
| 375 | - /** |
|
| 376 | - * Like `makeWhole()`, but replaces the commands with a syntax |
|
| 377 | - * highlighted version, meant for human readable texts only. |
|
| 378 | - * |
|
| 379 | - * Note: the commands lose their functionality (They cannot be |
|
| 380 | - * parsed from that string again). |
|
| 381 | - * |
|
| 382 | - * @param string $string |
|
| 383 | - * @return string |
|
| 384 | - * @throws Mailcode_Exception |
|
| 385 | - * |
|
| 386 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 387 | - * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
| 388 | - */ |
|
| 375 | + /** |
|
| 376 | + * Like `makeWhole()`, but replaces the commands with a syntax |
|
| 377 | + * highlighted version, meant for human readable texts only. |
|
| 378 | + * |
|
| 379 | + * Note: the commands lose their functionality (They cannot be |
|
| 380 | + * parsed from that string again). |
|
| 381 | + * |
|
| 382 | + * @param string $string |
|
| 383 | + * @return string |
|
| 384 | + * @throws Mailcode_Exception |
|
| 385 | + * |
|
| 386 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 387 | + * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING |
|
| 388 | + */ |
|
| 389 | 389 | public function makeHighlighted(string $string) : string |
| 390 | 390 | { |
| 391 | 391 | return $this->restore( |
@@ -395,15 +395,15 @@ discard block |
||
| 395 | 395 | ); |
| 396 | 396 | } |
| 397 | 397 | |
| 398 | - /** |
|
| 399 | - * Like `makeHighlighted()`, but ignores missing command placeholders. |
|
| 400 | - * |
|
| 401 | - * @param string $string |
|
| 402 | - * @return string |
|
| 403 | - * @throws Mailcode_Exception |
|
| 404 | - * |
|
| 405 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 406 | - */ |
|
| 398 | + /** |
|
| 399 | + * Like `makeHighlighted()`, but ignores missing command placeholders. |
|
| 400 | + * |
|
| 401 | + * @param string $string |
|
| 402 | + * @return string |
|
| 403 | + * @throws Mailcode_Exception |
|
| 404 | + * |
|
| 405 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 406 | + */ |
|
| 407 | 407 | public function makeHighlightedPartial(string $string) : string |
| 408 | 408 | { |
| 409 | 409 | return $this->restore( |
@@ -413,11 +413,11 @@ discard block |
||
| 413 | 413 | ); |
| 414 | 414 | } |
| 415 | 415 | |
| 416 | - /** |
|
| 417 | - * Retrieves the commands collection contained in the string. |
|
| 418 | - * |
|
| 419 | - * @return Mailcode_Collection |
|
| 420 | - */ |
|
| 416 | + /** |
|
| 417 | + * Retrieves the commands collection contained in the string. |
|
| 418 | + * |
|
| 419 | + * @return Mailcode_Collection |
|
| 420 | + */ |
|
| 421 | 421 | public function getCollection() : Mailcode_Collection |
| 422 | 422 | { |
| 423 | 423 | if(isset($this->collection)) |
@@ -435,11 +435,11 @@ discard block |
||
| 435 | 435 | return $this->getCollection()->isValid(); |
| 436 | 436 | } |
| 437 | 437 | |
| 438 | - /** |
|
| 439 | - * @throws Mailcode_Exception |
|
| 440 | - * |
|
| 441 | - * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 442 | - */ |
|
| 438 | + /** |
|
| 439 | + * @throws Mailcode_Exception |
|
| 440 | + * |
|
| 441 | + * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS |
|
| 442 | + */ |
|
| 443 | 443 | protected function requireValidCollection() : void |
| 444 | 444 | { |
| 445 | 445 | if($this->getCollection()->isValid()) |
@@ -458,11 +458,11 @@ discard block |
||
| 458 | 458 | ); |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | - /** |
|
| 462 | - * Retrieves a list of all placeholder IDs used in the text. |
|
| 463 | - * |
|
| 464 | - * @return string[] |
|
| 465 | - */ |
|
| 461 | + /** |
|
| 462 | + * Retrieves a list of all placeholder IDs used in the text. |
|
| 463 | + * |
|
| 464 | + * @return string[] |
|
| 465 | + */ |
|
| 466 | 466 | public function getPlaceholderStrings() : array |
| 467 | 467 | { |
| 468 | 468 | if(is_array($this->placeholderStrings)) |
@@ -489,13 +489,13 @@ discard block |
||
| 489 | 489 | return in_array($subject, $ids); |
| 490 | 490 | } |
| 491 | 491 | |
| 492 | - /** |
|
| 493 | - * Retrieves a placeholder instance by its ID. |
|
| 494 | - * |
|
| 495 | - * @param int $id |
|
| 496 | - * @throws Mailcode_Exception If the placeholder was not found. |
|
| 497 | - * @return Mailcode_Parser_Safeguard_Placeholder |
|
| 498 | - */ |
|
| 492 | + /** |
|
| 493 | + * Retrieves a placeholder instance by its ID. |
|
| 494 | + * |
|
| 495 | + * @param int $id |
|
| 496 | + * @throws Mailcode_Exception If the placeholder was not found. |
|
| 497 | + * @return Mailcode_Parser_Safeguard_Placeholder |
|
| 498 | + */ |
|
| 499 | 499 | public function getPlaceholderByID(int $id) : Mailcode_Parser_Safeguard_Placeholder |
| 500 | 500 | { |
| 501 | 501 | $placeholders = $this->getPlaceholders(); |
@@ -518,13 +518,13 @@ discard block |
||
| 518 | 518 | ); |
| 519 | 519 | } |
| 520 | 520 | |
| 521 | - /** |
|
| 522 | - * Retrieves a placeholder instance by its replacement text. |
|
| 523 | - * |
|
| 524 | - * @param string $string |
|
| 525 | - * @throws Mailcode_Exception |
|
| 526 | - * @return Mailcode_Parser_Safeguard_Placeholder |
|
| 527 | - */ |
|
| 521 | + /** |
|
| 522 | + * Retrieves a placeholder instance by its replacement text. |
|
| 523 | + * |
|
| 524 | + * @param string $string |
|
| 525 | + * @throws Mailcode_Exception |
|
| 526 | + * @return Mailcode_Parser_Safeguard_Placeholder |
|
| 527 | + */ |
|
| 528 | 528 | public function getPlaceholderByString(string $string) : Mailcode_Parser_Safeguard_Placeholder |
| 529 | 529 | { |
| 530 | 530 | $placeholders = $this->getPlaceholders(); |