@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | // allowed ones. |
| 125 | 125 | if (!in_array($sign, $allowed)) { |
| 126 | 126 | $this->validationResult->makeError( |
| 127 | - t('The %1$s sign is not allowed in this command.', '<code>' . $sign . '</code>'), |
|
| 127 | + t('The %1$s sign is not allowed in this command.', '<code>'.$sign.'</code>'), |
|
| 128 | 128 | Mailcode_Commands_CommonConstants::VALIDATION_INVALID_OPERAND |
| 129 | 129 | ); |
| 130 | 130 | } |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | |
| 151 | 151 | throw new Mailcode_Exception( |
| 152 | 152 | 'No variable found.', |
| 153 | - 'Statement does not start with a variable: [' . $this->paramsString . ']', |
|
| 153 | + 'Statement does not start with a variable: ['.$this->paramsString.']', |
|
| 154 | 154 | Mailcode_Commands_CommonConstants::ERROR_NO_VARIABLE_AVAILABLE |
| 155 | 155 | ); |
| 156 | 156 | } |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | { |
| 23 | 23 | public function __construct(string $message, ?string $details = null, $code = null, $previous = null) |
| 24 | 24 | { |
| 25 | - if(defined('TESTS_ROOT') && !empty($details)) { |
|
| 25 | + if (defined('TESTS_ROOT') && !empty($details)) { |
|
| 26 | 26 | $message .= PHP_EOL. |
| 27 | 27 | 'Details:'.PHP_EOL. |
| 28 | 28 | $details; |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | $vars = Mailcode::create()->findVariables($this->tokenized, $this->tokenizer->getSourceCommand())->getGroupedByHash(); |
| 12 | 12 | |
| 13 | 13 | $names = array(); |
| 14 | - foreach($vars as $var) |
|
| 14 | + foreach ($vars as $var) |
|
| 15 | 15 | { |
| 16 | 16 | $names[$var->getMatchedText()] = $var; |
| 17 | 17 | } |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | return strlen($b) - strlen($a); |
| 24 | 24 | }); |
| 25 | 25 | |
| 26 | - foreach($names as $name => $var) |
|
| 26 | + foreach ($names as $name => $var) |
|
| 27 | 27 | { |
| 28 | 28 | $this->registerToken('Variable', $name, $var); |
| 29 | 29 | } |
@@ -20,9 +20,9 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | abstract class Mailcode_Variables_Collection |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * @var Mailcode_Variables_Variable[] |
|
| 25 | - */ |
|
| 23 | + /** |
|
| 24 | + * @var Mailcode_Variables_Variable[] |
|
| 25 | + */ |
|
| 26 | 26 | protected array $variables = array(); |
| 27 | 27 | |
| 28 | 28 | public function __construct() |
@@ -52,12 +52,12 @@ discard block |
||
| 52 | 52 | return count($this->variables); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * Checks whether the collection contains a variable with the specified name. |
|
| 57 | - * |
|
| 58 | - * @param string $fullName The variable name, with or without $ sign. |
|
| 59 | - * @return bool |
|
| 60 | - */ |
|
| 55 | + /** |
|
| 56 | + * Checks whether the collection contains a variable with the specified name. |
|
| 57 | + * |
|
| 58 | + * @param string $fullName The variable name, with or without $ sign. |
|
| 59 | + * @return bool |
|
| 60 | + */ |
|
| 61 | 61 | public function hasVariableName(string $fullName) : bool |
| 62 | 62 | { |
| 63 | 63 | $fullName = $this->fixName($fullName); |
@@ -73,14 +73,14 @@ discard block |
||
| 73 | 73 | return false; |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - /** |
|
| 77 | - * Retrieves a collection of all variable instances for |
|
| 78 | - * the specified name (there can be several with differing |
|
| 79 | - * matched texts because of spacing). |
|
| 80 | - * |
|
| 81 | - * @param string $fullName |
|
| 82 | - * @return Mailcode_Variables_Collection |
|
| 83 | - */ |
|
| 76 | + /** |
|
| 77 | + * Retrieves a collection of all variable instances for |
|
| 78 | + * the specified name (there can be several with differing |
|
| 79 | + * matched texts because of spacing). |
|
| 80 | + * |
|
| 81 | + * @param string $fullName |
|
| 82 | + * @return Mailcode_Variables_Collection |
|
| 83 | + */ |
|
| 84 | 84 | public function getByFullName(string $fullName) : Mailcode_Variables_Collection |
| 85 | 85 | { |
| 86 | 86 | $fullName = $this->fixName($fullName); |
@@ -98,23 +98,23 @@ discard block |
||
| 98 | 98 | return $collection; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - /** |
|
| 102 | - * Prepends the $ sign to a variable name if it does not have it. |
|
| 103 | - * |
|
| 104 | - * @param string $fullName |
|
| 105 | - * @return string |
|
| 106 | - */ |
|
| 101 | + /** |
|
| 102 | + * Prepends the $ sign to a variable name if it does not have it. |
|
| 103 | + * |
|
| 104 | + * @param string $fullName |
|
| 105 | + * @return string |
|
| 106 | + */ |
|
| 107 | 107 | protected function fixName(string $fullName) : string |
| 108 | 108 | { |
| 109 | 109 | return dollarize($fullName); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - /** |
|
| 113 | - * Retrieves all variables, grouped by their hash - meaning |
|
| 114 | - * unique matched strings. |
|
| 115 | - * |
|
| 116 | - * @return Mailcode_Variables_Variable[] |
|
| 117 | - */ |
|
| 112 | + /** |
|
| 113 | + * Retrieves all variables, grouped by their hash - meaning |
|
| 114 | + * unique matched strings. |
|
| 115 | + * |
|
| 116 | + * @return Mailcode_Variables_Variable[] |
|
| 117 | + */ |
|
| 118 | 118 | public function getGroupedByHash() : array |
| 119 | 119 | { |
| 120 | 120 | $entries = array(); |
@@ -127,11 +127,11 @@ discard block |
||
| 127 | 127 | return $this->sortVariables($entries); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - /** |
|
| 131 | - * Retrieves all variables, grouped by their name. |
|
| 132 | - * |
|
| 133 | - * @return Mailcode_Variables_Variable[] |
|
| 134 | - */ |
|
| 130 | + /** |
|
| 131 | + * Retrieves all variables, grouped by their name. |
|
| 132 | + * |
|
| 133 | + * @return Mailcode_Variables_Variable[] |
|
| 134 | + */ |
|
| 135 | 135 | public function getGroupedByName() : array |
| 136 | 136 | { |
| 137 | 137 | $entries = array(); |
@@ -163,19 +163,19 @@ discard block |
||
| 163 | 163 | return $this->sortVariables($entries); |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - /** |
|
| 167 | - * Retrieves all variables, in the order they were addded. |
|
| 168 | - * @return Mailcode_Variables_Variable[] |
|
| 169 | - */ |
|
| 166 | + /** |
|
| 167 | + * Retrieves all variables, in the order they were addded. |
|
| 168 | + * @return Mailcode_Variables_Variable[] |
|
| 169 | + */ |
|
| 170 | 170 | public function getAll() |
| 171 | 171 | { |
| 172 | 172 | return $this->variables; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - /** |
|
| 176 | - * Retrieves the full names of the variables that are present in the collection. |
|
| 177 | - * @return string[] |
|
| 178 | - */ |
|
| 175 | + /** |
|
| 176 | + * Retrieves the full names of the variables that are present in the collection. |
|
| 177 | + * @return string[] |
|
| 178 | + */ |
|
| 179 | 179 | public function getNames() : array |
| 180 | 180 | { |
| 181 | 181 | $result = array(); |
@@ -193,13 +193,13 @@ discard block |
||
| 193 | 193 | return $result; |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | - /** |
|
| 197 | - * Takes a list of variables and sorts them, throwing away |
|
| 198 | - * the source array's keys. |
|
| 199 | - * |
|
| 200 | - * @param Mailcode_Variables_Variable[] $entries |
|
| 201 | - * @return Mailcode_Variables_Variable[] |
|
| 202 | - */ |
|
| 196 | + /** |
|
| 197 | + * Takes a list of variables and sorts them, throwing away |
|
| 198 | + * the source array's keys. |
|
| 199 | + * |
|
| 200 | + * @param Mailcode_Variables_Variable[] $entries |
|
| 201 | + * @return Mailcode_Variables_Variable[] |
|
| 202 | + */ |
|
| 203 | 203 | protected function sortVariables(array $entries) |
| 204 | 204 | { |
| 205 | 205 | $result = array_values($entries); |
@@ -212,13 +212,13 @@ discard block |
||
| 212 | 212 | return $result; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - /** |
|
| 216 | - * Merges the variables collection with the target collection |
|
| 217 | - * by inheriting all that collection's variables. |
|
| 218 | - * |
|
| 219 | - * @param Mailcode_Variables_Collection $collection |
|
| 220 | - * @return Mailcode_Variables_Collection |
|
| 221 | - */ |
|
| 215 | + /** |
|
| 216 | + * Merges the variables collection with the target collection |
|
| 217 | + * by inheriting all that collection's variables. |
|
| 218 | + * |
|
| 219 | + * @param Mailcode_Variables_Collection $collection |
|
| 220 | + * @return Mailcode_Variables_Collection |
|
| 221 | + */ |
|
| 222 | 222 | public function mergeWith(Mailcode_Variables_Collection $collection) : Mailcode_Variables_Collection |
| 223 | 223 | { |
| 224 | 224 | $variables = $collection->getGroupedByHash(); |
@@ -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 | } |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | { |
| 120 | 120 | $entries = array(); |
| 121 | 121 | |
| 122 | - foreach($this->variables as $variable) |
|
| 122 | + foreach ($this->variables as $variable) |
|
| 123 | 123 | { |
| 124 | 124 | $entries[$variable->getHash()] = $variable; |
| 125 | 125 | } |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | { |
| 137 | 137 | $entries = array(); |
| 138 | 138 | |
| 139 | - foreach($this->variables as $variable) |
|
| 139 | + foreach ($this->variables as $variable) |
|
| 140 | 140 | { |
| 141 | 141 | $entries[$variable->getFullName()] = $variable; |
| 142 | 142 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | { |
| 156 | 156 | $entries = array(); |
| 157 | 157 | |
| 158 | - foreach($this->variables as $variable) |
|
| 158 | + foreach ($this->variables as $variable) |
|
| 159 | 159 | { |
| 160 | 160 | $entries[$variable->getUniqueName()] = $variable; |
| 161 | 161 | } |
@@ -180,11 +180,11 @@ discard block |
||
| 180 | 180 | { |
| 181 | 181 | $result = array(); |
| 182 | 182 | |
| 183 | - foreach($this->variables as $variable) |
|
| 183 | + foreach ($this->variables as $variable) |
|
| 184 | 184 | { |
| 185 | 185 | $name = $variable->getFullName(); |
| 186 | 186 | |
| 187 | - if(!in_array($name, $result)) |
|
| 187 | + if (!in_array($name, $result)) |
|
| 188 | 188 | { |
| 189 | 189 | $result[] = $name; |
| 190 | 190 | } |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | { |
| 224 | 224 | $variables = $collection->getGroupedByHash(); |
| 225 | 225 | |
| 226 | - foreach($variables as $variable) |
|
| 226 | + foreach ($variables as $variable) |
|
| 227 | 227 | { |
| 228 | 228 | $this->add($variable); |
| 229 | 229 | } |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | { |
| 236 | 236 | $variables = $this->getAll(); |
| 237 | 237 | |
| 238 | - if(!empty($variables)) |
|
| 238 | + if (!empty($variables)) |
|
| 239 | 239 | { |
| 240 | 240 | return array_shift($variables); |
| 241 | 241 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | // Split the variable name by the dot |
| 45 | 45 | $parts = explode('.', undollarize($var->getFullName())); |
| 46 | 46 | |
| 47 | - if(count($parts) !== 2) |
|
| 47 | + if (count($parts) !== 2) |
|
| 48 | 48 | { |
| 49 | 49 | $this->validationResult->makeError( |
| 50 | 50 | t('The variable %1$s is not a list property:', '<code>'.$var->getFullName().'</code>').' '. |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public function getListVariable() : Mailcode_Variables_Variable |
| 78 | 78 | { |
| 79 | - if(isset($this->listVariable)) |
|
| 79 | + if (isset($this->listVariable)) |
|
| 80 | 80 | { |
| 81 | 81 | return $this->listVariable; |
| 82 | 82 | } |
@@ -59,12 +59,12 @@ |
||
| 59 | 59 | * @throws Mailcode_Exception |
| 60 | 60 | * @throws Mailcode_Factory_Exception |
| 61 | 61 | */ |
| 62 | - public function for(string $sourceVariable, string $loopVariable, $breakAtValue = ''): Mailcode_Commands_Command_For |
|
| 62 | + public function for (string $sourceVariable, string $loopVariable, $breakAtValue = ''): Mailcode_Commands_Command_For |
|
| 63 | 63 | { |
| 64 | 64 | $sourceVariable = dollarize($sourceVariable); |
| 65 | 65 | $loopVariable = dollarize($loopVariable); |
| 66 | 66 | |
| 67 | - if($breakAtValue instanceof Mailcode_Variables_Variable) { |
|
| 67 | + if ($breakAtValue instanceof Mailcode_Variables_Variable) { |
|
| 68 | 68 | $breakAtValue = $breakAtValue->getFullName(); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | // All other special characters have to be escaped |
| 74 | 74 | // with two backslashes. |
| 75 | 75 | foreach ($this->regexSpecialChars as $char) { |
| 76 | - $string = str_replace($char, '\\' . $char, $string); |
|
| 76 | + $string = str_replace($char, '\\'.$char, $string); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | // Restore the escaped quotes, which stay escaped |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | $cmd = $this->commands->createCommand( |
| 52 | 52 | 'ShowDate', |
| 53 | 53 | '', |
| 54 | - $variableName . $format . $timezone, |
|
| 54 | + $variableName.$format.$timezone, |
|
| 55 | 55 | sprintf( |
| 56 | 56 | '{showdate: %s%s%s}', |
| 57 | 57 | $variableName, |
@@ -60,6 +60,6 @@ |
||
| 60 | 60 | return $string; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - return '"' . str_replace('"', '\"', $string) . '"'; |
|
| 63 | + return '"'.str_replace('"', '\"', $string).'"'; |
|
| 64 | 64 | } |
| 65 | 65 | } |