@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $autoload = realpath($root.'/../vendor/autoload.php'); |
18 | 18 | |
19 | 19 | // we need the autoloader to be present |
20 | - if($autoload === false) |
|
20 | + if ($autoload === false) |
|
21 | 21 | { |
22 | 22 | die('<b>ERROR:</b> Autoloader not present. Run composer update first.'); |
23 | 23 | } |
@@ -65,19 +65,19 @@ discard block |
||
65 | 65 | Mailcode_Factory::misc()->comment('Some comments here'), |
66 | 66 | Mailcode_Factory::show()->snippet('snippet_name'), |
67 | 67 | Mailcode_Factory::show()->date('DATE.VARIABLE'), |
68 | - Mailcode_Factory::if()->if('1 + 1 == 2'), |
|
69 | - Mailcode_Factory::if()->contains('CUSTOMER.NAME', array('John')), |
|
70 | - Mailcode_Factory::if()->varEquals('NUMBER', '124'), |
|
68 | + Mailcode_Factory::if ()->if('1 + 1 == 2'), |
|
69 | + Mailcode_Factory::if ()->contains('CUSTOMER.NAME', array('John')), |
|
70 | + Mailcode_Factory::if ()->varEquals('NUMBER', '124'), |
|
71 | 71 | ); |
72 | 72 | |
73 | - $and = Mailcode_Factory::elseIf()->varEqualsString('STRINGVAR', 'John'); |
|
73 | + $and = Mailcode_Factory::elseIf ()->varEqualsString('STRINGVAR', 'John'); |
|
74 | 74 | $and->getLogicKeywords()->appendOR('$STRINGVAR == "Steve"', "variable"); |
75 | 75 | |
76 | 76 | $commands[] = $and; |
77 | 77 | |
78 | 78 | $commands[] = Mailcode_Factory::misc()->end(); |
79 | 79 | |
80 | - foreach($commands as $command) |
|
80 | + foreach ($commands as $command) |
|
81 | 81 | { |
82 | 82 | ?> |
83 | 83 | <p> |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function getParser() : Mailcode_Parser |
75 | 75 | { |
76 | - if(!isset($this->parser)) |
|
76 | + if (!isset($this->parser)) |
|
77 | 77 | { |
78 | 78 | $this->parser = new Mailcode_Parser($this); |
79 | 79 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function getCommands() : Mailcode_Commands |
91 | 91 | { |
92 | - if(!isset($this->commands)) |
|
92 | + if (!isset($this->commands)) |
|
93 | 93 | { |
94 | 94 | $this->commands = new Mailcode_Commands(); |
95 | 95 | } |
@@ -114,14 +114,14 @@ discard block |
||
114 | 114 | * @param Mailcode_Commands_Command|null $sourceCommand |
115 | 115 | * @return Mailcode_Variables_Collection_Regular |
116 | 116 | */ |
117 | - public function findVariables(string $subject, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Variables_Collection_Regular |
|
117 | + public function findVariables(string $subject, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Variables_Collection_Regular |
|
118 | 118 | { |
119 | 119 | return $this->createVariables()->parseString($subject, $sourceCommand); |
120 | 120 | } |
121 | 121 | |
122 | 122 | public function createVariables() : Mailcode_Variables |
123 | 123 | { |
124 | - if(!isset($this->variables)) |
|
124 | + if (!isset($this->variables)) |
|
125 | 125 | { |
126 | 126 | $this->variables = new Mailcode_Variables(); |
127 | 127 | } |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | */ |
138 | 138 | public function createTranslator() : Mailcode_Translator |
139 | 139 | { |
140 | - if(!isset($this->translator)) |
|
140 | + if (!isset($this->translator)) |
|
141 | 141 | { |
142 | 142 | $this->translator = new Mailcode_Translator(); |
143 | 143 | } |
@@ -62,9 +62,9 @@ discard block |
||
62 | 62 | { |
63 | 63 | $fullName = $this->fixName($fullName); |
64 | 64 | |
65 | - foreach($this->variables as $variable) |
|
65 | + foreach ($this->variables as $variable) |
|
66 | 66 | { |
67 | - if($variable->getFullName() === $fullName) |
|
67 | + if ($variable->getFullName() === $fullName) |
|
68 | 68 | { |
69 | 69 | return true; |
70 | 70 | } |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | |
88 | 88 | $collection = new Mailcode_Variables_Collection_Regular(); |
89 | 89 | |
90 | - foreach($this->variables as $variable) |
|
90 | + foreach ($this->variables as $variable) |
|
91 | 91 | { |
92 | - if($variable->getFullName() === $fullName) |
|
92 | + if ($variable->getFullName() === $fullName) |
|
93 | 93 | { |
94 | 94 | $collection->add($variable); |
95 | 95 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | */ |
107 | 107 | protected function fixName(string $fullName) : string |
108 | 108 | { |
109 | - if(substr($fullName, 0, 1) === '$') |
|
109 | + if (substr($fullName, 0, 1) === '$') |
|
110 | 110 | { |
111 | 111 | return $fullName; |
112 | 112 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | { |
125 | 125 | $entries = array(); |
126 | 126 | |
127 | - foreach($this->variables as $variable) |
|
127 | + foreach ($this->variables as $variable) |
|
128 | 128 | { |
129 | 129 | $entries[$variable->getHash()] = $variable; |
130 | 130 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | { |
142 | 142 | $entries = array(); |
143 | 143 | |
144 | - foreach($this->variables as $variable) |
|
144 | + foreach ($this->variables as $variable) |
|
145 | 145 | { |
146 | 146 | $entries[$variable->getFullName()] = $variable; |
147 | 147 | } |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | { |
161 | 161 | $entries = array(); |
162 | 162 | |
163 | - foreach($this->variables as $variable) |
|
163 | + foreach ($this->variables as $variable) |
|
164 | 164 | { |
165 | 165 | $entries[$variable->getUniqueName()] = $variable; |
166 | 166 | } |
@@ -185,11 +185,11 @@ discard block |
||
185 | 185 | { |
186 | 186 | $result = array(); |
187 | 187 | |
188 | - foreach($this->variables as $variable) |
|
188 | + foreach ($this->variables as $variable) |
|
189 | 189 | { |
190 | 190 | $name = $variable->getFullName(); |
191 | 191 | |
192 | - if(!in_array($name, $result)) |
|
192 | + if (!in_array($name, $result)) |
|
193 | 193 | { |
194 | 194 | $result[] = $name; |
195 | 195 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | { |
229 | 229 | $variables = $collection->getGroupedByHash(); |
230 | 230 | |
231 | - foreach($variables as $variable) |
|
231 | + foreach ($variables as $variable) |
|
232 | 232 | { |
233 | 233 | $this->add($variable); |
234 | 234 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | { |
241 | 241 | $variables = $this->getAll(); |
242 | 242 | |
243 | - if(!empty($variables)) |
|
243 | + if (!empty($variables)) |
|
244 | 244 | { |
245 | 245 | return array_shift($variables); |
246 | 246 | } |
@@ -34,21 +34,21 @@ discard block |
||
34 | 34 | * @param Mailcode_Commands_Command|null $sourceCommand |
35 | 35 | * @return Mailcode_Variables_Collection_Regular |
36 | 36 | */ |
37 | - public function parseString(string $subject, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Variables_Collection_Regular |
|
37 | + public function parseString(string $subject, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Variables_Collection_Regular |
|
38 | 38 | { |
39 | 39 | $this->collection = new Mailcode_Variables_Collection_Regular(); |
40 | 40 | |
41 | 41 | $matches = array(); |
42 | 42 | preg_match_all(self::REGEX_VARIABLE_NAME, $subject, $matches, PREG_PATTERN_ORDER); |
43 | 43 | |
44 | - if(!isset($matches[0]) || empty($matches[0])) |
|
44 | + if (!isset($matches[0]) || empty($matches[0])) |
|
45 | 45 | { |
46 | 46 | return $this->collection; |
47 | 47 | } |
48 | 48 | |
49 | - foreach($matches[0] as $idx => $matchedText) |
|
49 | + foreach ($matches[0] as $idx => $matchedText) |
|
50 | 50 | { |
51 | - if(!empty($matches[3][$idx])) |
|
51 | + if (!empty($matches[3][$idx])) |
|
52 | 52 | { |
53 | 53 | $this->addSingle($matches[3][$idx], $matchedText, $sourceCommand); |
54 | 54 | } |
@@ -61,10 +61,10 @@ discard block |
||
61 | 61 | return $this->collection; |
62 | 62 | } |
63 | 63 | |
64 | - protected function addSingle(string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) : void |
|
64 | + protected function addSingle(string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) : void |
|
65 | 65 | { |
66 | 66 | // ignore US style numbers like $451 |
67 | - if(is_numeric($name)) |
|
67 | + if (is_numeric($name)) |
|
68 | 68 | { |
69 | 69 | return; |
70 | 70 | } |
@@ -72,10 +72,10 @@ discard block |
||
72 | 72 | $this->collection->add(new Mailcode_Variables_Variable('', $name, $matchedText, $sourceCommand)); |
73 | 73 | } |
74 | 74 | |
75 | - protected function addPathed(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) : void |
|
75 | + protected function addPathed(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) : void |
|
76 | 76 | { |
77 | 77 | // ignore US style numbers like $45.12 |
78 | - if(is_numeric($path.'.'.$name)) |
|
78 | + if (is_numeric($path.'.'.$name)) |
|
79 | 79 | { |
80 | 80 | return; |
81 | 81 | } |
@@ -10,7 +10,7 @@ |
||
10 | 10 | { |
11 | 11 | $vars = Mailcode::create()->findVariables($this->tokenized, $this->tokenizer->getSourceCommand())->getGroupedByHash(); |
12 | 12 | |
13 | - foreach($vars as $var) |
|
13 | + foreach ($vars as $var) |
|
14 | 14 | { |
15 | 15 | $this->registerToken('Variable', $var->getMatchedText(), $var); |
16 | 16 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | // Split the variable name by the dot |
38 | 38 | $parts = explode('.', ltrim($var->getFullName(), '$')); |
39 | 39 | |
40 | - if(count($parts) !== 2) |
|
40 | + if (count($parts) !== 2) |
|
41 | 41 | { |
42 | 42 | $this->validationResult->makeError( |
43 | 43 | t('The variable %1$s is not a list property:', '<code>'.$var->getFullName().'</code>').' '. |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function getListVariable() : Mailcode_Variables_Variable |
71 | 71 | { |
72 | - if(isset($this->listVariable)) |
|
72 | + if (isset($this->listVariable)) |
|
73 | 73 | { |
74 | 74 | return $this->listVariable; |
75 | 75 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | { |
34 | 34 | $var = $this->validator->createVariable(); |
35 | 35 | |
36 | - if($var->isValid()) |
|
36 | + if ($var->isValid()) |
|
37 | 37 | { |
38 | 38 | $this->variableToken = $var->getToken(); |
39 | 39 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | public function getVariableToken() : Mailcode_Parser_Statement_Tokenizer_Token_Variable |
50 | 50 | { |
51 | - if(isset($this->variableToken)) |
|
51 | + if (isset($this->variableToken)) |
|
52 | 52 | { |
53 | 53 | return $this->variableToken; |
54 | 54 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | */ |
69 | 69 | public function getVariable() : Mailcode_Variables_Variable |
70 | 70 | { |
71 | - if(isset($this->variableToken)) |
|
71 | + if (isset($this->variableToken)) |
|
72 | 72 | { |
73 | 73 | return $this->variableToken->getVariable(); |
74 | 74 | } |
@@ -116,12 +116,12 @@ discard block |
||
116 | 116 | { |
117 | 117 | $parent = $subject->getParent(); |
118 | 118 | |
119 | - if($parent === null) |
|
119 | + if ($parent === null) |
|
120 | 120 | { |
121 | 121 | return null; |
122 | 122 | } |
123 | 123 | |
124 | - if($parent instanceof Mailcode_Commands_Command_For) |
|
124 | + if ($parent instanceof Mailcode_Commands_Command_For) |
|
125 | 125 | { |
126 | 126 | return $parent; |
127 | 127 | } |
@@ -59,7 +59,7 @@ |
||
59 | 59 | */ |
60 | 60 | public function excludeTags(array $tagNames) |
61 | 61 | { |
62 | - foreach($tagNames as $tagName) |
|
62 | + foreach ($tagNames as $tagName) |
|
63 | 63 | { |
64 | 64 | $this->excludeTag((string)$tagName); |
65 | 65 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | $this->caseInsensitive = $val->isValid(); |
44 | 44 | |
45 | - if($val->isValid()) |
|
45 | + if ($val->isValid()) |
|
46 | 46 | { |
47 | 47 | $this->regexToken = $val->getToken(); |
48 | 48 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | public function getCaseToken() : ?Mailcode_Parser_Statement_Tokenizer_Token_Keyword |
57 | 57 | { |
58 | - if($this->regexToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
58 | + if ($this->regexToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
59 | 59 | { |
60 | 60 | return $this->regexToken; |
61 | 61 | } |