Mistralys / mailcode

src/Mailcode/Translator/Syntax/ApacheVelocity/ShowVariable.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         $varName = ltrim($command->getVariableName(), '$');
 
         // Automatically URL escape the variable if it's in an URL.
-        if($command->isURLEncoded())
+        if ($command->isURLEncoded())
         {
             return sprintf(
                 '${esc.url($%s)}',

src/Mailcode/Translator/Syntax/ApacheVelocity/ShowDate.php

Spacing +4 added lines, -4 removed lines

@@ -56,12 +56,12 @@ 
         $varName = ltrim($command->getVariableName(), '$');
         $javaFormat = $this->translateFormat($command->getFormatString());
 
-        if(empty($internalFormat))
+        if (empty($internalFormat))
         {
             $internalFormat = self::DEFAULT_INTERNAL_FORMAT;
         }
 
-        if($command->isURLEncoded())
+        if ($command->isURLEncoded())
         {
             return sprintf(
                 '${esc.url($date.format("%s", $date.toDate("%s", $%s)))}',
@@ -84,9 +84,9 @@ 
         $chars = ConvertHelper::string2array($formatString);
         $result = array();
         
-        foreach($chars as $char)
+        foreach ($chars as $char)
         {
-            if(!isset($this->charTable[$char]))
+            if (!isset($this->charTable[$char]))
             {
                 throw new Mailcode_Translator_Exception(
                     'Unknown date format string character',

src/Mailcode/Translator/Syntax/ApacheVelocity/ShowSnippet.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     {
         $varName = ltrim($command->getVariableName(), '$');
 
-        if($command->isURLEncoded())
+        if ($command->isURLEncoded())
         {
             return sprintf(
                 '${esc.url($%s.replaceAll($esc.newline, "<br/>"))}',

src/Mailcode/Translator/Syntax/ApacheVelocity/ShowNumber.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
             $locale
         );
 
-        if($command->isURLEncoded())
+        if ($command->isURLEncoded())
         {
             return sprintf(
                 '${esc.url($%s)}',
@@ -92,7 +92,7 @@ 
             $dc = '_';
         }
 
-        $type = $th . $dc;
+        $type = $th.$dc;
 
         if (isset($this->typeLocales[$type])) {
             return $this->typeLocales[$type];
@@ -105,12 +105,12 @@ 
     {
         $result = '#';
 
-        if($format->hasThousandsSeparator())
+        if ($format->hasThousandsSeparator())
         {
             $result = '#,###';
         }
 
-        if($format->hasDecimals())
+        if ($format->hasDecimals())
         {
             $result .= '.'.str_repeat('#', $format->getDecimals());
         }

src/Mailcode/Factory.php

Spacing +21 added lines, -21 removed lines

@@ -47,7 +47,7 @@ 
      * @param string $formatString A date format string, or empty string for default.
      * @return Mailcode_Commands_Command_ShowDate
      */
-    public static function showDate(string $variableName, string $formatString="") : Mailcode_Commands_Command_ShowDate
+    public static function showDate(string $variableName, string $formatString = "") : Mailcode_Commands_Command_ShowDate
     {
         return self::$commandSets->show()->showDate($variableName, $formatString);
     }
@@ -60,7 +60,7 @@ 
      * @param string $formatString A number format string, or empty string for default.
      * @return Mailcode_Commands_Command_ShowNumber
      */
-    public static function showNumber(string $variableName, string $formatString="") : Mailcode_Commands_Command_ShowNumber
+    public static function showNumber(string $variableName, string $formatString = "") : Mailcode_Commands_Command_ShowNumber
     {
         return self::$commandSets->show()->showNumber($variableName, $formatString);
     }
@@ -87,7 +87,7 @@ 
     * 
     * @see Mailcode_Factory::ERROR_INVALID_COMMAND_CREATED
     */
-    public static function setVar(string $variableName, string $value, bool $quoteValue=true) : Mailcode_Commands_Command_SetVariable
+    public static function setVar(string $variableName, string $value, bool $quoteValue = true) : Mailcode_Commands_Command_SetVariable
     {
         return self::$commandSets->set()->setVar($variableName, $value, $quoteValue);
     }
@@ -120,12 +120,12 @@ 
         return self::$commandSets->if()->end();
     }
     
-    public static function if(string $condition, string $type='') : Mailcode_Commands_Command_If
+    public static function if (string $condition, string $type = '') : Mailcode_Commands_Command_If
     {
         return self::$commandSets->if()->if($condition, $type);
     }
     
-    public static function ifVar(string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If_Variable
+    public static function ifVar(string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If_Variable
     {
         return self::$commandSets->if()->ifVar($variable, $operand, $value, $quoteValue);
     }
@@ -135,7 +135,7 @@ 
         return self::$commandSets->if()->ifVarString($variable, $operand, $value);
     }
     
-    public static function ifVarEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If_Variable
+    public static function ifVarEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If_Variable
     {
         return self::$commandSets->if()->ifVarEquals($variable, $value, $quoteValue);
     }
@@ -145,7 +145,7 @@ 
         return self::$commandSets->if()->ifVarEqualsString($variable, $value);
     }
     
-    public static function ifVarNotEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If_Variable
+    public static function ifVarNotEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If_Variable
     {
         return self::$commandSets->if()->ifVarNotEquals($variable, $value, $quoteValue);
     }
@@ -155,7 +155,7 @@ 
         return self::$commandSets->if()->ifVarNotEqualsString($variable, $value);
     }
     
-    public static function elseIf(string $condition, string $type='') : Mailcode_Commands_Command_ElseIf
+    public static function elseIf (string $condition, string $type = '') : Mailcode_Commands_Command_ElseIf
     {
         return self::$commandSets->elseIf()->elseIf($condition, $type);
     }
@@ -170,7 +170,7 @@ 
         return self::$commandSets->elseIf()->elseIfNotEmpty($variable);
     }
     
-    public static function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public static function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         return self::$commandSets->elseIf()->elseIfVar($variable, $operand, $value, $quoteValue);
     }
@@ -180,7 +180,7 @@ 
         return self::$commandSets->elseIf()->elseIfVarString($variable, $operand, $value);
     }
     
-    public static function elseIfVarEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public static function elseIfVarEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         return self::$commandSets->elseIf()->elseIfVarEquals($variable, $value, $quoteValue);
     }
@@ -190,7 +190,7 @@ 
         return self::$commandSets->elseIf()->elseIfVarEqualsString($variable, $value);
     }
     
-    public static function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public static function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         return self::$commandSets->elseIf()->elseIfVarNotEquals($variable, $value, $quoteValue);
     }
@@ -200,7 +200,7 @@ 
         return self::$commandSets->elseIf()->elseIfVarNotEqualsString($variable, $value);
     }
 
-    public static function ifBeginsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_BeginsWith
+    public static function ifBeginsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_BeginsWith
     {
         return self::$commandSets->if()->ifBeginsWith($variable, $search, $caseInsensitive);
     }
@@ -220,22 +220,22 @@ 
         return self::$commandSets->if()->ifVarEqualsNumber($variable, $number);
     }
 
-    public static function ifEndsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_EndsWith
+    public static function ifEndsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_EndsWith
     {
         return self::$commandSets->if()->ifEndsWith($variable, $search, $caseInsensitive);
     }
 
-    public static function elseIfBeginsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_BeginsWith
+    public static function elseIfBeginsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_BeginsWith
     {
         return self::$commandSets->elseIf()->elseIfBeginsWith($variable, $search, $caseInsensitive);
     }
     
-    public static function elseIfEndsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_EndsWith
+    public static function elseIfEndsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_EndsWith
     {
         return self::$commandSets->elseIf()->elseIfEndsWith($variable, $search, $caseInsensitive);
     }
     
-    public static function ifContains(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_Contains
+    public static function ifContains(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_Contains
     {
         return self::$commandSets->if()->ifContains($variable, array($search), $caseInsensitive);
     }
@@ -263,12 +263,12 @@ 
     * @param bool $caseInsensitive
     * @return Mailcode_Commands_Command_If_Contains
     */
-    public static function ifContainsAny(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_Contains
+    public static function ifContainsAny(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_Contains
     {
         return self::$commandSets->if()->ifContains($variable, $searchTerms, $caseInsensitive);
     }
     
-    public static function elseIfContains(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_Contains
+    public static function elseIfContains(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_Contains
     {
         return self::$commandSets->elseIf()->elseIfContains($variable, array($search), $caseInsensitive);
     }
@@ -281,7 +281,7 @@ 
     * @param bool $caseInsensitive
     * @return Mailcode_Commands_Command_ElseIf_Contains
     */
-    public static function elseIfContainsAny(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_Contains
+    public static function elseIfContainsAny(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_Contains
     {
         return self::$commandSets->elseIf()->elseIfContains($variable, $searchTerms, $caseInsensitive);
     }
@@ -296,7 +296,7 @@ 
         return self::$commandSets->if()->ifNotEmpty($variable);
     }
     
-    public static function for(string $sourceVariable, string $loopVariable) : Mailcode_Commands_Command_For
+    public static function for (string $sourceVariable, string $loopVariable) : Mailcode_Commands_Command_For
     {
         return self::$commandSets->misc()->for($sourceVariable, $loopVariable);
     }
@@ -336,7 +336,7 @@ 
 
     public static function init() : void
     {
-        if(!isset(self::$commandSets))
+        if (!isset(self::$commandSets))
         {
             self::$commandSets = new Mailcode_Factory_CommandSets();
         }

src/Mailcode/Parser/Statement/Info.php

Spacing +15 added lines, -15 removed lines

@@ -48,7 +48,7 @@ 
         $operand = $this->getOperandByIndex(1);
         $value = $this->getTokenByIndex(2);
         
-        if($variable && $operand && $value && $operand->isAssignment())
+        if ($variable && $operand && $value && $operand->isAssignment())
         {
             return true;
         }
@@ -67,7 +67,7 @@ 
         $operand = $this->getOperandByIndex(1);
         $value = $this->getTokenByIndex(2);
         
-        if($variable && $operand && $value && $operand->isComparator())
+        if ($variable && $operand && $value && $operand->isComparator())
         {
             return true;
         }
@@ -84,9 +84,9 @@ 
     {
         $result = array();
         
-        foreach($this->tokens as $token)
+        foreach ($this->tokens as $token)
         {
-            if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
+            if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
             {
                 $result[] = $token->getVariable();
             }
@@ -107,7 +107,7 @@ 
     {
         $token = $this->getTokenByIndex($index);
         
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
         {
             return $token;
         }
@@ -127,7 +127,7 @@ 
     {
         $token = $this->getTokenByIndex($index);
         
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
         {
             return $token;
         }
@@ -147,7 +147,7 @@ 
     {
         $token = $this->getTokenByIndex($index);
         
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
         {
             return $token;
         }
@@ -167,7 +167,7 @@ 
     {
         $token = $this->getTokenByIndex($index);
         
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand)
         {
             return $token;
         }
@@ -185,7 +185,7 @@ 
     */
     public function getTokenByIndex(int $index) : ?Mailcode_Parser_Statement_Tokenizer_Token
     {
-        if(isset($this->tokens[$index]))
+        if (isset($this->tokens[$index]))
         {
             return $this->tokens[$index];
         }
@@ -215,9 +215,9 @@ 
     {
         $result = array();
         
-        foreach($this->tokens as $token)
+        foreach ($this->tokens as $token)
         {
-            if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
+            if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
             {
                 $result[] = $token;
             }
@@ -238,9 +238,9 @@ 
     {
         $result = array();
 
-        foreach($this->tokens as $token)
+        foreach ($this->tokens as $token)
         {
-            if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
+            if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
             {
                 $result[] = $token;
             }
@@ -255,7 +255,7 @@ 
 
         foreach ($keywords as $keyword)
         {
-            if($keyword->isURLEncoded())
+            if ($keyword->isURLEncoded())
             {
                 return true;
             }
@@ -283,7 +283,7 @@ 
 
     public function addURLEncoding() : Mailcode_Parser_Statement_Info
     {
-        if(!$this->hasURLEncoding())
+        if (!$this->hasURLEncoding())
         {
             $this->tokenizer->appendKeyword('urlencode');
             $this->tokens = $this->tokenizer->getTokens();

src/Mailcode/Parser/Statement/Tokenizer.php

Spacing +26 added lines, -26 removed lines

@@ -138,9 +138,9 @@ 
     {
         $result = array();
         
-        foreach($this->tokensOrdered as $token)
+        foreach ($this->tokensOrdered as $token)
         {
-            if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown)
+            if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown)
             {
                 $result[] = $token;
             }
@@ -153,7 +153,7 @@ 
     {
         $unknown = $this->getUnknown();
         
-        if(!empty($unknown))
+        if (!empty($unknown))
         {
             return array_shift($unknown);
         }
@@ -165,11 +165,11 @@ 
     {
         $parts = array();
         
-        foreach($this->tokensOrdered as $token)
+        foreach ($this->tokensOrdered as $token)
         {
             $string = $token->getNormalized();
             
-            if($string != '')
+            if ($string != '')
             {
                 $parts[] = $string;
             }
@@ -182,11 +182,11 @@ 
     {
         $this->tokenized = trim($statement);
         
-        foreach($this->tokenCategories as $token)
+        foreach ($this->tokenCategories as $token)
         {
             $method = 'tokenize_'.$token;
             
-            if(!method_exists($this, $method))
+            if (!method_exists($this, $method))
             {
                 throw new Mailcode_Exception(
                     'Unknown statement token.',
@@ -210,12 +210,12 @@ 
     * @param string $matchedText
     * @param mixed $subject
     */
-    protected function registerToken(string $type, string $matchedText, $subject=null) : void
+    protected function registerToken(string $type, string $matchedText, $subject = null) : void
     {
         $this->tokensTemporary[] = $this->createToken($type, $matchedText, $subject);
     }
 
-    protected function createToken(string $type, string $matchedText, $subject=null) : Mailcode_Parser_Statement_Tokenizer_Token
+    protected function createToken(string $type, string $matchedText, $subject = null) : Mailcode_Parser_Statement_Tokenizer_Token
     {
         $tokenID = $this->generateID();
 
@@ -236,7 +236,7 @@ 
 
         $token = $this->appendToken('Keyword', $name);
 
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
         {
             return $token;
         }
@@ -255,7 +255,7 @@ 
 
         foreach ($this->tokensOrdered as $checkToken)
         {
-            if($checkToken->getID() !== $tokenID)
+            if ($checkToken->getID() !== $tokenID)
             {
                 $keep[] = $checkToken;
             }
@@ -266,7 +266,7 @@ 
         return $this;
     }
 
-    protected function appendToken(string $type, string $matchedText, $subject=null) : Mailcode_Parser_Statement_Tokenizer_Token
+    protected function appendToken(string $type, string $matchedText, $subject = null) : Mailcode_Parser_Statement_Tokenizer_Token
     {
         $token = $this->createToken($type, $matchedText, $subject);
 
@@ -277,9 +277,9 @@ 
     
     protected function getTokenByID(string $tokenID) : ?Mailcode_Parser_Statement_Tokenizer_Token
     {
-        foreach($this->tokensTemporary as $token)
+        foreach ($this->tokensTemporary as $token)
         {
-            if($token->getID() === $tokenID)
+            if ($token->getID() === $tokenID)
             {
                 return $token;
             }
@@ -305,9 +305,9 @@ 
     
     protected function tokenize_keywords() : void
     {
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
-            if(strstr($this->tokenized, $keyword))
+            if (strstr($this->tokenized, $keyword))
             {
                 $this->registerToken('Keyword', $keyword);
             }
@@ -321,12 +321,12 @@ 
         // over that could not be tokenized.
         $parts = \AppUtils\ConvertHelper::explodeTrim($this->delimiter, $this->tokenized);
 
-        foreach($parts as $part)
+        foreach ($parts as $part)
         {
             $token = $this->getTokenByID($part);
             
             // if the entry is a token, simply add it.
-            if($token)
+            if ($token)
             {
                 $this->tokensOrdered[] = $token;
             }
@@ -342,7 +342,7 @@ 
     {
         $vars = Mailcode::create()->findVariables($this->tokenized)->getGroupedByHash();
         
-        foreach($vars as $var)
+        foreach ($vars as $var)
         {
             $this->registerToken('Variable', $var->getMatchedText(), $var);
         }
@@ -350,9 +350,9 @@ 
     
     protected function tokenize_operands() : void
     {
-        foreach($this->operands as $operand)
+        foreach ($this->operands as $operand)
         {
-            if(strstr($this->tokenized, $operand))
+            if (strstr($this->tokenized, $operand))
             {
                 $this->registerToken('Operand', $operand);
             }
@@ -364,7 +364,7 @@ 
         $matches = array();
         preg_match_all('/"(.*)"/sxU', $this->tokenized, $matches, PREG_PATTERN_ORDER);
         
-        foreach($matches[0] as $match)
+        foreach ($matches[0] as $match)
         {
             $this->registerToken('StringLiteral', $match);
         }
@@ -375,7 +375,7 @@ 
         $matches = array();
         preg_match_all('/-*[0-9]+\s*[.,]\s*[0-9]+|-*[0-9]+/sx', $this->tokenized, $matches, PREG_PATTERN_ORDER);
         
-        foreach($matches[0] as $match)
+        foreach ($matches[0] as $match)
         {
             $this->registerToken('Number', $match);
         }
@@ -392,7 +392,7 @@ 
     {
         static $alphas;
         
-        if(!isset($alphas))
+        if (!isset($alphas))
         {
             $alphas = range('A', 'Z');
         }
@@ -401,12 +401,12 @@ 
         
         $result = '';
         
-        for($i=0; $i < $amount; $i++)
+        for ($i = 0; $i < $amount; $i++)
         {
             $result .= $alphas[array_rand($alphas)];
         }
         
-        if(!in_array($result, self::$ids))
+        if (!in_array($result, self::$ids))
         {
             self::$ids[] = $result;
             return $result;

src/Mailcode/Parser/Safeguard.php

Spacing +22 added lines, -22 removed lines

@@ -128,7 +128,7 @@ 
     */
     public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard
     {
-        if(empty($delimiter))
+        if (empty($delimiter))
         {
             throw new Mailcode_Exception(
                 'Empty delimiter',
@@ -178,7 +178,7 @@ 
         $placeholders = $this->getPlaceholders();
         $string = $this->originalString;
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $string = $this->makePlaceholderSafe($string, $placeholder);
         }
@@ -192,7 +192,7 @@ 
     {
         $pos = mb_strpos($string, $placeholder->getOriginalText());
 
-        if($pos === false)
+        if ($pos === false)
         {
             throw new Mailcode_Exception(
                 'Placeholder original text not found',
@@ -221,18 +221,18 @@ 
         $urls = ConvertHelper::createURLFinder($string)->getURLs();
         $placeholders = $this->getPlaceholders();
 
-        foreach($urls as $url)
+        foreach ($urls as $url)
         {
-            foreach($placeholders as $placeholder)
+            foreach ($placeholders as $placeholder)
             {
                 $command = $placeholder->getCommand();
 
-                if(!$command->supportsURLEncoding())
+                if (!$command->supportsURLEncoding())
                 {
                     continue;
                 }
 
-                if(strstr($url, $placeholder->getReplacementText()))
+                if (strstr($url, $placeholder->getReplacementText()))
                 {
                     $command->setURLEncoding(true);
                 }
@@ -249,7 +249,7 @@ 
     */
     public function createFormatting($subject) : Mailcode_Parser_Safeguard_Formatting
     {
-        if(is_string($subject))
+        if (is_string($subject))
         {
             $subject = Mailcode::create()->createString($subject);
         }
@@ -265,7 +265,7 @@ 
     */
     public function getPlaceholders()
     {
-        if(isset($this->placeholders))
+        if (isset($this->placeholders))
         {
             return $this->placeholders;
         }
@@ -274,7 +274,7 @@ 
         
         $cmds = $this->getCollection()->getCommands();
         
-        foreach($cmds as $command)
+        foreach ($cmds as $command)
         {
             self::$counter++;
             
@@ -288,21 +288,21 @@ 
         return $this->placeholders;
     }
     
-    protected function restore(string $string, bool $partial=false, bool $highlighted=false) : string
+    protected function restore(string $string, bool $partial = false, bool $highlighted = false) : string
     {
-        if(!$partial)
+        if (!$partial)
         {
             $this->requireValidCollection();
         }
         
         $formatting = $this->createFormatting($string);
 
-        if($partial)
+        if ($partial)
         {
             $formatting->makePartial();
         }
         
-        if($highlighted)
+        if ($highlighted)
         {
             $formatting->replaceWithHTMLHighlighting();
         }
@@ -398,7 +398,7 @@ 
     */
     public function getCollection() : Mailcode_Collection
     {
-        if(isset($this->collection))
+        if (isset($this->collection))
         {
             return $this->collection;
         }
@@ -420,7 +420,7 @@ 
     */
     protected function requireValidCollection() : void
     {
-        if($this->getCollection()->isValid())
+        if ($this->getCollection()->isValid())
         {
             return;
         }
@@ -443,7 +443,7 @@ 
     */
     public function getPlaceholderStrings() : array
     {
-        if(is_array($this->placeholderStrings))
+        if (is_array($this->placeholderStrings))
         {
             return $this->placeholderStrings;
         }
@@ -452,7 +452,7 @@ 
         
         $this->placeholderStrings = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $this->placeholderStrings[] = $placeholder->getReplacementText();
         }
@@ -478,9 +478,9 @@ 
     {
         $placeholders = $this->getPlaceholders();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
-            if($placeholder->getID() === $id)
+            if ($placeholder->getID() === $id)
             {
                 return $placeholder;
             }
@@ -507,9 +507,9 @@ 
     {
         $placeholders = $this->getPlaceholders();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
-            if($placeholder->getReplacementText() === $string)
+            if ($placeholder->getReplacementText() === $string)
             {
                 return $placeholder;
             }

src/Mailcode/Commands/Command.php

Spacing +30 added lines, -30 removed lines

@@ -117,7 +117,7 @@ 
      */
     protected $meta;
 
-    public function __construct(string $type='', string $paramsString='', string $matchedText='')
+    public function __construct(string $type = '', string $paramsString = '', string $matchedText = '')
     {
         $this->type = $type;
         $this->paramsString = html_entity_decode($paramsString);
@@ -213,7 +213,7 @@ 
     {
         $this->requireNonDummy();
         
-        if($this->hash === '') {
+        if ($this->hash === '') {
             $this->hash = md5($this->matchedText);
         }
         
@@ -222,7 +222,7 @@ 
     
     protected function requireNonDummy() : void
     {
-        if(!$this->isDummy())
+        if (!$this->isDummy())
         {
             return;
         }
@@ -241,7 +241,7 @@ 
     
     protected function validate() : \AppUtils\OperationResult
     {
-        if(!$this->validated)
+        if (!$this->validated)
         {
             $this->requireNonDummy();
             $this->validateSyntax();
@@ -254,7 +254,7 @@ 
     
     public function getValidationResult() :  \AppUtils\OperationResult
     {
-        if(isset($this->validationResult)) 
+        if (isset($this->validationResult)) 
         {
             return $this->validationResult;
         }
@@ -270,10 +270,10 @@ 
     {
         $validations = array_merge($this->validations, $this->getValidations());
         
-        foreach($validations as $validation)
+        foreach ($validations as $validation)
         {
             // break off at the first validation issue
-            if(!$this->validateSyntaxMethod($validation))
+            if (!$this->validateSyntaxMethod($validation))
             {
                 return;
             }
@@ -284,7 +284,7 @@ 
     {
         $method = 'validateSyntax_'.$validation;
         
-        if(!method_exists($this, $method))
+        if (!method_exists($this, $method))
         {
             throw new Mailcode_Exception(
                 'Missing validation method ['.$validation.']',
@@ -309,12 +309,12 @@ 
     
     protected function validateSyntax_params_empty() : void
     {
-        if(!$this->requiresParameters())
+        if (!$this->requiresParameters())
         {
             return;
         }
         
-        if(empty($this->paramsString))
+        if (empty($this->paramsString))
         {
             $this->validationResult->makeError(
                 t('Parameters have to be specified.'),
@@ -326,14 +326,14 @@ 
     
     protected function validateSyntax_params_keywords() : void
     {
-        if(!$this->supportsLogicKeywords())
+        if (!$this->supportsLogicKeywords())
         {
             return;
         }
         
         $this->logicKeywords = new Mailcode_Commands_LogicKeywords($this, $this->paramsString);
         
-        if(!$this->logicKeywords->isValid())
+        if (!$this->logicKeywords->isValid())
         {
             $this->validationResult->makeError(
                 t('Invalid parameters:').' '.$this->logicKeywords->getErrorMessage(),
@@ -348,14 +348,14 @@ 
     
     protected function validateSyntax_params_parse() : void
     {
-        if(!$this->requiresParameters())
+        if (!$this->requiresParameters())
         {
             return;
         }
         
         $this->params = $this->mailcode->getParser()->createStatement($this->paramsString);
         
-        if(!$this->params->isValid())
+        if (!$this->params->isValid())
         {
             $error = $this->params->getValidationResult();
             
@@ -372,14 +372,14 @@ 
     
     protected function validateSyntax_type_supported() : void
     {
-        if(!$this->supportsType() || empty($this->type))
+        if (!$this->supportsType() || empty($this->type))
         {
             return;
         }
         
         $types = $this->getSupportedTypes();
 
-        if(!in_array($this->type, $types))
+        if (!in_array($this->type, $types))
         {
             $this->validationResult->makeError(
                 t('The command addon %1$s is not supported.', $this->type).' '.
@@ -393,7 +393,7 @@ 
     
     protected function validateSyntax_type_unsupported() : void
     {
-        if($this->supportsType() || empty($this->type))
+        if ($this->supportsType() || empty($this->type))
         {
             return;
         }
@@ -411,7 +411,7 @@ 
     
     public function getType() : string
     {
-        if($this->supportsType())
+        if ($this->supportsType())
         {
             return $this->type;
         }
@@ -431,7 +431,7 @@ 
     
     public function getHighlighted() : string
     {
-        if(!$this->isValid())
+        if (!$this->isValid())
         {
             return '';
         }
@@ -442,7 +442,7 @@ 
     
     public function getParamsString() : string
     {
-        if($this->requiresParameters())
+        if ($this->requiresParameters())
         {
             return $this->paramsString;
         }
@@ -479,22 +479,22 @@ 
     
     public final function getCommandType() : string
     {
-        if($this instanceof Mailcode_Commands_Command_Type_Closing)
+        if ($this instanceof Mailcode_Commands_Command_Type_Closing)
         {
             return 'Closing';
         }
         
-        if($this instanceof Mailcode_Commands_Command_Type_Opening)
+        if ($this instanceof Mailcode_Commands_Command_Type_Opening)
         {
             return 'Opening';
         }
         
-        if($this instanceof Mailcode_Commands_Command_Type_Sibling)
+        if ($this instanceof Mailcode_Commands_Command_Type_Sibling)
         {
             return 'Sibling';
         }
         
-        if($this instanceof Mailcode_Commands_Command_Type_Standalone)
+        if ($this instanceof Mailcode_Commands_Command_Type_Standalone)
         {
             return 'Standalone';
         }
@@ -544,7 +544,7 @@ 
     
     public function getLogicKeywords() : Mailcode_Commands_LogicKeywords
     {
-        if($this->supportsLogicKeywords() && isset($this->logicKeywords))
+        if ($this->supportsLogicKeywords() && isset($this->logicKeywords))
         {
             return $this->logicKeywords;
         }
@@ -578,7 +578,7 @@ 
     */
     public function getTranslationParam(string $name)
     {
-        if(isset($this->translationParams[$name]))
+        if (isset($this->translationParams[$name]))
         {
             return $this->translationParams[$name];
         }
@@ -603,7 +603,7 @@ 
      */
     public function getMeta(string $name)
     {
-        if(isset($this->meta[$name]))
+        if (isset($this->meta[$name]))
         {
             return $this->meta[$name];
         }
@@ -615,9 +615,9 @@ 
      * @param bool $encoding
      * @return $this
      */
-    public function setURLEncoding(bool $encoding=true)
+    public function setURLEncoding(bool $encoding = true)
     {
-        if(!$this->supportsURLEncoding())
+        if (!$this->supportsURLEncoding())
         {
             throw new Mailcode_Exception(
                 'Command does not support URL encoding.',
@@ -629,7 +629,7 @@ 
             );
         }
 
-        if($encoding)
+        if ($encoding)
         {
             $this->params->getInfo()->addURLEncoding();
         }