@@ -12,7 +12,7 @@ |
||
12 | 12 | { |
13 | 13 | $next = $this->tokensTemporary[$i + 1] ?? null; |
14 | 14 | |
15 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_ParamName && $next) { |
|
15 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_ParamName && $next) { |
|
16 | 16 | $next->registerNameToken($token); |
17 | 17 | } |
18 | 18 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | $matches = array(); |
12 | 12 | preg_match_all('/([a-z][a-z0-9-]+)\s*=/iU', $this->tokenized, $matches, PREG_PATTERN_ORDER); |
13 | 13 | |
14 | - foreach($matches[0] as $match) |
|
14 | + foreach ($matches[0] as $match) |
|
15 | 15 | { |
16 | 16 | $this->registerToken('ParamName', $match); |
17 | 17 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | ->getInfo() |
45 | 45 | ->getTokenByParamName(CountInterface::PARAMETER_NAME); |
46 | 46 | |
47 | - if($token === null) |
|
47 | + if ($token === null) |
|
48 | 48 | { |
49 | 49 | $this->countEnabled = false; |
50 | 50 | return; |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | } |
58 | 58 | |
59 | 59 | $this->validationResult->makeError( |
60 | - t('Invalid count subject:') . ' ' . t('Expected a variable.'), |
|
60 | + t('Invalid count subject:').' '.t('Expected a variable.'), |
|
61 | 61 | CountInterface::VALIDATION_COUNT_CODE_WRONG_TYPE |
62 | 62 | ); |
63 | 63 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | public function getCountVariable(): ?Mailcode_Variables_Variable |
71 | 71 | { |
72 | - if($this->countToken !== null) |
|
72 | + if ($this->countToken !== null) |
|
73 | 73 | { |
74 | 74 | return $this->countToken->getVariable(); |
75 | 75 | } |
@@ -88,15 +88,15 @@ discard block |
||
88 | 88 | |
89 | 89 | $info = $this->requireParams()->getInfo(); |
90 | 90 | |
91 | - if(isset($this->countToken)) { |
|
91 | + if (isset($this->countToken)) { |
|
92 | 92 | $info->removeToken($this->countToken); |
93 | 93 | } |
94 | 94 | |
95 | - if(is_string($variable)) { |
|
95 | + if (is_string($variable)) { |
|
96 | 96 | $variable = Mailcode_Factory::var()->fullName($variable); |
97 | 97 | } |
98 | 98 | |
99 | - if($variable !== null) { |
|
99 | + if ($variable !== null) { |
|
100 | 100 | $this->countEnabled = true; |
101 | 101 | $this->countToken = $info->addVariable($variable); |
102 | 102 | $info->setParamName($this->countToken, CountInterface::PARAMETER_NAME); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | ->getInfo() |
48 | 48 | ->getTokenByParamName(BreakAtInterface::PARAMETER_NAME); |
49 | 49 | |
50 | - if($this->breakAtToken === null) { |
|
50 | + if ($this->breakAtToken === null) { |
|
51 | 51 | $this->breakAtEnabled = false; |
52 | 52 | return; |
53 | 53 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | if (!$this->breakAtToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number && |
56 | 56 | !$this->breakAtToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) { |
57 | 57 | $this->validationResult->makeError( |
58 | - t('Invalid break-at value:') . ' ' . t('Expected a number or variable.'), |
|
58 | + t('Invalid break-at value:').' '.t('Expected a number or variable.'), |
|
59 | 59 | BreakAtInterface::VALIDATION_BREAK_AT_CODE_WRONG_TYPE |
60 | 60 | ); |
61 | 61 | return; |
@@ -80,19 +80,19 @@ discard block |
||
80 | 80 | public function getBreakAt() |
81 | 81 | { |
82 | 82 | $token = $this->getBreakAtToken(); |
83 | - if($token === null) { |
|
83 | + if ($token === null) { |
|
84 | 84 | return null; |
85 | 85 | } |
86 | 86 | |
87 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) { |
|
87 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) { |
|
88 | 88 | return $token->getVariable(); |
89 | 89 | } |
90 | 90 | |
91 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number) { |
|
91 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number) { |
|
92 | 92 | return (int)$token->getValue(); |
93 | 93 | } |
94 | 94 | |
95 | - if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) { |
|
95 | + if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) { |
|
96 | 96 | return (int)$token->getText(); |
97 | 97 | } |
98 | 98 | |
@@ -109,29 +109,29 @@ discard block |
||
109 | 109 | { |
110 | 110 | $info = $this->requireParams()->getInfo(); |
111 | 111 | |
112 | - if(isset($this->breakAtToken)) { |
|
112 | + if (isset($this->breakAtToken)) { |
|
113 | 113 | $info->removeToken($this->breakAtToken); |
114 | 114 | } |
115 | 115 | |
116 | 116 | $this->breakAtEnabled = false; |
117 | 117 | $this->breakAtToken = null; |
118 | 118 | |
119 | - if($breakAt === null) { |
|
119 | + if ($breakAt === null) { |
|
120 | 120 | return $this; |
121 | 121 | } |
122 | 122 | |
123 | 123 | $token = null; |
124 | 124 | |
125 | - if(is_numeric($breakAt)) |
|
125 | + if (is_numeric($breakAt)) |
|
126 | 126 | { |
127 | 127 | $token = $info->addNumber((string)(int)$breakAt); |
128 | 128 | } |
129 | - else if($breakAt instanceof Mailcode_Variables_Variable) |
|
129 | + else if ($breakAt instanceof Mailcode_Variables_Variable) |
|
130 | 130 | { |
131 | 131 | $token = $info->addVariable($breakAt); |
132 | 132 | } |
133 | 133 | |
134 | - if($token !== null) |
|
134 | + if ($token !== null) |
|
135 | 135 | { |
136 | 136 | $info->setParamName($token, BreakAtInterface::PARAMETER_NAME); |
137 | 137 |
@@ -125,8 +125,7 @@ |
||
125 | 125 | if(is_numeric($breakAt)) |
126 | 126 | { |
127 | 127 | $token = $info->addNumber((string)(int)$breakAt); |
128 | - } |
|
129 | - else if($breakAt instanceof Mailcode_Variables_Variable) |
|
128 | + } else if($breakAt instanceof Mailcode_Variables_Variable) |
|
130 | 129 | { |
131 | 130 | $token = $info->addVariable($breakAt); |
132 | 131 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | if (!$this->timezoneToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral && |
48 | 48 | !$this->timezoneToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) { |
49 | 49 | $this->validationResult->makeError( |
50 | - t('Invalid timezone:') . ' ' . t('Expected a string or variable.'), |
|
50 | + t('Invalid timezone:').' '.t('Expected a string or variable.'), |
|
51 | 51 | TimezoneInterface::VALIDATION_TIMEZONE_CODE_WRONG_TYPE |
52 | 52 | ); |
53 | 53 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function getTimezoneToken(): Mailcode_Parser_Statement_Tokenizer_Token |
64 | 64 | { |
65 | - if(!isset($this->timezoneToken)) { |
|
65 | + if (!isset($this->timezoneToken)) { |
|
66 | 66 | $this->timezoneToken = $this->createTimeZoneToken(); |
67 | 67 | } |
68 | 68 | |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $default = Mailcode_Commands_Command_ShowDate::getDefaultTimezone(); |
80 | 80 | $info = $this->requireParams()->getInfo(); |
81 | 81 | |
82 | - if($default instanceof Mailcode_Variables_Variable) { |
|
82 | + if ($default instanceof Mailcode_Variables_Variable) { |
|
83 | 83 | $token = $info->addVariable($default); |
84 | 84 | } else { |
85 | 85 | $token = $info->addStringLiteral($default); |
@@ -100,17 +100,17 @@ discard block |
||
100 | 100 | $token = null; |
101 | 101 | |
102 | 102 | $existing = $info->getTokenByParamName(TimezoneInterface::PARAMETER_NAME); |
103 | - if($existing) { |
|
103 | + if ($existing) { |
|
104 | 104 | $info->removeToken($existing); |
105 | 105 | } |
106 | 106 | |
107 | - if($timezone instanceof Mailcode_Variables_Variable) { |
|
107 | + if ($timezone instanceof Mailcode_Variables_Variable) { |
|
108 | 108 | $token = $info->addVariable($timezone); |
109 | - } else if(is_string($timezone)) { |
|
109 | + } else if (is_string($timezone)) { |
|
110 | 110 | $token = $info->addStringLiteral($timezone); |
111 | 111 | } |
112 | 112 | |
113 | - if($token !== null) { |
|
113 | + if ($token !== null) { |
|
114 | 114 | $info->setParamName($token, TimezoneInterface::PARAMETER_NAME); |
115 | 115 | } |
116 | 116 |
@@ -23,25 +23,25 @@ discard block |
||
23 | 23 | */ |
24 | 24 | trait Mailcode_Traits_Formatting_HTMLHighlighting |
25 | 25 | { |
26 | - /** |
|
27 | - * Stored this way, so we can use isset() instead |
|
28 | - * of using in_array, which is some magnitudes slower. |
|
29 | - * The boolean value is not used otherwise. |
|
30 | - * |
|
31 | - * @var array<string,bool> |
|
32 | - */ |
|
26 | + /** |
|
27 | + * Stored this way, so we can use isset() instead |
|
28 | + * of using in_array, which is some magnitudes slower. |
|
29 | + * The boolean value is not used otherwise. |
|
30 | + * |
|
31 | + * @var array<string,bool> |
|
32 | + */ |
|
33 | 33 | private array $excludeTags = array( |
34 | 34 | 'style' => true, // NOTE: style tags are excluded natively on the parser level. |
35 | 35 | 'script' => true |
36 | 36 | ); |
37 | 37 | |
38 | - /** |
|
39 | - * Adds an HTML tag name to the list of tags within which |
|
40 | - * commands may not be highlighted. |
|
41 | - * |
|
42 | - * @param string $tagName Case-insensitive. |
|
43 | - * @return $this |
|
44 | - */ |
|
38 | + /** |
|
39 | + * Adds an HTML tag name to the list of tags within which |
|
40 | + * commands may not be highlighted. |
|
41 | + * |
|
42 | + * @param string $tagName Case-insensitive. |
|
43 | + * @return $this |
|
44 | + */ |
|
45 | 45 | public function excludeTag(string $tagName) : self |
46 | 46 | { |
47 | 47 | $tagName = strtolower($tagName); |
@@ -51,12 +51,12 @@ discard block |
||
51 | 51 | return $this; |
52 | 52 | } |
53 | 53 | |
54 | - /** |
|
55 | - * Adds several excluded tag names at once. |
|
56 | - * |
|
57 | - * @param string[] $tagNames |
|
58 | - * @return $this |
|
59 | - */ |
|
54 | + /** |
|
55 | + * Adds several excluded tag names at once. |
|
56 | + * |
|
57 | + * @param string[] $tagNames |
|
58 | + * @return $this |
|
59 | + */ |
|
60 | 60 | public function excludeTags(array $tagNames) : self |
61 | 61 | { |
62 | 62 | foreach($tagNames as $tagName) |
@@ -67,12 +67,12 @@ discard block |
||
67 | 67 | return $this; |
68 | 68 | } |
69 | 69 | |
70 | - /** |
|
71 | - * Whether the specified tag name is in the exclusion list. |
|
72 | - * |
|
73 | - * @param string $tagName |
|
74 | - * @return bool |
|
75 | - */ |
|
70 | + /** |
|
71 | + * Whether the specified tag name is in the exclusion list. |
|
72 | + * |
|
73 | + * @param string $tagName |
|
74 | + * @return bool |
|
75 | + */ |
|
76 | 76 | public function isTagExcluded(string $tagName) : bool |
77 | 77 | { |
78 | 78 | $tagName = strtolower($tagName); |
@@ -59,7 +59,7 @@ |
||
59 | 59 | */ |
60 | 60 | public function excludeTags(array $tagNames) : self |
61 | 61 | { |
62 | - foreach($tagNames as $tagName) |
|
62 | + foreach ($tagNames as $tagName) |
|
63 | 63 | { |
64 | 64 | $this->excludeTag((string)$tagName); |
65 | 65 | } |
@@ -36,8 +36,7 @@ discard block |
||
36 | 36 | $safeguard = $mailcode->createSafeguard($commandsText); |
37 | 37 | $safe = htmlspecialchars($safeguard->makeSafe(), ENT_QUOTES, 'UTF-8'); |
38 | 38 | $highlighted = $safeguard->makeHighlighted($safe); |
39 | - } |
|
40 | - catch (Mailcode_Exception $e) |
|
39 | + } catch (Mailcode_Exception $e) |
|
41 | 40 | { |
42 | 41 | $error = $e->getMessage(); |
43 | 42 | |
@@ -99,8 +98,7 @@ discard block |
||
99 | 98 | <?php pt('No commands specified.') ?> |
100 | 99 | </div> |
101 | 100 | <?php |
102 | - } |
|
103 | - else if($error) |
|
101 | + } else if($error) |
|
104 | 102 | { |
105 | 103 | ?> |
106 | 104 | <div class="alert alert-danger"> |
@@ -108,8 +106,7 @@ discard block |
||
108 | 106 | <?php echo $error ?> |
109 | 107 | </div> |
110 | 108 | <?php |
111 | - } |
|
112 | - else |
|
109 | + } else |
|
113 | 110 | { |
114 | 111 | ?> |
115 | 112 | <pre style="border: solid 1px #ccc;padding:12px;border-radius: 5px"><?php |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | use Mailcode\Mailcode_Exception; |
17 | 17 | use Mailcode\Mailcode_Translator_Exception; |
18 | 18 | use function \AppLocalize\pt; |
19 | -use function \AppLocalize\pts;use function AppLocalize\t; |
|
19 | +use function \AppLocalize\pts; use function AppLocalize\t; |
|
20 | 20 | |
21 | 21 | require_once 'prepend.php'; |
22 | 22 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $error = null; |
29 | 29 | $highlighted = ''; |
30 | 30 | |
31 | -if($request->getBool('highlight')) |
|
31 | +if ($request->getBool('highlight')) |
|
32 | 32 | { |
33 | 33 | $commandsText = $request->registerParam('mailcode')->getString(); |
34 | 34 | |
@@ -43,13 +43,13 @@ discard block |
||
43 | 43 | $error = $e->getMessage(); |
44 | 44 | |
45 | 45 | $collection = $e->getCollection(); |
46 | - if($collection) |
|
46 | + if ($collection) |
|
47 | 47 | { |
48 | 48 | $first = $collection->getFirstError(); |
49 | 49 | $error = $first->getMessage(); |
50 | 50 | $matched = $first->getMatchedText(); |
51 | - if(!empty($matched)) { |
|
52 | - $error .= '<br>'. t('In command:').' <code>'.$matched.'</code>'; |
|
51 | + if (!empty($matched)) { |
|
52 | + $error .= '<br>'.t('In command:').' <code>'.$matched.'</code>'; |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | <p></p><br> |
94 | 94 | <h2><?php pt('Highlighted commands') ?></h2> |
95 | 95 | <?php |
96 | - if(empty($commandsText)) |
|
96 | + if (empty($commandsText)) |
|
97 | 97 | { |
98 | 98 | ?> |
99 | 99 | <div class="alert alert-info"> |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | </div> |
102 | 102 | <?php |
103 | 103 | } |
104 | - else if($error) |
|
104 | + else if ($error) |
|
105 | 105 | { |
106 | 106 | ?> |
107 | 107 | <div class="alert alert-danger"> |
@@ -32,34 +32,34 @@ |
||
32 | 32 | public const VALIDATION_ERROR_PATH_UNDERSCORE = 48203; |
33 | 33 | public const VALIDATION_ERROR_NAME_UNDERSCORE = 48204; |
34 | 34 | |
35 | - /** |
|
36 | - * @var string |
|
37 | - */ |
|
35 | + /** |
|
36 | + * @var string |
|
37 | + */ |
|
38 | 38 | protected string $path; |
39 | 39 | |
40 | - /** |
|
41 | - * @var string |
|
42 | - */ |
|
40 | + /** |
|
41 | + * @var string |
|
42 | + */ |
|
43 | 43 | protected string $name; |
44 | 44 | |
45 | - /** |
|
46 | - * @var string |
|
47 | - */ |
|
45 | + /** |
|
46 | + * @var string |
|
47 | + */ |
|
48 | 48 | protected string $matchedText; |
49 | 49 | |
50 | - /** |
|
51 | - * @var string |
|
52 | - */ |
|
50 | + /** |
|
51 | + * @var string |
|
52 | + */ |
|
53 | 53 | protected string $hash = ''; |
54 | 54 | |
55 | - /** |
|
56 | - * @var OperationResult|NULL |
|
57 | - */ |
|
55 | + /** |
|
56 | + * @var OperationResult|NULL |
|
57 | + */ |
|
58 | 58 | protected ?OperationResult $validationResult = null; |
59 | 59 | |
60 | - /** |
|
61 | - * @var array<string> |
|
62 | - */ |
|
60 | + /** |
|
61 | + * @var array<string> |
|
62 | + */ |
|
63 | 63 | protected array $validations = array( |
64 | 64 | 'number_path', |
65 | 65 | 'number_name', |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | */ |
73 | 73 | private ?Mailcode_Commands_Command $command; |
74 | 74 | |
75 | - public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) |
|
75 | + public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) |
|
76 | 76 | { |
77 | 77 | $this->path = $path; |
78 | 78 | $this->name = $name; |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | public function getFullName() : string |
97 | 97 | { |
98 | - if(empty($this->path)) |
|
98 | + if (empty($this->path)) |
|
99 | 99 | { |
100 | 100 | return dollarize($this->name); |
101 | 101 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function getUniqueName() : string |
115 | 115 | { |
116 | - if(isset($this->command)) |
|
116 | + if (isset($this->command)) |
|
117 | 117 | { |
118 | 118 | return $this->getFullName().'/'.$this->command->getHash(); |
119 | 119 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | |
139 | 139 | public function getHash() : string |
140 | 140 | { |
141 | - if(empty($this->hash)) |
|
141 | + if (empty($this->hash)) |
|
142 | 142 | { |
143 | 143 | $this->hash = md5($this->matchedText); |
144 | 144 | } |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | */ |
158 | 158 | public function getValidationResult() : OperationResult |
159 | 159 | { |
160 | - if(isset($this->validationResult)) |
|
160 | + if (isset($this->validationResult)) |
|
161 | 161 | { |
162 | 162 | return $this->validationResult; |
163 | 163 | } |
@@ -171,11 +171,11 @@ discard block |
||
171 | 171 | |
172 | 172 | protected function validate(OperationResult $result) : void |
173 | 173 | { |
174 | - foreach($this->validations as $validation) |
|
174 | + foreach ($this->validations as $validation) |
|
175 | 175 | { |
176 | 176 | $method = 'validate_'.$validation; |
177 | 177 | |
178 | - if(!method_exists($this, $method)) |
|
178 | + if (!method_exists($this, $method)) |
|
179 | 179 | { |
180 | 180 | throw new Mailcode_Exception( |
181 | 181 | 'Unknown validation method', |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | |
226 | 226 | protected function validateNumber(string $value, int $errorCode) : void |
227 | 227 | { |
228 | - if(empty($value) || !is_numeric($value[0])) |
|
228 | + if (empty($value) || !is_numeric($value[0])) |
|
229 | 229 | { |
230 | 230 | return; |
231 | 231 | } |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | protected function validateUnderscore(string $value, int $errorCode) : void |
244 | 244 | { |
245 | 245 | // allow empty paths |
246 | - if(empty($value)) |
|
246 | + if (empty($value)) |
|
247 | 247 | { |
248 | 248 | return; |
249 | 249 | } |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | $length = strlen($value); |
252 | 252 | |
253 | 253 | // trimming underscores does not change the length: no underscores at start or end of string. |
254 | - if(strlen(trim($value, '_')) === $length) |
|
254 | + if (strlen(trim($value, '_')) === $length) |
|
255 | 255 | { |
256 | 256 | return; |
257 | 257 | } |
@@ -40,7 +40,7 @@ |
||
40 | 40 | */ |
41 | 41 | public function getDecryptionKeyToken(): ?Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral; |
42 | 42 | |
43 | - public function enableDecryption(string $keyName=DecryptInterface::DEFAULT_DECRYPTION_KEY_NAME) : self; |
|
43 | + public function enableDecryption(string $keyName = DecryptInterface::DEFAULT_DECRYPTION_KEY_NAME) : self; |
|
44 | 44 | |
45 | 45 | public function disableDecryption() : self; |
46 | 46 | public function isDecryptionEnabled() : bool; |