@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * @param mixed $subject |
37 | 37 | * @param Mailcode_Commands_Command|null $sourceCommand |
38 | 38 | */ |
39 | - public function __construct(string $tokenID, string $matchedText, $subject=null, ?Mailcode_Commands_Command $sourceCommand=null) |
|
39 | + public function __construct(string $tokenID, string $matchedText, $subject = null, ?Mailcode_Commands_Command $sourceCommand = null) |
|
40 | 40 | { |
41 | 41 | $this->tokenID = $tokenID; |
42 | 42 | $this->matchedText = $matchedText; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | */ |
64 | 64 | public function getName() : string |
65 | 65 | { |
66 | - if(isset($this->nameToken)) { |
|
66 | + if (isset($this->nameToken)) { |
|
67 | 67 | return $this->nameToken->getParamName(); |
68 | 68 | } |
69 | 69 |
@@ -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 |
@@ -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 |
@@ -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 | } |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | { |
53 | 53 | $this->parts[] = $this->renderTag(array('command-name'), $this->command->getName()); |
54 | 54 | |
55 | - if($this->command->hasType()) |
|
55 | + if ($this->command->hasType()) |
|
56 | 56 | { |
57 | 57 | $this->parts[] = ' '.$this->renderTag(array('command-type'), $this->command->getType()); |
58 | 58 | } |
59 | 59 | |
60 | - if($this->command->requiresParameters()) |
|
60 | + if ($this->command->requiresParameters()) |
|
61 | 61 | { |
62 | 62 | $this->parts[] = $this->renderTag(array('hyphen'), ':'); |
63 | 63 | $this->parts[] = '<wbr>'; |
@@ -68,14 +68,14 @@ discard block |
||
68 | 68 | { |
69 | 69 | $params = $command->getParams(); |
70 | 70 | |
71 | - if($params === null) |
|
71 | + if ($params === null) |
|
72 | 72 | { |
73 | 73 | return; |
74 | 74 | } |
75 | 75 | |
76 | 76 | $tokens = $params->getInfo()->getTokens(); |
77 | 77 | |
78 | - if(!empty($tokens)) |
|
78 | + if (!empty($tokens)) |
|
79 | 79 | { |
80 | 80 | $this->parts[] = ' '; |
81 | 81 | $this->parts[] = '<span class="mailcode-params">'; |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | } |
92 | 92 | } |
93 | 93 | |
94 | - protected function appendParamToken(Mailcode_Parser_Statement_Tokenizer_Token $token, ?Mailcode_Parser_Statement_Tokenizer_Token $previous=null) : void |
|
94 | + protected function appendParamToken(Mailcode_Parser_Statement_Tokenizer_Token $token, ?Mailcode_Parser_Statement_Tokenizer_Token $previous = null) : void |
|
95 | 95 | { |
96 | - if($previous && $previous->hasSpacing()) { |
|
96 | + if ($previous && $previous->hasSpacing()) { |
|
97 | 97 | $this->parts[] = ' '; |
98 | 98 | } |
99 | 99 | |
@@ -102,14 +102,14 @@ discard block |
||
102 | 102 | |
103 | 103 | protected function appendLogicKeywords() : void |
104 | 104 | { |
105 | - if(!$this->command->supportsLogicKeywords()) |
|
105 | + if (!$this->command->supportsLogicKeywords()) |
|
106 | 106 | { |
107 | 107 | return; |
108 | 108 | } |
109 | 109 | |
110 | 110 | $keywords = $this->command->getLogicKeywords()->getKeywords(); |
111 | 111 | |
112 | - foreach($keywords as $keyword) |
|
112 | + foreach ($keywords as $keyword) |
|
113 | 113 | { |
114 | 114 | $this->appendLogicKeyword($keyword); |
115 | 115 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | $type = $keyword->getType(); |
123 | 123 | |
124 | - if(!empty($type)) |
|
124 | + if (!empty($type)) |
|
125 | 125 | { |
126 | 126 | $this->parts[] = ' '.$this->renderTag(array('command-type'), $type); |
127 | 127 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | { |
141 | 141 | $parts = array(); |
142 | 142 | |
143 | - foreach($classes as $class) |
|
143 | + foreach ($classes as $class) |
|
144 | 144 | { |
145 | 145 | $parts[] = 'mailcode-'.$class; |
146 | 146 | } |
@@ -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 | } |