@@ -31,14 +31,14 @@ |
||
31 | 31 | |
32 | 32 | protected function validateSyntax_params_keywords() : void |
33 | 33 | { |
34 | - if(!$this->supportsLogicKeywords()) |
|
34 | + if (!$this->supportsLogicKeywords()) |
|
35 | 35 | { |
36 | 36 | return; |
37 | 37 | } |
38 | 38 | |
39 | 39 | $this->logicKeywords = new Mailcode_Commands_LogicKeywords($this, $this->paramsString); |
40 | 40 | |
41 | - if(!$this->logicKeywords->isValid()) |
|
41 | + if (!$this->logicKeywords->isValid()) |
|
42 | 42 | { |
43 | 43 | $this->validationResult->makeError( |
44 | 44 | t('Invalid parameters:').' '.$this->logicKeywords->getErrorMessage(), |
@@ -30,7 +30,7 @@ |
||
30 | 30 | |
31 | 31 | protected function validateSyntax_type_unsupported() : void |
32 | 32 | { |
33 | - if($this->supportsType() || empty($this->type)) |
|
33 | + if ($this->supportsType() || empty($this->type)) |
|
34 | 34 | { |
35 | 35 | return; |
36 | 36 | } |
@@ -20,11 +20,11 @@ discard block |
||
20 | 20 | */ |
21 | 21 | class Mailcode_Factory_CommandSets_Set_Set extends Mailcode_Factory_CommandSets_Set |
22 | 22 | { |
23 | - public function var(string $variableName, string $value, bool $quoteValue=true) : Mailcode_Commands_Command_SetVariable |
|
23 | + public function var(string $variableName, string $value, bool $quoteValue = true) : Mailcode_Commands_Command_SetVariable |
|
24 | 24 | { |
25 | 25 | $variableName = $this->instantiator->filterVariableName($variableName); |
26 | 26 | |
27 | - if($quoteValue) |
|
27 | + if ($quoteValue) |
|
28 | 28 | { |
29 | 29 | $value = $this->instantiator->quoteString($value); |
30 | 30 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | $this->instantiator->checkCommand($cmd); |
42 | 42 | |
43 | - if($cmd instanceof Mailcode_Commands_Command_SetVariable) |
|
43 | + if ($cmd instanceof Mailcode_Commands_Command_SetVariable) |
|
44 | 44 | { |
45 | 45 | return $cmd; |
46 | 46 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * @param bool $highlighted |
33 | 33 | * @return Mailcode_Renderer |
34 | 34 | */ |
35 | - public function setOutputHighlighted(bool $highlighted=true) : Mailcode_Renderer |
|
35 | + public function setOutputHighlighted(bool $highlighted = true) : Mailcode_Renderer |
|
36 | 36 | { |
37 | 37 | $this->highlighted = $highlighted; |
38 | 38 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | return $this->command2string(Mailcode_Factory::show()->snippet($snippetName)); |
56 | 56 | } |
57 | 57 | |
58 | - public function setVar(string $variableName, string $value, bool $quoteValue=false) : string |
|
58 | + public function setVar(string $variableName, string $value, bool $quoteValue = false) : string |
|
59 | 59 | { |
60 | 60 | return $this->command2string(Mailcode_Factory::set()->var($variableName, $value, $quoteValue)); |
61 | 61 | } |
@@ -65,79 +65,79 @@ discard block |
||
65 | 65 | return $this->command2string(Mailcode_Factory::set()->varString($variableName, $value)); |
66 | 66 | } |
67 | 67 | |
68 | - public function if(string $condition, string $type='') : string |
|
68 | + public function if (string $condition, string $type = '') : string |
|
69 | 69 | { |
70 | - return $this->command2string(Mailcode_Factory::if()->if($condition, $type)); |
|
70 | + return $this->command2string(Mailcode_Factory::if ()->if($condition, $type)); |
|
71 | 71 | } |
72 | 72 | |
73 | - public function ifVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string |
|
73 | + public function ifVar(string $variable, string $operand, string $value, bool $quoteValue = false) : string |
|
74 | 74 | { |
75 | - return $this->command2string(Mailcode_Factory::if()->var($variable, $operand, $value, $quoteValue)); |
|
75 | + return $this->command2string(Mailcode_Factory::if ()->var($variable, $operand, $value, $quoteValue)); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | public function ifVarString(string $variable, string $operand, string $value) : string |
79 | 79 | { |
80 | - return $this->command2string(Mailcode_Factory::if()->varString($variable, $operand, $value)); |
|
80 | + return $this->command2string(Mailcode_Factory::if ()->varString($variable, $operand, $value)); |
|
81 | 81 | } |
82 | 82 | |
83 | - public function ifVarEquals(string $variable, string $value, bool $quoteValue=false) : string |
|
83 | + public function ifVarEquals(string $variable, string $value, bool $quoteValue = false) : string |
|
84 | 84 | { |
85 | - return $this->command2string(Mailcode_Factory::if()->varEquals($variable, $value, $quoteValue)); |
|
85 | + return $this->command2string(Mailcode_Factory::if ()->varEquals($variable, $value, $quoteValue)); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | public function ifVarEqualsString(string $variable, string $value) : string |
89 | 89 | { |
90 | - return $this->command2string(Mailcode_Factory::if()->varEqualsString($variable, $value)); |
|
90 | + return $this->command2string(Mailcode_Factory::if ()->varEqualsString($variable, $value)); |
|
91 | 91 | } |
92 | 92 | |
93 | - public function ifVarNotEquals(string $variable, string $value, bool $quoteValue=false) : string |
|
93 | + public function ifVarNotEquals(string $variable, string $value, bool $quoteValue = false) : string |
|
94 | 94 | { |
95 | - return $this->command2string(Mailcode_Factory::if()->varNotEquals($variable, $value, $quoteValue)); |
|
95 | + return $this->command2string(Mailcode_Factory::if ()->varNotEquals($variable, $value, $quoteValue)); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | public function ifVarNotEqualsString(string $variable, string $value) : string |
99 | 99 | { |
100 | - return $this->command2string(Mailcode_Factory::if()->varNotEqualsString($variable, $value)); |
|
100 | + return $this->command2string(Mailcode_Factory::if ()->varNotEqualsString($variable, $value)); |
|
101 | 101 | } |
102 | 102 | |
103 | - public function elseIf(string $condition, string $type='') : string |
|
103 | + public function elseIf (string $condition, string $type = '') : string |
|
104 | 104 | { |
105 | - return $this->command2string(Mailcode_Factory::elseIf()->elseIf($condition, $type)); |
|
105 | + return $this->command2string(Mailcode_Factory::elseIf ()->elseIf($condition, $type)); |
|
106 | 106 | } |
107 | 107 | |
108 | - public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string |
|
108 | + public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue = false) : string |
|
109 | 109 | { |
110 | - return $this->command2string(Mailcode_Factory::elseIf()->var($variable, $operand, $value, $quoteValue)); |
|
110 | + return $this->command2string(Mailcode_Factory::elseIf ()->var($variable, $operand, $value, $quoteValue)); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | public function elseIfVarString(string $variable, string $operand, string $value) : string |
114 | 114 | { |
115 | - return $this->command2string(Mailcode_Factory::elseIf()->varString($variable, $operand, $value)); |
|
115 | + return $this->command2string(Mailcode_Factory::elseIf ()->varString($variable, $operand, $value)); |
|
116 | 116 | } |
117 | 117 | |
118 | - public function elseIfVarEquals(string $variable, string $value, bool $quoteValue=false) : string |
|
118 | + public function elseIfVarEquals(string $variable, string $value, bool $quoteValue = false) : string |
|
119 | 119 | { |
120 | - return $this->command2string(Mailcode_Factory::elseIf()->varEquals($variable, $value, $quoteValue)); |
|
120 | + return $this->command2string(Mailcode_Factory::elseIf ()->varEquals($variable, $value, $quoteValue)); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | public function elseIfVarEqualsString(string $variable, string $value) : string |
124 | 124 | { |
125 | - return $this->command2string(Mailcode_Factory::elseIf()->varEqualsString($variable, $value)); |
|
125 | + return $this->command2string(Mailcode_Factory::elseIf ()->varEqualsString($variable, $value)); |
|
126 | 126 | } |
127 | 127 | |
128 | - public function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue=false) : string |
|
128 | + public function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue = false) : string |
|
129 | 129 | { |
130 | - return $this->command2string(Mailcode_Factory::elseIf()->varNotEquals($variable, $value, $quoteValue)); |
|
130 | + return $this->command2string(Mailcode_Factory::elseIf ()->varNotEquals($variable, $value, $quoteValue)); |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | public function elseIfVarNotEqualsString(string $variable, string $value) : string |
134 | 134 | { |
135 | - return $this->command2string(Mailcode_Factory::elseIf()->varNotEqualsString($variable, $value)); |
|
135 | + return $this->command2string(Mailcode_Factory::elseIf ()->varNotEqualsString($variable, $value)); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | public function else() : string |
139 | 139 | { |
140 | - return $this->command2string(Mailcode_Factory::elseIf()->else()); |
|
140 | + return $this->command2string(Mailcode_Factory::elseIf ()->else()); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | public function end() : string |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | protected function command2string(Mailcode_Commands_Command $command) : string |
154 | 154 | { |
155 | - if($this->highlighted) |
|
155 | + if ($this->highlighted) |
|
156 | 156 | { |
157 | 157 | return $command->getHighlighted(); |
158 | 158 | } |
@@ -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> |
@@ -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 | } |
@@ -46,7 +46,7 @@ |
||
46 | 46 | * @param mixed $subject |
47 | 47 | * @param Mailcode_Commands_Command|null $sourceCommand |
48 | 48 | */ |
49 | - public function __construct(string $tokenID, string $matchedText, $subject=null, ?Mailcode_Commands_Command $sourceCommand=null) |
|
49 | + public function __construct(string $tokenID, string $matchedText, $subject = null, ?Mailcode_Commands_Command $sourceCommand = null) |
|
50 | 50 | { |
51 | 51 | $this->tokenID = $tokenID; |
52 | 52 | $this->matchedText = $matchedText; |
@@ -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 | } |