@@ -34,7 +34,7 @@ |
||
| 34 | 34 | |
| 35 | 35 | $this->instantiator->checkCommand($cmd); |
| 36 | 36 | |
| 37 | - if($cmd instanceof Mailcode_Commands_Command_Comment) |
|
| 37 | + if ($cmd instanceof Mailcode_Commands_Command_Comment) |
|
| 38 | 38 | { |
| 39 | 39 | return $cmd; |
| 40 | 40 | } |
@@ -20,11 +20,11 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class Mailcode_Factory_CommandSets_Set_If extends Mailcode_Factory_CommandSets_IfBase |
| 22 | 22 | { |
| 23 | - public function if(string $condition, string $type='') : Mailcode_Commands_Command_If |
|
| 23 | + public function if (string $condition, string $type = '') : Mailcode_Commands_Command_If |
|
| 24 | 24 | { |
| 25 | 25 | $command = $this->instantiator->buildIf('If', $condition, $type); |
| 26 | 26 | |
| 27 | - if($command instanceof Mailcode_Commands_Command_If) |
|
| 27 | + if ($command instanceof Mailcode_Commands_Command_If) |
|
| 28 | 28 | { |
| 29 | 29 | return $command; |
| 30 | 30 | } |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | throw $this->instantiator->exceptionUnexpectedType('If', $command); |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - public function ifVar(string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If_Variable |
|
| 35 | + public function ifVar(string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If_Variable |
|
| 36 | 36 | { |
| 37 | 37 | $command = $this->instantiator->buildIfVar('If', $variable, $operand, $value, $quoteValue); |
| 38 | 38 | |
| 39 | - if($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 39 | + if ($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 40 | 40 | { |
| 41 | 41 | return $command; |
| 42 | 42 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | { |
| 49 | 49 | $command = $this->instantiator->buildIfVar('If', $variable, $operand, $value, true); |
| 50 | 50 | |
| 51 | - if($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 51 | + if ($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 52 | 52 | { |
| 53 | 53 | return $command; |
| 54 | 54 | } |
@@ -56,11 +56,11 @@ discard block |
||
| 56 | 56 | throw $this->instantiator->exceptionUnexpectedType('IfVarString', $command); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - public function ifVarEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If_Variable |
|
| 59 | + public function ifVarEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If_Variable |
|
| 60 | 60 | { |
| 61 | 61 | $command = $this->instantiator->buildIfVar('If', $variable, '==', $value, $quoteValue); |
| 62 | 62 | |
| 63 | - if($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 63 | + if ($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 64 | 64 | { |
| 65 | 65 | return $command; |
| 66 | 66 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | { |
| 73 | 73 | $command = $this->instantiator->buildIfVar('If', $variable, '==', $value, true); |
| 74 | 74 | |
| 75 | - if($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 75 | + if ($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 76 | 76 | { |
| 77 | 77 | return $command; |
| 78 | 78 | } |
@@ -80,11 +80,11 @@ discard block |
||
| 80 | 80 | throw $this->instantiator->exceptionUnexpectedType('IfarEqualsString', $command); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - public function ifVarNotEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If_Variable |
|
| 83 | + public function ifVarNotEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If_Variable |
|
| 84 | 84 | { |
| 85 | 85 | $command = $this->instantiator->buildIfVar('If', $variable, '!=', $value, $quoteValue); |
| 86 | 86 | |
| 87 | - if($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 87 | + if ($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 88 | 88 | { |
| 89 | 89 | return $command; |
| 90 | 90 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | { |
| 97 | 97 | $command = $this->instantiator->buildIfVar('If', $variable, '!=', $value, true); |
| 98 | 98 | |
| 99 | - if($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 99 | + if ($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 100 | 100 | { |
| 101 | 101 | return $command; |
| 102 | 102 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | { |
| 109 | 109 | $command = $this->instantiator->buildIfEmpty('If', $variable); |
| 110 | 110 | |
| 111 | - if($command instanceof Mailcode_Commands_Command_If_Empty) |
|
| 111 | + if ($command instanceof Mailcode_Commands_Command_If_Empty) |
|
| 112 | 112 | { |
| 113 | 113 | return $command; |
| 114 | 114 | } |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | { |
| 121 | 121 | $command = $this->instantiator->buildIfNotEmpty('If', $variable); |
| 122 | 122 | |
| 123 | - if($command instanceof Mailcode_Commands_Command_If_NotEmpty) |
|
| 123 | + if ($command instanceof Mailcode_Commands_Command_If_NotEmpty) |
|
| 124 | 124 | { |
| 125 | 125 | return $command; |
| 126 | 126 | } |
@@ -128,11 +128,11 @@ discard block |
||
| 128 | 128 | throw $this->instantiator->exceptionUnexpectedType('IfNotEmpty', $command); |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - public function ifContains(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_Contains |
|
| 131 | + public function ifContains(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_Contains |
|
| 132 | 132 | { |
| 133 | 133 | $command = $this->instantiator->buildIfContains('If', $variable, $search, $caseInsensitive); |
| 134 | 134 | |
| 135 | - if($command instanceof Mailcode_Commands_Command_If_Contains) |
|
| 135 | + if ($command instanceof Mailcode_Commands_Command_If_Contains) |
|
| 136 | 136 | { |
| 137 | 137 | return $command; |
| 138 | 138 | } |
@@ -20,11 +20,11 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class Mailcode_Factory_Instantiator |
| 22 | 22 | { |
| 23 | - public function buildIf(string $ifType, string $params, string $type='') : Mailcode_Commands_IfBase |
|
| 23 | + public function buildIf(string $ifType, string $params, string $type = '') : Mailcode_Commands_IfBase |
|
| 24 | 24 | { |
| 25 | 25 | $stringType = $type; |
| 26 | 26 | |
| 27 | - if(!empty($type)) |
|
| 27 | + if (!empty($type)) |
|
| 28 | 28 | { |
| 29 | 29 | $stringType = ' '.$type; |
| 30 | 30 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | $this->checkCommand($command); |
| 45 | 45 | |
| 46 | - if($command instanceof Mailcode_Commands_IfBase) |
|
| 46 | + if ($command instanceof Mailcode_Commands_IfBase) |
|
| 47 | 47 | { |
| 48 | 48 | return $command; |
| 49 | 49 | } |
@@ -51,9 +51,9 @@ discard block |
||
| 51 | 51 | throw $this->exceptionUnexpectedType('IfBase', $command); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - public function buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_IfBase |
|
| 54 | + public function buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_IfBase |
|
| 55 | 55 | { |
| 56 | - if($quoteValue) |
|
| 56 | + if ($quoteValue) |
|
| 57 | 57 | { |
| 58 | 58 | $value = $this->quoteString($value); |
| 59 | 59 | } |
@@ -78,11 +78,11 @@ discard block |
||
| 78 | 78 | return $this->buildIf($ifType, $this->filterVariableName($variable), 'not-empty'); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - public function buildIfContains(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase |
|
| 81 | + public function buildIfContains(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase |
|
| 82 | 82 | { |
| 83 | 83 | $keyword = ' '; |
| 84 | 84 | |
| 85 | - if($caseInsensitive) |
|
| 85 | + if ($caseInsensitive) |
|
| 86 | 86 | { |
| 87 | 87 | $keyword = ' insensitive: '; |
| 88 | 88 | } |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | |
| 107 | 107 | public function checkCommand(Mailcode_Commands_Command $command) : void |
| 108 | 108 | { |
| 109 | - if($command->isValid()) |
|
| 109 | + if ($command->isValid()) |
|
| 110 | 110 | { |
| 111 | 111 | return; |
| 112 | 112 | } |
@@ -35,14 +35,14 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | private $misc; |
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @var Mailcode_Factory_CommandSets_Set_Set |
|
| 40 | - */ |
|
| 38 | + /** |
|
| 39 | + * @var Mailcode_Factory_CommandSets_Set_Set |
|
| 40 | + */ |
|
| 41 | 41 | private $set; |
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @var Mailcode_Factory_CommandSets_Set_ElseIf |
|
| 45 | - */ |
|
| 43 | + /** |
|
| 44 | + * @var Mailcode_Factory_CommandSets_Set_ElseIf |
|
| 45 | + */ |
|
| 46 | 46 | private $elseIf; |
| 47 | 47 | |
| 48 | 48 | public function if() : Mailcode_Factory_CommandSets_Set_If |
@@ -45,9 +45,9 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | private $elseIf; |
| 47 | 47 | |
| 48 | - public function if() : Mailcode_Factory_CommandSets_Set_If |
|
| 48 | + public function if () : Mailcode_Factory_CommandSets_Set_If |
|
| 49 | 49 | { |
| 50 | - if(!isset($this->if)) |
|
| 50 | + if (!isset($this->if)) |
|
| 51 | 51 | { |
| 52 | 52 | $this->if = new Mailcode_Factory_CommandSets_Set_If(); |
| 53 | 53 | } |
@@ -55,9 +55,9 @@ discard block |
||
| 55 | 55 | return $this->if; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - public function elseIf() : Mailcode_Factory_CommandSets_Set_ElseIf |
|
| 58 | + public function elseIf () : Mailcode_Factory_CommandSets_Set_ElseIf |
|
| 59 | 59 | { |
| 60 | - if(!isset($this->elseIf)) |
|
| 60 | + if (!isset($this->elseIf)) |
|
| 61 | 61 | { |
| 62 | 62 | $this->elseIf = new Mailcode_Factory_CommandSets_Set_ElseIf(); |
| 63 | 63 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | public function show() : Mailcode_Factory_CommandSets_Set_Show |
| 69 | 69 | { |
| 70 | - if(!isset($this->show)) |
|
| 70 | + if (!isset($this->show)) |
|
| 71 | 71 | { |
| 72 | 72 | $this->show = new Mailcode_Factory_CommandSets_Set_Show(); |
| 73 | 73 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | public function misc() : Mailcode_Factory_CommandSets_Set_Misc |
| 79 | 79 | { |
| 80 | - if(!isset($this->misc)) |
|
| 80 | + if (!isset($this->misc)) |
|
| 81 | 81 | { |
| 82 | 82 | $this->misc = new Mailcode_Factory_CommandSets_Set_Misc(); |
| 83 | 83 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | public function set() : Mailcode_Factory_CommandSets_Set_Set |
| 89 | 89 | { |
| 90 | - if(!isset($this->set)) |
|
| 90 | + if (!isset($this->set)) |
|
| 91 | 91 | { |
| 92 | 92 | $this->set = new Mailcode_Factory_CommandSets_Set_Set(); |
| 93 | 93 | } |
@@ -32,27 +32,27 @@ |
||
| 32 | 32 | |
| 33 | 33 | protected function translateBody(Mailcode_Commands_IfBase $command) : string |
| 34 | 34 | { |
| 35 | - if($command instanceof Mailcode_Commands_Command_If_Command) |
|
| 35 | + if ($command instanceof Mailcode_Commands_Command_If_Command) |
|
| 36 | 36 | { |
| 37 | 37 | return $this->translateCommand($command); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - if($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 40 | + if ($command instanceof Mailcode_Commands_Command_If_Variable) |
|
| 41 | 41 | { |
| 42 | 42 | return $this->translateVariable($command); |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - if($command instanceof Mailcode_Commands_Command_If_Contains) |
|
| 45 | + if ($command instanceof Mailcode_Commands_Command_If_Contains) |
|
| 46 | 46 | { |
| 47 | 47 | return $this->translateContains($command); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - if($command instanceof Mailcode_Commands_Command_If_Empty) |
|
| 50 | + if ($command instanceof Mailcode_Commands_Command_If_Empty) |
|
| 51 | 51 | { |
| 52 | 52 | return $this->translateEmpty($command); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - if($command instanceof Mailcode_Commands_Command_If_NotEmpty) |
|
| 55 | + if ($command instanceof Mailcode_Commands_Command_If_NotEmpty) |
|
| 56 | 56 | { |
| 57 | 57 | return $this->translateNotEmpty($command); |
| 58 | 58 | } |
@@ -32,27 +32,27 @@ |
||
| 32 | 32 | |
| 33 | 33 | protected function translateBody(Mailcode_Commands_IfBase $command) : string |
| 34 | 34 | { |
| 35 | - if($command instanceof Mailcode_Commands_Command_ElseIf_Command) |
|
| 35 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_Command) |
|
| 36 | 36 | { |
| 37 | 37 | return $this->translateCommand($command); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - if($command instanceof Mailcode_Commands_Command_ElseIf_Variable) |
|
| 40 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable) |
|
| 41 | 41 | { |
| 42 | 42 | return $this->translateVariable($command); |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - if($command instanceof Mailcode_Commands_Command_ElseIf_Contains) |
|
| 45 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_Contains) |
|
| 46 | 46 | { |
| 47 | 47 | return $this->translateContains($command); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - if($command instanceof Mailcode_Commands_Command_ElseIf_Empty) |
|
| 50 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_Empty) |
|
| 51 | 51 | { |
| 52 | 52 | return $this->translateEmpty($command); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - if($command instanceof Mailcode_Commands_Command_ElseIf_NotEmpty) |
|
| 55 | + if ($command instanceof Mailcode_Commands_Command_ElseIf_NotEmpty) |
|
| 56 | 56 | { |
| 57 | 57 | return $this->translateNotEmpty($command); |
| 58 | 58 | } |
@@ -32,44 +32,44 @@ discard block |
||
| 32 | 32 | const VALIDATION_UNKNOWN_COMMAND_NAME = 48304; |
| 33 | 33 | const VALIDATION_INVALID_PARAMS_STATEMENT = 48305; |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @var string |
|
| 37 | - */ |
|
| 35 | + /** |
|
| 36 | + * @var string |
|
| 37 | + */ |
|
| 38 | 38 | protected $type = ''; |
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * @var string |
|
| 42 | - */ |
|
| 40 | + /** |
|
| 41 | + * @var string |
|
| 42 | + */ |
|
| 43 | 43 | protected $paramsString = ''; |
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @var string |
|
| 47 | - */ |
|
| 45 | + /** |
|
| 46 | + * @var string |
|
| 47 | + */ |
|
| 48 | 48 | protected $matchedText = ''; |
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @var string |
|
| 52 | - */ |
|
| 50 | + /** |
|
| 51 | + * @var string |
|
| 52 | + */ |
|
| 53 | 53 | protected $hash = ''; |
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * @var \AppUtils\OperationResult |
|
| 57 | - */ |
|
| 55 | + /** |
|
| 56 | + * @var \AppUtils\OperationResult |
|
| 57 | + */ |
|
| 58 | 58 | protected $validationResult = null; |
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * @var \Mailcode\Mailcode |
|
| 62 | - */ |
|
| 60 | + /** |
|
| 61 | + * @var \Mailcode\Mailcode |
|
| 62 | + */ |
|
| 63 | 63 | protected $mailcode; |
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * @var \Mailcode\Mailcode_Parser_Statement |
|
| 67 | - */ |
|
| 65 | + /** |
|
| 66 | + * @var \Mailcode\Mailcode_Parser_Statement |
|
| 67 | + */ |
|
| 68 | 68 | protected $params; |
| 69 | 69 | |
| 70 | - /** |
|
| 71 | - * @var string[] |
|
| 72 | - */ |
|
| 70 | + /** |
|
| 71 | + * @var string[] |
|
| 72 | + */ |
|
| 73 | 73 | protected $validations = array( |
| 74 | 74 | 'params_empty', |
| 75 | 75 | 'params_keywords', |
@@ -78,14 +78,14 @@ discard block |
||
| 78 | 78 | 'type_unsupported' |
| 79 | 79 | ); |
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * @var string |
|
| 83 | - */ |
|
| 81 | + /** |
|
| 82 | + * @var string |
|
| 83 | + */ |
|
| 84 | 84 | protected $comment = ''; |
| 85 | 85 | |
| 86 | - /** |
|
| 87 | - * @var Mailcode_Commands_LogicKeywords|NULL |
|
| 88 | - */ |
|
| 86 | + /** |
|
| 87 | + * @var Mailcode_Commands_LogicKeywords|NULL |
|
| 88 | + */ |
|
| 89 | 89 | protected $logicKeywords; |
| 90 | 90 | |
| 91 | 91 | public function __construct(string $type='', string $paramsString='', string $matchedText='') |
@@ -103,9 +103,9 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - /** |
|
| 107 | - * @return string The ID of the command = the name of the command class file. |
|
| 108 | - */ |
|
| 106 | + /** |
|
| 107 | + * @return string The ID of the command = the name of the command class file. |
|
| 108 | + */ |
|
| 109 | 109 | public function getID() : string |
| 110 | 110 | { |
| 111 | 111 | // account for commands with types: If_Variable should still return If. |
@@ -114,14 +114,14 @@ discard block |
||
| 114 | 114 | return array_shift($tokens); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - /** |
|
| 118 | - * Sets an optional comment that is not used anywhere, but |
|
| 119 | - * can be used by the application to track why a command is |
|
| 120 | - * used somewhere. |
|
| 121 | - * |
|
| 122 | - * @param string $comment |
|
| 123 | - * @return Mailcode_Commands_Command |
|
| 124 | - */ |
|
| 117 | + /** |
|
| 118 | + * Sets an optional comment that is not used anywhere, but |
|
| 119 | + * can be used by the application to track why a command is |
|
| 120 | + * used somewhere. |
|
| 121 | + * |
|
| 122 | + * @param string $comment |
|
| 123 | + * @return Mailcode_Commands_Command |
|
| 124 | + */ |
|
| 125 | 125 | public function setComment(string $comment) : Mailcode_Commands_Command |
| 126 | 126 | { |
| 127 | 127 | $this->comment = $comment; |
@@ -129,34 +129,34 @@ discard block |
||
| 129 | 129 | return $this; |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - /** |
|
| 133 | - * Retrieves the previously set comment, if any. |
|
| 134 | - * |
|
| 135 | - * @return string |
|
| 136 | - */ |
|
| 132 | + /** |
|
| 133 | + * Retrieves the previously set comment, if any. |
|
| 134 | + * |
|
| 135 | + * @return string |
|
| 136 | + */ |
|
| 137 | 137 | public function getComment() : string |
| 138 | 138 | { |
| 139 | 139 | return $this->comment; |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | - /** |
|
| 143 | - * Checks whether this is a dummy command, which is only |
|
| 144 | - * used to access information on the command type. It cannot |
|
| 145 | - * be used as an actual live command. |
|
| 146 | - * |
|
| 147 | - * @return bool |
|
| 148 | - */ |
|
| 142 | + /** |
|
| 143 | + * Checks whether this is a dummy command, which is only |
|
| 144 | + * used to access information on the command type. It cannot |
|
| 145 | + * be used as an actual live command. |
|
| 146 | + * |
|
| 147 | + * @return bool |
|
| 148 | + */ |
|
| 149 | 149 | public function isDummy() : bool |
| 150 | 150 | { |
| 151 | 151 | return $this->type === '__dummy'; |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - /** |
|
| 155 | - * Retrieves a hash of the actual matched command string, |
|
| 156 | - * which is used in collections to detect duplicate commands. |
|
| 157 | - * |
|
| 158 | - * @return string |
|
| 159 | - */ |
|
| 154 | + /** |
|
| 155 | + * Retrieves a hash of the actual matched command string, |
|
| 156 | + * which is used in collections to detect duplicate commands. |
|
| 157 | + * |
|
| 158 | + * @return string |
|
| 159 | + */ |
|
| 160 | 160 | public function getHash() : string |
| 161 | 161 | { |
| 162 | 162 | $this->requireNonDummy(); |
@@ -253,9 +253,9 @@ discard block |
||
| 253 | 253 | return $this->validationResult->isValid(); |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | - /** |
|
| 257 | - * @return string[] |
|
| 258 | - */ |
|
| 256 | + /** |
|
| 257 | + * @return string[] |
|
| 258 | + */ |
|
| 259 | 259 | abstract protected function getValidations() : array; |
| 260 | 260 | |
| 261 | 261 | protected function validateSyntax_params_empty() : void |
@@ -410,12 +410,12 @@ discard block |
||
| 410 | 410 | |
| 411 | 411 | abstract public function supportsType() : bool; |
| 412 | 412 | |
| 413 | - /** |
|
| 414 | - * Whether the command allows using logic keywords like "and:" or "or:" |
|
| 415 | - * in the command parameters. |
|
| 416 | - * |
|
| 417 | - * @return bool |
|
| 418 | - */ |
|
| 413 | + /** |
|
| 414 | + * Whether the command allows using logic keywords like "and:" or "or:" |
|
| 415 | + * in the command parameters. |
|
| 416 | + * |
|
| 417 | + * @return bool |
|
| 418 | + */ |
|
| 419 | 419 | abstract public function supportsLogicKeywords() : bool; |
| 420 | 420 | |
| 421 | 421 | abstract public function generatesContent() : bool; |
@@ -461,22 +461,22 @@ discard block |
||
| 461 | 461 | return $normalizer->normalize(); |
| 462 | 462 | } |
| 463 | 463 | |
| 464 | - /** |
|
| 465 | - * Retrieves the names of all the command's supported types: the part |
|
| 466 | - * between the command name and the colon. Example: {command type: params}. |
|
| 467 | - * |
|
| 468 | - * @return string[] |
|
| 469 | - */ |
|
| 464 | + /** |
|
| 465 | + * Retrieves the names of all the command's supported types: the part |
|
| 466 | + * between the command name and the colon. Example: {command type: params}. |
|
| 467 | + * |
|
| 468 | + * @return string[] |
|
| 469 | + */ |
|
| 470 | 470 | public function getSupportedTypes() : array |
| 471 | 471 | { |
| 472 | 472 | return array(); |
| 473 | 473 | } |
| 474 | 474 | |
| 475 | - /** |
|
| 476 | - * Retrieves all variable names used in the command. |
|
| 477 | - * |
|
| 478 | - * @return Mailcode_Variables_Collection_Regular |
|
| 479 | - */ |
|
| 475 | + /** |
|
| 476 | + * Retrieves all variable names used in the command. |
|
| 477 | + * |
|
| 478 | + * @return Mailcode_Variables_Collection_Regular |
|
| 479 | + */ |
|
| 480 | 480 | public function getVariables() : Mailcode_Variables_Collection_Regular |
| 481 | 481 | { |
| 482 | 482 | return Mailcode::create()->findVariables($this->paramsString); |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | protected $logicKeywords; |
| 90 | 90 | |
| 91 | - public function __construct(string $type='', string $paramsString='', string $matchedText='') |
|
| 91 | + public function __construct(string $type = '', string $paramsString = '', string $matchedText = '') |
|
| 92 | 92 | { |
| 93 | 93 | $this->type = $type; |
| 94 | 94 | $this->paramsString = html_entity_decode($paramsString); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | { |
| 162 | 162 | $this->requireNonDummy(); |
| 163 | 163 | |
| 164 | - if($this->hash === '') { |
|
| 164 | + if ($this->hash === '') { |
|
| 165 | 165 | $this->hash = md5($this->matchedText); |
| 166 | 166 | } |
| 167 | 167 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | protected function requireNonDummy() : void |
| 172 | 172 | { |
| 173 | - if(!$this->isDummy()) |
|
| 173 | + if (!$this->isDummy()) |
|
| 174 | 174 | { |
| 175 | 175 | return; |
| 176 | 176 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | { |
| 192 | 192 | $this->requireNonDummy(); |
| 193 | 193 | |
| 194 | - if(isset($this->validationResult)) |
|
| 194 | + if (isset($this->validationResult)) |
|
| 195 | 195 | { |
| 196 | 196 | return $this->validationResult; |
| 197 | 197 | } |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | |
| 206 | 206 | public function getValidationResult() : \AppUtils\OperationResult |
| 207 | 207 | { |
| 208 | - if(isset($this->validationResult)) |
|
| 208 | + if (isset($this->validationResult)) |
|
| 209 | 209 | { |
| 210 | 210 | return $this->validationResult; |
| 211 | 211 | } |
@@ -221,10 +221,10 @@ discard block |
||
| 221 | 221 | { |
| 222 | 222 | $validations = array_merge($this->validations, $this->getValidations()); |
| 223 | 223 | |
| 224 | - foreach($validations as $validation) |
|
| 224 | + foreach ($validations as $validation) |
|
| 225 | 225 | { |
| 226 | 226 | // break off at the first validation issue |
| 227 | - if(!$this->validateSyntaxMethod($validation)) |
|
| 227 | + if (!$this->validateSyntaxMethod($validation)) |
|
| 228 | 228 | { |
| 229 | 229 | return; |
| 230 | 230 | } |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | { |
| 236 | 236 | $method = 'validateSyntax_'.$validation; |
| 237 | 237 | |
| 238 | - if(!method_exists($this, $method)) |
|
| 238 | + if (!method_exists($this, $method)) |
|
| 239 | 239 | { |
| 240 | 240 | throw new Mailcode_Exception( |
| 241 | 241 | 'Missing validation method', |
@@ -260,12 +260,12 @@ discard block |
||
| 260 | 260 | |
| 261 | 261 | protected function validateSyntax_params_empty() : void |
| 262 | 262 | { |
| 263 | - if(!$this->requiresParameters()) |
|
| 263 | + if (!$this->requiresParameters()) |
|
| 264 | 264 | { |
| 265 | 265 | return; |
| 266 | 266 | } |
| 267 | 267 | |
| 268 | - if(empty($this->paramsString)) |
|
| 268 | + if (empty($this->paramsString)) |
|
| 269 | 269 | { |
| 270 | 270 | $this->validationResult->makeError( |
| 271 | 271 | t('Parameters have to be specified.'), |
@@ -277,14 +277,14 @@ discard block |
||
| 277 | 277 | |
| 278 | 278 | protected function validateSyntax_params_keywords() : void |
| 279 | 279 | { |
| 280 | - if(!$this->supportsLogicKeywords()) |
|
| 280 | + if (!$this->supportsLogicKeywords()) |
|
| 281 | 281 | { |
| 282 | 282 | return; |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | $this->logicKeywords = new Mailcode_Commands_LogicKeywords($this, $this->paramsString); |
| 286 | 286 | |
| 287 | - if(!$this->logicKeywords->isValid()) |
|
| 287 | + if (!$this->logicKeywords->isValid()) |
|
| 288 | 288 | { |
| 289 | 289 | $this->validationResult->makeError( |
| 290 | 290 | t('Invalid parameters:').' '.$this->logicKeywords->getErrorMessage(), |
@@ -299,14 +299,14 @@ discard block |
||
| 299 | 299 | |
| 300 | 300 | protected function validateSyntax_params_parse() : void |
| 301 | 301 | { |
| 302 | - if(!$this->requiresParameters()) |
|
| 302 | + if (!$this->requiresParameters()) |
|
| 303 | 303 | { |
| 304 | 304 | return; |
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | $this->params = $this->mailcode->getParser()->createStatement($this->paramsString); |
| 308 | 308 | |
| 309 | - if(!$this->params->isValid()) |
|
| 309 | + if (!$this->params->isValid()) |
|
| 310 | 310 | { |
| 311 | 311 | $error = $this->params->getValidationResult(); |
| 312 | 312 | |
@@ -319,14 +319,14 @@ discard block |
||
| 319 | 319 | |
| 320 | 320 | protected function validateSyntax_type_supported() : void |
| 321 | 321 | { |
| 322 | - if(!$this->supportsType() || empty($this->type)) |
|
| 322 | + if (!$this->supportsType() || empty($this->type)) |
|
| 323 | 323 | { |
| 324 | 324 | return; |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | $types = $this->getSupportedTypes(); |
| 328 | 328 | |
| 329 | - if(!in_array($this->type, $types)) |
|
| 329 | + if (!in_array($this->type, $types)) |
|
| 330 | 330 | { |
| 331 | 331 | $this->validationResult->makeError( |
| 332 | 332 | t('The command addon %1$s is not supported.', $this->type).' '. |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | |
| 341 | 341 | protected function validateSyntax_type_unsupported() : void |
| 342 | 342 | { |
| 343 | - if($this->supportsType() || empty($this->type)) |
|
| 343 | + if ($this->supportsType() || empty($this->type)) |
|
| 344 | 344 | { |
| 345 | 345 | return; |
| 346 | 346 | } |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | |
| 359 | 359 | public function getType() : string |
| 360 | 360 | { |
| 361 | - if($this->supportsType()) |
|
| 361 | + if ($this->supportsType()) |
|
| 362 | 362 | { |
| 363 | 363 | return $this->type; |
| 364 | 364 | } |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | |
| 379 | 379 | public function getHighlighted() : string |
| 380 | 380 | { |
| 381 | - if(!$this->isValid()) |
|
| 381 | + if (!$this->isValid()) |
|
| 382 | 382 | { |
| 383 | 383 | return ''; |
| 384 | 384 | } |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | |
| 390 | 390 | public function getParamsString() : string |
| 391 | 391 | { |
| 392 | - if($this->requiresParameters()) |
|
| 392 | + if ($this->requiresParameters()) |
|
| 393 | 393 | { |
| 394 | 394 | return $this->paramsString; |
| 395 | 395 | } |
@@ -424,22 +424,22 @@ discard block |
||
| 424 | 424 | |
| 425 | 425 | public final function getCommandType() : string |
| 426 | 426 | { |
| 427 | - if($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
| 427 | + if ($this instanceof Mailcode_Commands_Command_Type_Closing) |
|
| 428 | 428 | { |
| 429 | 429 | return 'Closing'; |
| 430 | 430 | } |
| 431 | 431 | |
| 432 | - if($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 432 | + if ($this instanceof Mailcode_Commands_Command_Type_Opening) |
|
| 433 | 433 | { |
| 434 | 434 | return 'Opening'; |
| 435 | 435 | } |
| 436 | 436 | |
| 437 | - if($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
| 437 | + if ($this instanceof Mailcode_Commands_Command_Type_Sibling) |
|
| 438 | 438 | { |
| 439 | 439 | return 'Sibling'; |
| 440 | 440 | } |
| 441 | 441 | |
| 442 | - if($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
| 442 | + if ($this instanceof Mailcode_Commands_Command_Type_Standalone) |
|
| 443 | 443 | { |
| 444 | 444 | return 'Standalone'; |
| 445 | 445 | } |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | |
| 490 | 490 | public function getLogicKeywords() : Mailcode_Commands_LogicKeywords |
| 491 | 491 | { |
| 492 | - if($this->supportsLogicKeywords() && isset($this->logicKeywords)) |
|
| 492 | + if ($this->supportsLogicKeywords() && isset($this->logicKeywords)) |
|
| 493 | 493 | { |
| 494 | 494 | return $this->logicKeywords; |
| 495 | 495 | } |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | public function normalize() : string |
| 39 | 39 | { |
| 40 | - if(!$this->command->isValid()) |
|
| 40 | + if (!$this->command->isValid()) |
|
| 41 | 41 | { |
| 42 | 42 | return ''; |
| 43 | 43 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | private function addType() : void |
| 59 | 59 | { |
| 60 | - if(!$this->command->supportsType() || !$this->command->hasType()) |
|
| 60 | + if (!$this->command->supportsType() || !$this->command->hasType()) |
|
| 61 | 61 | { |
| 62 | 62 | return; |
| 63 | 63 | } |
@@ -67,14 +67,14 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | private function addParams(Mailcode_Commands_Command $command) : void |
| 69 | 69 | { |
| 70 | - if(!$command->requiresParameters()) |
|
| 70 | + if (!$command->requiresParameters()) |
|
| 71 | 71 | { |
| 72 | 72 | return; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $params = $command->getParams(); |
| 76 | 76 | |
| 77 | - if($params === null) |
|
| 77 | + if ($params === null) |
|
| 78 | 78 | { |
| 79 | 79 | return; |
| 80 | 80 | } |
@@ -85,14 +85,14 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | private function addLogicKeywords() : void |
| 87 | 87 | { |
| 88 | - if(!$this->command->supportsLogicKeywords()) |
|
| 88 | + if (!$this->command->supportsLogicKeywords()) |
|
| 89 | 89 | { |
| 90 | 90 | return; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | $keywords = $this->command->getLogicKeywords()->getKeywords(); |
| 94 | 94 | |
| 95 | - foreach($keywords as $keyword) |
|
| 95 | + foreach ($keywords as $keyword) |
|
| 96 | 96 | { |
| 97 | 97 | $this->parts[] = ' '; |
| 98 | 98 | $this->parts[] = $keyword->getKeywordString(); // e.g. "if variable" |
@@ -33,11 +33,11 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | $keywords = $command->getLogicKeywords()->getKeywords(); |
| 35 | 35 | |
| 36 | - foreach($keywords as $keyword) |
|
| 36 | + foreach ($keywords as $keyword) |
|
| 37 | 37 | { |
| 38 | 38 | $keyCommand = $keyword->getCommand(); |
| 39 | 39 | |
| 40 | - if($keyCommand instanceof Mailcode_Commands_IfBase) |
|
| 40 | + if ($keyCommand instanceof Mailcode_Commands_IfBase) |
|
| 41 | 41 | { |
| 42 | 42 | $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand); |
| 43 | 43 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | protected function getSign(Mailcode_Commands_LogicKeywords_Keyword $keyword) : string |
| 62 | 62 | { |
| 63 | - switch($keyword->getName()) |
|
| 63 | + switch ($keyword->getName()) |
|
| 64 | 64 | { |
| 65 | 65 | case 'and': |
| 66 | 66 | return '&&'; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | { |
| 84 | 84 | $sign = ''; |
| 85 | 85 | |
| 86 | - if($notEmpty) |
|
| 86 | + if ($notEmpty) |
|
| 87 | 87 | { |
| 88 | 88 | $sign = '!'; |
| 89 | 89 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | { |
| 100 | 100 | $params = $command->getParams(); |
| 101 | 101 | |
| 102 | - if(!$params) |
|
| 102 | + if (!$params) |
|
| 103 | 103 | { |
| 104 | 104 | return ''; |
| 105 | 105 | } |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | protected function _translateContains(Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string |
| 121 | 121 | { |
| 122 | 122 | $opts = 's'; |
| 123 | - if($caseSensitive) |
|
| 123 | + if ($caseSensitive) |
|
| 124 | 124 | { |
| 125 | 125 | $opts = 'is'; |
| 126 | 126 | } |
@@ -40,8 +40,7 @@ |
||
| 40 | 40 | if($keyCommand instanceof Mailcode_Commands_IfBase) |
| 41 | 41 | { |
| 42 | 42 | $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand); |
| 43 | - } |
|
| 44 | - else |
|
| 43 | + } else |
|
| 45 | 44 | { |
| 46 | 45 | throw new Mailcode_Exception( |
| 47 | 46 | 'Keyword command type does not match expected base class.', |