@@ -75,8 +75,7 @@ |
||
| 75 | 75 | if($command->hasFreeformParameters()) |
| 76 | 76 | { |
| 77 | 77 | $params = $command->getParams()->getStatementString(); |
| 78 | - } |
|
| 79 | - else |
|
| 78 | + } else |
|
| 80 | 79 | { |
| 81 | 80 | $params = $command->getParams()->getNormalized(); |
| 82 | 81 | } |
@@ -67,78 +67,108 @@ |
||
| 67 | 67 | |
| 68 | 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() { |
|
| 71 | + ->if($condition, $type)); |
|
| 72 | + } |
|
| 71 | 73 | } |
| 72 | 74 | |
| 73 | 75 | public function ifVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string |
| 74 | 76 | { |
| 75 | - return $this->command2string(Mailcode_Factory::if()->var($variable, $operand, $value, $quoteValue)); |
|
| 77 | + return $this->command2string(Mailcode_Factory::if() { |
|
| 78 | + ->var($variable, $operand, $value, $quoteValue)); |
|
| 79 | + } |
|
| 76 | 80 | } |
| 77 | 81 | |
| 78 | 82 | public function ifVarString(string $variable, string $operand, string $value) : string |
| 79 | 83 | { |
| 80 | - return $this->command2string(Mailcode_Factory::if()->varString($variable, $operand, $value)); |
|
| 84 | + return $this->command2string(Mailcode_Factory::if() { |
|
| 85 | + ->varString($variable, $operand, $value)); |
|
| 86 | + } |
|
| 81 | 87 | } |
| 82 | 88 | |
| 83 | 89 | public function ifVarEquals(string $variable, string $value, bool $quoteValue=false) : string |
| 84 | 90 | { |
| 85 | - return $this->command2string(Mailcode_Factory::if()->varEquals($variable, $value, $quoteValue)); |
|
| 91 | + return $this->command2string(Mailcode_Factory::if() { |
|
| 92 | + ->varEquals($variable, $value, $quoteValue)); |
|
| 93 | + } |
|
| 86 | 94 | } |
| 87 | 95 | |
| 88 | 96 | public function ifVarEqualsString(string $variable, string $value) : string |
| 89 | 97 | { |
| 90 | - return $this->command2string(Mailcode_Factory::if()->varEqualsString($variable, $value)); |
|
| 98 | + return $this->command2string(Mailcode_Factory::if() { |
|
| 99 | + ->varEqualsString($variable, $value)); |
|
| 100 | + } |
|
| 91 | 101 | } |
| 92 | 102 | |
| 93 | 103 | public function ifVarNotEquals(string $variable, string $value, bool $quoteValue=false) : string |
| 94 | 104 | { |
| 95 | - return $this->command2string(Mailcode_Factory::if()->varNotEquals($variable, $value, $quoteValue)); |
|
| 105 | + return $this->command2string(Mailcode_Factory::if() { |
|
| 106 | + ->varNotEquals($variable, $value, $quoteValue)); |
|
| 107 | + } |
|
| 96 | 108 | } |
| 97 | 109 | |
| 98 | 110 | public function ifVarNotEqualsString(string $variable, string $value) : string |
| 99 | 111 | { |
| 100 | - return $this->command2string(Mailcode_Factory::if()->varNotEqualsString($variable, $value)); |
|
| 112 | + return $this->command2string(Mailcode_Factory::if() { |
|
| 113 | + ->varNotEqualsString($variable, $value)); |
|
| 114 | + } |
|
| 101 | 115 | } |
| 102 | 116 | |
| 103 | 117 | public function elseIf(string $condition, string $type='') : string |
| 104 | 118 | { |
| 105 | - return $this->command2string(Mailcode_Factory::elseIf()->elseIf($condition, $type)); |
|
| 119 | + return $this->command2string(Mailcode_Factory::elseIf() { |
|
| 120 | + ->elseIf($condition, $type)); |
|
| 121 | + } |
|
| 106 | 122 | } |
| 107 | 123 | |
| 108 | 124 | public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string |
| 109 | 125 | { |
| 110 | - return $this->command2string(Mailcode_Factory::elseIf()->var($variable, $operand, $value, $quoteValue)); |
|
| 126 | + return $this->command2string(Mailcode_Factory::elseIf() { |
|
| 127 | + ->var($variable, $operand, $value, $quoteValue)); |
|
| 128 | + } |
|
| 111 | 129 | } |
| 112 | 130 | |
| 113 | 131 | public function elseIfVarString(string $variable, string $operand, string $value) : string |
| 114 | 132 | { |
| 115 | - return $this->command2string(Mailcode_Factory::elseIf()->varString($variable, $operand, $value)); |
|
| 133 | + return $this->command2string(Mailcode_Factory::elseIf() { |
|
| 134 | + ->varString($variable, $operand, $value)); |
|
| 135 | + } |
|
| 116 | 136 | } |
| 117 | 137 | |
| 118 | 138 | public function elseIfVarEquals(string $variable, string $value, bool $quoteValue=false) : string |
| 119 | 139 | { |
| 120 | - return $this->command2string(Mailcode_Factory::elseIf()->varEquals($variable, $value, $quoteValue)); |
|
| 140 | + return $this->command2string(Mailcode_Factory::elseIf() { |
|
| 141 | + ->varEquals($variable, $value, $quoteValue)); |
|
| 142 | + } |
|
| 121 | 143 | } |
| 122 | 144 | |
| 123 | 145 | public function elseIfVarEqualsString(string $variable, string $value) : string |
| 124 | 146 | { |
| 125 | - return $this->command2string(Mailcode_Factory::elseIf()->varEqualsString($variable, $value)); |
|
| 147 | + return $this->command2string(Mailcode_Factory::elseIf() { |
|
| 148 | + ->varEqualsString($variable, $value)); |
|
| 149 | + } |
|
| 126 | 150 | } |
| 127 | 151 | |
| 128 | 152 | public function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue=false) : string |
| 129 | 153 | { |
| 130 | - return $this->command2string(Mailcode_Factory::elseIf()->varNotEquals($variable, $value, $quoteValue)); |
|
| 154 | + return $this->command2string(Mailcode_Factory::elseIf() { |
|
| 155 | + ->varNotEquals($variable, $value, $quoteValue)); |
|
| 156 | + } |
|
| 131 | 157 | } |
| 132 | 158 | |
| 133 | 159 | public function elseIfVarNotEqualsString(string $variable, string $value) : string |
| 134 | 160 | { |
| 135 | - return $this->command2string(Mailcode_Factory::elseIf()->varNotEqualsString($variable, $value)); |
|
| 161 | + return $this->command2string(Mailcode_Factory::elseIf() { |
|
| 162 | + ->varNotEqualsString($variable, $value)); |
|
| 163 | + } |
|
| 136 | 164 | } |
| 137 | 165 | |
| 138 | - public function else() : string |
|
| 166 | + public function else { |
|
| 167 | + () : string |
|
| 139 | 168 | { |
| 140 | 169 | return $this->command2string(Mailcode_Factory::elseIf()->else()); |
| 141 | 170 | } |
| 171 | + } |
|
| 142 | 172 | |
| 143 | 173 | public function end() : string |
| 144 | 174 | { |
@@ -65,12 +65,16 @@ |
||
| 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'), |
|
| 68 | + Mailcode_Factory::if() { |
|
| 69 | + ->if('1 + 1 == 2'), |
|
| 69 | 70 | Mailcode_Factory::if()->contains('CUSTOMER.NAME', array('John')), |
| 70 | 71 | Mailcode_Factory::if()->varEquals('NUMBER', '124'), |
| 71 | 72 | ); |
| 73 | + } |
|
| 72 | 74 | |
| 73 | - $and = Mailcode_Factory::elseIf()->varEqualsString('STRINGVAR', 'John'); |
|
| 75 | + $and = Mailcode_Factory::elseIf() { |
|
| 76 | + ->varEqualsString('STRINGVAR', 'John'); |
|
| 77 | + } |
|
| 74 | 78 | $and->getLogicKeywords()->appendOR('$STRINGVAR == "Steve"', "variable"); |
| 75 | 79 | |
| 76 | 80 | $commands[] = $and; |
@@ -120,8 +120,7 @@ |
||
| 120 | 120 | if($this->isList()) |
| 121 | 121 | { |
| 122 | 122 | $command = $this->renderListCommand($searchTerm); |
| 123 | - } |
|
| 124 | - else |
|
| 123 | + } else |
|
| 125 | 124 | { |
| 126 | 125 | $command = $this->renderRegularCommand($searchTerm); |
| 127 | 126 | } |
@@ -51,8 +51,7 @@ |
||
| 51 | 51 | if(!empty($matches[3][$idx])) |
| 52 | 52 | { |
| 53 | 53 | $this->addSingle($matches[3][$idx], $matchedText, $sourceCommand); |
| 54 | - } |
|
| 55 | - else |
|
| 54 | + } else |
|
| 56 | 55 | { |
| 57 | 56 | $this->addPathed($matches[1][$idx], $matches[2][$idx], $matchedText, $sourceCommand); |
| 58 | 57 | } |