@@ -12,7 +12,7 @@ |
||
| 12 | 12 | $autoload = realpath($root.'/../vendor/autoload.php'); |
| 13 | 13 | |
| 14 | 14 | // we need the autoloader to be present |
| 15 | - if($autoload === false) |
|
| 15 | + if ($autoload === false) |
|
| 16 | 16 | { |
| 17 | 17 | die('<b>ERROR:</b> Autoloader not present. Run composer update first.'); |
| 18 | 18 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection |
| 34 | 34 | { |
| 35 | - if(!$variable->isValid()) |
|
| 35 | + if (!$variable->isValid()) |
|
| 36 | 36 | { |
| 37 | 37 | return $this->addInvalid($variable); |
| 38 | 38 | } |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | parent::mergeWith($collection); |
| 77 | 77 | |
| 78 | 78 | // also inherit any invalid variables |
| 79 | - if($collection instanceof Mailcode_Variables_Collection_Regular) |
|
| 79 | + if ($collection instanceof Mailcode_Variables_Collection_Regular) |
|
| 80 | 80 | { |
| 81 | 81 | $invalid = $collection->getInvalid(); |
| 82 | 82 | |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | */ |
| 24 | 24 | function init() : void |
| 25 | 25 | { |
| 26 | - if(!class_exists('\AppLocalize\Localization')) { |
|
| 26 | + if (!class_exists('\AppLocalize\Localization')) { |
|
| 27 | 27 | return; |
| 28 | 28 | } |
| 29 | 29 | |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | * @param \Exception|NULL $previous |
| 33 | 33 | * @param Mailcode_Commands_Command|NULL $command |
| 34 | 34 | */ |
| 35 | - public function __construct(string $message, $details=null, $code=null, $previous=null, Mailcode_Commands_Command $command=null) |
|
| 35 | + public function __construct(string $message, $details = null, $code = null, $previous = null, Mailcode_Commands_Command $command = null) |
|
| 36 | 36 | { |
| 37 | 37 | parent::__construct($message, $details, $code, $previous); |
| 38 | 38 | |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | */ |
| 88 | 88 | public function getTypeLabel() : string |
| 89 | 89 | { |
| 90 | - switch($this->type) |
|
| 90 | + switch ($this->type) |
|
| 91 | 91 | { |
| 92 | 92 | case Mailcode_Date_FormatInfo::CHARTYPE_DATE: |
| 93 | 93 | return t('Date'); |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | |
| 32 | 32 | $this->instantiator->checkCommand($cmd); |
| 33 | 33 | |
| 34 | - if($cmd instanceof Mailcode_Commands_Command_Else) |
|
| 34 | + if ($cmd instanceof Mailcode_Commands_Command_Else) |
|
| 35 | 35 | { |
| 36 | 36 | return $cmd; |
| 37 | 37 | } |
@@ -20,7 +20,8 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | abstract class Mailcode_Factory_CommandSets_IfBase extends Mailcode_Factory_CommandSets_Set |
| 22 | 22 | { |
| 23 | - public function else() : Mailcode_Commands_Command_Else |
|
| 23 | + public function else { |
|
| 24 | + () : Mailcode_Commands_Command_Else |
|
| 24 | 25 | { |
| 25 | 26 | $cmd = Mailcode::create()->getCommands()->createCommand( |
| 26 | 27 | 'Else', |
@@ -28,6 +29,7 @@ discard block |
||
| 28 | 29 | '', |
| 29 | 30 | '{else}' |
| 30 | 31 | ); |
| 32 | + } |
|
| 31 | 33 | |
| 32 | 34 | $this->instantiator->checkCommand($cmd); |
| 33 | 35 | |
@@ -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.', |
@@ -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 '&&'; |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | { |
| 114 | 114 | $sign = ''; |
| 115 | 115 | |
| 116 | - if($notEmpty) |
|
| 116 | + if ($notEmpty) |
|
| 117 | 117 | { |
| 118 | 118 | $sign = '!'; |
| 119 | 119 | } |
@@ -129,12 +129,12 @@ discard block |
||
| 129 | 129 | { |
| 130 | 130 | $params = $command->getParams(); |
| 131 | 131 | |
| 132 | - if(!$params) |
|
| 132 | + if (!$params) |
|
| 133 | 133 | { |
| 134 | 134 | return ''; |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - if($command->hasFreeformParameters()) |
|
| 137 | + if ($command->hasFreeformParameters()) |
|
| 138 | 138 | { |
| 139 | 139 | return $params->getStatementString(); |
| 140 | 140 | } |
@@ -142,18 +142,18 @@ discard block |
||
| 142 | 142 | return $params->getNormalized(); |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - protected function _translateVariable(Mailcode_Variables_Variable $variable, string $comparator, string $value, bool $insensitive=false) : string |
|
| 145 | + protected function _translateVariable(Mailcode_Variables_Variable $variable, string $comparator, string $value, bool $insensitive = false) : string |
|
| 146 | 146 | { |
| 147 | 147 | $booleanCheck = strtolower(trim($value, '"')); |
| 148 | 148 | $fullName = $variable->getFullName(); |
| 149 | 149 | |
| 150 | - if(in_array($booleanCheck, array('true', 'false'))) |
|
| 150 | + if (in_array($booleanCheck, array('true', 'false'))) |
|
| 151 | 151 | { |
| 152 | 152 | $insensitive = true; |
| 153 | 153 | $value = '"'.$booleanCheck.'"'; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - if($insensitive) |
|
| 156 | + if ($insensitive) |
|
| 157 | 157 | { |
| 158 | 158 | $fullName .= '.toLowerCase()'; |
| 159 | 159 | $value = mb_strtolower($value); |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | protected function _translateSearch(string $mode, Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string |
| 186 | 186 | { |
| 187 | 187 | $method = $mode.'With'; |
| 188 | - if($caseSensitive) |
|
| 188 | + if ($caseSensitive) |
|
| 189 | 189 | { |
| 190 | 190 | $method = $mode.'WithIgnoreCase'; |
| 191 | 191 | } |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | $folder = sprintf(__DIR__.'/../../css/%s', $this->fileName); |
| 40 | 40 | $path = realpath($folder); |
| 41 | 41 | |
| 42 | - if($path === false) |
|
| 42 | + if ($path === false) |
|
| 43 | 43 | { |
| 44 | 44 | throw new Mailcode_Exception( |
| 45 | 45 | 'Could not find the highlight CSS file', |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | { |
| 91 | 91 | $string = $this->name; |
| 92 | 92 | |
| 93 | - if(!empty($this->keywordType)) |
|
| 93 | + if (!empty($this->keywordType)) |
|
| 94 | 94 | { |
| 95 | 95 | $string .= ' '.$this->keywordType; |
| 96 | 96 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | */ |
| 119 | 119 | public function setParamsString(string $params) : void |
| 120 | 120 | { |
| 121 | - if($this->paramsSet) |
|
| 121 | + if ($this->paramsSet) |
|
| 122 | 122 | { |
| 123 | 123 | throw new Mailcode_Exception( |
| 124 | 124 | 'Cannot set parameters twice', |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | $command = $this->collection->getFirstCommand(); |
| 162 | 162 | |
| 163 | - if($command === null) |
|
| 163 | + if ($command === null) |
|
| 164 | 164 | { |
| 165 | 165 | $this->makeError( |
| 166 | 166 | t('No command could be created using the following string:').' '. |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | return; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - if(!$command->isValid()) |
|
| 175 | + if (!$command->isValid()) |
|
| 176 | 176 | { |
| 177 | 177 | $this->makeError( |
| 178 | 178 | t('Invalid command created:').' '. |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | { |
| 193 | 193 | $command = $this->collection->getFirstCommand(); |
| 194 | 194 | |
| 195 | - if($command !== null && $command->isValid()) |
|
| 195 | + if ($command !== null && $command->isValid()) |
|
| 196 | 196 | { |
| 197 | 197 | return $command; |
| 198 | 198 | } |