@@ -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 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | * |
| 54 | 54 | * @return Mailcode_Factory_CommandSets_Set_If |
| 55 | 55 | */ |
| 56 | - public static function if() : Mailcode_Factory_CommandSets_Set_If |
|
| 56 | + public static function if () : Mailcode_Factory_CommandSets_Set_If |
|
| 57 | 57 | { |
| 58 | 58 | return self::$commandSets->if(); |
| 59 | 59 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | * |
| 64 | 64 | * @return Mailcode_Factory_CommandSets_Set_ElseIf |
| 65 | 65 | */ |
| 66 | - public static function elseIf() : Mailcode_Factory_CommandSets_Set_ElseIf |
|
| 66 | + public static function elseIf () : Mailcode_Factory_CommandSets_Set_ElseIf |
|
| 67 | 67 | { |
| 68 | 68 | return self::$commandSets->elseIf(); |
| 69 | 69 | } |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | public static function init() : void |
| 115 | 115 | { |
| 116 | - if(!isset(self::$commandSets)) |
|
| 116 | + if (!isset(self::$commandSets)) |
|
| 117 | 117 | { |
| 118 | 118 | self::$commandSets = new Mailcode_Factory_CommandSets(); |
| 119 | 119 | } |
@@ -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> |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | // IF type. |
| 40 | 40 | $method = 'translate'.$this->getIfType($command); |
| 41 | 41 | |
| 42 | - if(method_exists($this, $method)) |
|
| 42 | + if (method_exists($this, $method)) |
|
| 43 | 43 | { |
| 44 | 44 | return strval($this->$method($command)); |
| 45 | 45 | } |
@@ -53,11 +53,11 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | $keywords = $command->getLogicKeywords()->getKeywords(); |
| 55 | 55 | |
| 56 | - foreach($keywords as $keyword) |
|
| 56 | + foreach ($keywords as $keyword) |
|
| 57 | 57 | { |
| 58 | 58 | $keyCommand = $keyword->getCommand(); |
| 59 | 59 | |
| 60 | - if($keyCommand instanceof Mailcode_Commands_IfBase) |
|
| 60 | + if ($keyCommand instanceof Mailcode_Commands_IfBase) |
|
| 61 | 61 | { |
| 62 | 62 | $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand); |
| 63 | 63 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | protected function getSign(Mailcode_Commands_LogicKeywords_Keyword $keyword) : string |
| 82 | 82 | { |
| 83 | - switch($keyword->getName()) |
|
| 83 | + switch ($keyword->getName()) |
|
| 84 | 84 | { |
| 85 | 85 | case 'and': |
| 86 | 86 | return '&&'; |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | { |
| 118 | 118 | $sign = ''; |
| 119 | 119 | |
| 120 | - if($notEmpty) |
|
| 120 | + if ($notEmpty) |
|
| 121 | 121 | { |
| 122 | 122 | $sign = '!'; |
| 123 | 123 | } |
@@ -133,12 +133,12 @@ discard block |
||
| 133 | 133 | { |
| 134 | 134 | $params = $command->getParams(); |
| 135 | 135 | |
| 136 | - if(!$params) |
|
| 136 | + if (!$params) |
|
| 137 | 137 | { |
| 138 | 138 | return ''; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - if($command->hasFreeformParameters()) |
|
| 141 | + if ($command->hasFreeformParameters()) |
|
| 142 | 142 | { |
| 143 | 143 | return $params->getStatementString(); |
| 144 | 144 | } |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | $test = strtolower(trim($value, '"')); |
| 152 | 152 | $fullName = $variable->getFullName(); |
| 153 | 153 | |
| 154 | - if(in_array($test, array('true', 'false'))) |
|
| 154 | + if (in_array($test, array('true', 'false'))) |
|
| 155 | 155 | { |
| 156 | 156 | $fullName .= '.toLowerCase()'; |
| 157 | 157 | $value = '"'.$test.'"'; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | protected function _translateSearch(string $mode, Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string |
| 183 | 183 | { |
| 184 | 184 | $method = $mode.'With'; |
| 185 | - if($caseSensitive) |
|
| 185 | + if ($caseSensitive) |
|
| 186 | 186 | { |
| 187 | 187 | $method = $mode.'WithIgnoreCase'; |
| 188 | 188 | } |
@@ -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 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | private $command; |
| 74 | 74 | |
| 75 | - public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) |
|
| 75 | + public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) |
|
| 76 | 76 | { |
| 77 | 77 | $this->path = $path; |
| 78 | 78 | $this->name = $name; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | public function getFullName() : string |
| 97 | 97 | { |
| 98 | - if(empty($this->path)) |
|
| 98 | + if (empty($this->path)) |
|
| 99 | 99 | { |
| 100 | 100 | return '$'.$this->name; |
| 101 | 101 | } |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | */ |
| 114 | 114 | public function getUniqueName() : string |
| 115 | 115 | { |
| 116 | - if(isset($this->command)) |
|
| 116 | + if (isset($this->command)) |
|
| 117 | 117 | { |
| 118 | 118 | return $this->getFullName().'/'.$this->command->getHash(); |
| 119 | 119 | } |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | |
| 139 | 139 | public function getHash() : string |
| 140 | 140 | { |
| 141 | - if(empty($this->hash)) |
|
| 141 | + if (empty($this->hash)) |
|
| 142 | 142 | { |
| 143 | 143 | $this->hash = md5($this->matchedText); |
| 144 | 144 | } |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | public function getValidationResult() : OperationResult |
| 155 | 155 | { |
| 156 | - if(isset($this->validationResult)) |
|
| 156 | + if (isset($this->validationResult)) |
|
| 157 | 157 | { |
| 158 | 158 | return $this->validationResult; |
| 159 | 159 | } |
@@ -167,11 +167,11 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | protected function validate() : void |
| 169 | 169 | { |
| 170 | - foreach($this->validations as $validation) |
|
| 170 | + foreach ($this->validations as $validation) |
|
| 171 | 171 | { |
| 172 | 172 | $method = 'validate_'.$validation; |
| 173 | 173 | |
| 174 | - if(!method_exists($this, $method)) |
|
| 174 | + if (!method_exists($this, $method)) |
|
| 175 | 175 | { |
| 176 | 176 | throw new Mailcode_Exception( |
| 177 | 177 | 'Unknown validation method', |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | |
| 187 | 187 | $this->$method(); |
| 188 | 188 | |
| 189 | - if(!$this->validationResult->isValid()) |
|
| 189 | + if (!$this->validationResult->isValid()) |
|
| 190 | 190 | { |
| 191 | 191 | return; |
| 192 | 192 | } |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | protected function validateNumber(string $value, int $errorCode) : void |
| 217 | 217 | { |
| 218 | - if(!is_numeric(substr($value, 0, 1))) |
|
| 218 | + if (!is_numeric(substr($value, 0, 1))) |
|
| 219 | 219 | { |
| 220 | 220 | return; |
| 221 | 221 | } |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | protected function validateUnderscore(string $value, int $errorCode) : void |
| 234 | 234 | { |
| 235 | 235 | // allow empty paths |
| 236 | - if(empty($value)) |
|
| 236 | + if (empty($value)) |
|
| 237 | 237 | { |
| 238 | 238 | return; |
| 239 | 239 | } |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | $length = strlen($value); |
| 242 | 242 | |
| 243 | 243 | // trimming underscores does not change the length: no underscores at start or end of string. |
| 244 | - if(strlen(trim($value, '_')) == $length) |
|
| 244 | + if (strlen(trim($value, '_')) == $length) |
|
| 245 | 245 | { |
| 246 | 246 | return; |
| 247 | 247 | } |
@@ -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 | } |