@@ -20,11 +20,11 @@ discard block |
||
20 | 20 | */ |
21 | 21 | class Mailcode_Factory_Instantiator |
22 | 22 | { |
23 | - public function buildIf(string $ifType, string $params, string $type='') : Mailcode_Commands_IfBase |
|
23 | + public function buildIf(string $ifType, string $params, string $type = '') : Mailcode_Commands_IfBase |
|
24 | 24 | { |
25 | 25 | $stringType = $type; |
26 | 26 | |
27 | - if(!empty($type)) |
|
27 | + if (!empty($type)) |
|
28 | 28 | { |
29 | 29 | $stringType = ' '.$type; |
30 | 30 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | $this->checkCommand($command); |
45 | 45 | |
46 | - if($command instanceof Mailcode_Commands_IfBase) |
|
46 | + if ($command instanceof Mailcode_Commands_IfBase) |
|
47 | 47 | { |
48 | 48 | return $command; |
49 | 49 | } |
@@ -51,9 +51,9 @@ discard block |
||
51 | 51 | throw $this->exceptionUnexpectedType('IfBase', $command); |
52 | 52 | } |
53 | 53 | |
54 | - public function buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_IfBase |
|
54 | + public function buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_IfBase |
|
55 | 55 | { |
56 | - if($quoteValue) |
|
56 | + if ($quoteValue) |
|
57 | 57 | { |
58 | 58 | $value = $this->quoteString($value); |
59 | 59 | } |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | * @return Mailcode_Commands_IfBase |
89 | 89 | * @throws Mailcode_Factory_Exception |
90 | 90 | */ |
91 | - public function buildIfContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false, string $containsType='contains') : Mailcode_Commands_IfBase |
|
91 | + public function buildIfContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false, string $containsType = 'contains') : Mailcode_Commands_IfBase |
|
92 | 92 | { |
93 | 93 | $condition = sprintf( |
94 | 94 | '%s%s"%s"', |
@@ -100,23 +100,23 @@ discard block |
||
100 | 100 | return $this->buildIf($ifType, $condition, $containsType); |
101 | 101 | } |
102 | 102 | |
103 | - private function renderListKeywords(bool $caseInsensitive=false, bool $regexEnabled=false) : string |
|
103 | + private function renderListKeywords(bool $caseInsensitive = false, bool $regexEnabled = false) : string |
|
104 | 104 | { |
105 | 105 | $keywords = array(); |
106 | 106 | |
107 | - if($caseInsensitive) |
|
107 | + if ($caseInsensitive) |
|
108 | 108 | { |
109 | 109 | $keywords[] = Mailcode_Commands_Keywords::TYPE_INSENSITIVE; |
110 | 110 | } |
111 | 111 | |
112 | - if($regexEnabled) |
|
112 | + if ($regexEnabled) |
|
113 | 113 | { |
114 | 114 | $keywords[] = Mailcode_Commands_Keywords::TYPE_REGEX; |
115 | 115 | } |
116 | 116 | |
117 | 117 | $keywordsString = ''; |
118 | 118 | |
119 | - if(!empty($keywords)) |
|
119 | + if (!empty($keywords)) |
|
120 | 120 | { |
121 | 121 | $keywordsString = ' '.implode(' ', $keywords); |
122 | 122 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * @return Mailcode_Commands_IfBase |
134 | 134 | * @throws Mailcode_Factory_Exception |
135 | 135 | */ |
136 | - public function buildIfNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_IfBase |
|
136 | + public function buildIfNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_IfBase |
|
137 | 137 | { |
138 | 138 | return $this->buildIfContains($ifType, $variable, $searchTerms, $caseInsensitive, $regexEnabled, 'not-contains'); |
139 | 139 | } |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | * @return Mailcode_Commands_IfBase |
149 | 149 | * @throws Mailcode_Factory_Exception |
150 | 150 | */ |
151 | - public function buildIfListContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false, string $containsType='list-contains') : Mailcode_Commands_IfBase |
|
151 | + public function buildIfListContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false, string $containsType = 'list-contains') : Mailcode_Commands_IfBase |
|
152 | 152 | { |
153 | 153 | return $this->buildIfContains($ifType, $variable, $searchTerms, $caseInsensitive, $regexEnabled, $containsType); |
154 | 154 | } |
@@ -162,17 +162,17 @@ discard block |
||
162 | 162 | * @return Mailcode_Commands_IfBase |
163 | 163 | * @throws Mailcode_Factory_Exception |
164 | 164 | */ |
165 | - public function buildIfListNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_IfBase |
|
165 | + public function buildIfListNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_IfBase |
|
166 | 166 | { |
167 | 167 | return $this->buildIfContains($ifType, $variable, $searchTerms, $caseInsensitive, $regexEnabled, 'list-not-contains'); |
168 | 168 | } |
169 | 169 | |
170 | - public function buildIfBeginsWith(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase |
|
170 | + public function buildIfBeginsWith(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase |
|
171 | 171 | { |
172 | 172 | return $this->buildIfSearch($ifType, 'begins-with', $variable, $search, $caseInsensitive); |
173 | 173 | } |
174 | 174 | |
175 | - public function buildIfEndsWith(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase |
|
175 | + public function buildIfEndsWith(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase |
|
176 | 176 | { |
177 | 177 | return $this->buildIfSearch($ifType, 'ends-with', $variable, $search, $caseInsensitive); |
178 | 178 | } |
@@ -222,11 +222,11 @@ discard block |
||
222 | 222 | ); |
223 | 223 | } |
224 | 224 | |
225 | - private function buildIfSearch(string $ifType, string $subType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase |
|
225 | + private function buildIfSearch(string $ifType, string $subType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase |
|
226 | 226 | { |
227 | 227 | $keyword = ' '; |
228 | 228 | |
229 | - if($caseInsensitive) |
|
229 | + if ($caseInsensitive) |
|
230 | 230 | { |
231 | 231 | $keyword = ' '.Mailcode_Commands_Keywords::TYPE_INSENSITIVE; |
232 | 232 | } |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | |
256 | 256 | public function checkCommand(Mailcode_Commands_Command $command) : void |
257 | 257 | { |
258 | - if($command->isValid()) |
|
258 | + if ($command->isValid()) |
|
259 | 259 | { |
260 | 260 | return; |
261 | 261 | } |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | */ |
278 | 278 | public function quoteString(string $string) : string |
279 | 279 | { |
280 | - if(substr($string, 0, 1) === '"' && substr($string, -1, 1) === '"') { |
|
280 | + if (substr($string, 0, 1) === '"' && substr($string, -1, 1) === '"') { |
|
281 | 281 | return $string; |
282 | 282 | } |
283 | 283 |
@@ -26,14 +26,14 @@ |
||
26 | 26 | */ |
27 | 27 | trait Mailcode_Traits_Commands_Validation_Multiline |
28 | 28 | { |
29 | - /** |
|
30 | - * @var boolean |
|
31 | - */ |
|
29 | + /** |
|
30 | + * @var boolean |
|
31 | + */ |
|
32 | 32 | protected $multiline = false; |
33 | 33 | |
34 | - /** |
|
35 | - * @var Mailcode_Parser_Statement_Tokenizer_Token_Keyword|NULL |
|
36 | - */ |
|
34 | + /** |
|
35 | + * @var Mailcode_Parser_Statement_Tokenizer_Token_Keyword|NULL |
|
36 | + */ |
|
37 | 37 | protected $multilineToken; |
38 | 38 | |
39 | 39 | protected function validateSyntax_multiline() : void |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | $this->multiline = $val->isValid(); |
44 | 44 | |
45 | - if($val->isValid()) |
|
45 | + if ($val->isValid()) |
|
46 | 46 | { |
47 | 47 | $this->multilineToken = $val->getToken(); |
48 | 48 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | public function getMultilineToken() : ?Mailcode_Parser_Statement_Tokenizer_Token_Keyword |
57 | 57 | { |
58 | - if($this->multilineToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
58 | + if ($this->multilineToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
59 | 59 | { |
60 | 60 | return $this->multilineToken; |
61 | 61 | } |
@@ -41,7 +41,7 @@ |
||
41 | 41 | $this |
42 | 42 | ); |
43 | 43 | |
44 | - if(!$this->params->isValid() && $this->requiresParameters()) |
|
44 | + if (!$this->params->isValid() && $this->requiresParameters()) |
|
45 | 45 | { |
46 | 46 | $error = $this->params->getValidationResult(); |
47 | 47 |
@@ -40,15 +40,15 @@ |
||
40 | 40 | { |
41 | 41 | $opening = $this->getOpeningCommand(); |
42 | 42 | |
43 | - if($opening === null) { |
|
43 | + if ($opening === null) { |
|
44 | 44 | return array(); |
45 | 45 | } |
46 | 46 | |
47 | 47 | $siblings = $opening->getSiblingCommands(); |
48 | 48 | $result = array(); |
49 | - foreach($siblings as $sibling) |
|
49 | + foreach ($siblings as $sibling) |
|
50 | 50 | { |
51 | - if($sibling !== $this) { |
|
51 | + if ($sibling !== $this) { |
|
52 | 52 | $result[] = $sibling; |
53 | 53 | } |
54 | 54 | } |
@@ -84,15 +84,15 @@ discard block |
||
84 | 84 | { |
85 | 85 | $literals = $this->params->getInfo()->getStringLiterals(); |
86 | 86 | |
87 | - if(empty($literals)) { |
|
87 | + if (empty($literals)) { |
|
88 | 88 | return; |
89 | 89 | } |
90 | 90 | |
91 | - foreach($literals as $literal) |
|
91 | + foreach ($literals as $literal) |
|
92 | 92 | { |
93 | 93 | $parts = ConvertHelper::explodeTrim(' ', $literal->getText()); |
94 | 94 | |
95 | - foreach($parts as $part) { |
|
95 | + foreach ($parts as $part) { |
|
96 | 96 | $this->addClass($part); |
97 | 97 | } |
98 | 98 | } |
@@ -106,9 +106,9 @@ discard block |
||
106 | 106 | { |
107 | 107 | $className = trim($className); |
108 | 108 | |
109 | - if($this->isClassNameValid($className)) |
|
109 | + if ($this->isClassNameValid($className)) |
|
110 | 110 | { |
111 | - if(!in_array($className, $this->classes)) { |
|
111 | + if (!in_array($className, $this->classes)) { |
|
112 | 112 | $this->classes[] = $className; |
113 | 113 | } |
114 | 114 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | |
141 | 141 | public function preProcessOpening(): string |
142 | 142 | { |
143 | - if($this->isMultiline()) { |
|
143 | + if ($this->isMultiline()) { |
|
144 | 144 | return sprintf('<pre%s>', $this->renderAttributes()); |
145 | 145 | } |
146 | 146 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | |
150 | 150 | public function preProcessClosing(): string |
151 | 151 | { |
152 | - if($this->isMultiline()) { |
|
152 | + if ($this->isMultiline()) { |
|
153 | 153 | return '</pre>'; |
154 | 154 | } |
155 | 155 | |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | |
159 | 159 | private function renderAttributes() : string |
160 | 160 | { |
161 | - if(empty($this->classes)) { |
|
161 | + if (empty($this->classes)) { |
|
162 | 162 | return ''; |
163 | 163 | } |
164 | 164 |
@@ -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( |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | |
185 | 185 | protected function validate_Closing(Mailcode_Commands_Command_Type_Closing $command) : void |
186 | 186 | { |
187 | - if(empty($this->stack)) |
|
187 | + if (empty($this->stack)) |
|
188 | 188 | { |
189 | 189 | $this->validationResult->makeError( |
190 | 190 | t('All open commands have already been ended.'), |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | |
197 | 197 | $openingCommand = array_pop($this->stack); |
198 | 198 | |
199 | - if($openingCommand instanceof Mailcode_Commands_Command_Type_Opening) |
|
199 | + if ($openingCommand instanceof Mailcode_Commands_Command_Type_Opening) |
|
200 | 200 | { |
201 | 201 | $this->log(sprintf('Closing command %s', $openingCommand->getName())); |
202 | 202 |
@@ -30,19 +30,19 @@ |
||
30 | 30 | const VALIDATION_UNCLOSED_COMMAND = 49104; |
31 | 31 | const VALIDATION_CLOSING_NON_OPENING_COMMAND = 49105; |
32 | 32 | |
33 | - /** |
|
34 | - * @var Mailcode_Collection |
|
35 | - */ |
|
33 | + /** |
|
34 | + * @var Mailcode_Collection |
|
35 | + */ |
|
36 | 36 | protected $collection; |
37 | 37 | |
38 | - /** |
|
39 | - * @var OperationResult |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @var OperationResult |
|
40 | + */ |
|
41 | 41 | protected $validationResult; |
42 | 42 | |
43 | - /** |
|
44 | - * @var Mailcode_Commands_Command_Type[] |
|
45 | - */ |
|
43 | + /** |
|
44 | + * @var Mailcode_Commands_Command_Type[] |
|
45 | + */ |
|
46 | 46 | protected $stack = array(); |
47 | 47 | |
48 | 48 | public function __construct(Mailcode_Collection $collection) |
@@ -25,16 +25,16 @@ |
||
25 | 25 | { |
26 | 26 | $command = $location->getPlaceholder()->getCommand(); |
27 | 27 | |
28 | - if($command instanceof Mailcode_Interfaces_Commands_PreProcessing) |
|
28 | + if ($command instanceof Mailcode_Interfaces_Commands_PreProcessing) |
|
29 | 29 | { |
30 | 30 | return $command->preProcessOpening(); |
31 | 31 | } |
32 | 32 | |
33 | - if($command instanceof Mailcode_Commands_Command_Type_Closing) |
|
33 | + if ($command instanceof Mailcode_Commands_Command_Type_Closing) |
|
34 | 34 | { |
35 | 35 | $opening = $command->getOpeningCommand(); |
36 | 36 | |
37 | - if($opening instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
37 | + if ($opening instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
38 | 38 | return $opening->preProcessClosing(); |
39 | 39 | } |
40 | 40 | } |
@@ -25,7 +25,7 @@ |
||
25 | 25 | // This ending command is tied to a preprocessing command: Since |
26 | 26 | // we do not want to keep these, we return an empty string to strip |
27 | 27 | // it out. |
28 | - if($command->getOpeningCommand() instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
28 | + if ($command->getOpeningCommand() instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
29 | 29 | return ''; |
30 | 30 | } |
31 | 31 |
@@ -37,7 +37,7 @@ |
||
37 | 37 | $formatInfo->getThousandsSeparator() |
38 | 38 | ); |
39 | 39 | |
40 | - if($command->isURLEncoded()) |
|
40 | + if ($command->isURLEncoded()) |
|
41 | 41 | { |
42 | 42 | return sprintf( |
43 | 43 | '${esc.url($%s)}', |