Mistralys / mailcode

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

Indentation +3 added lines, -3 removed lines

@@ -24,9 +24,9 @@
 {
     const ERROR_UNKNOWN_DATE_FORMAT_CHARACTER = 55501;
     
-   /**
-    * @var string[]string
-    */
+    /**
+     * @var string[]string
+     */
     private $charTable = array(
         'd' => 'd',
         'm' => 'M',

Spacing +2 added lines, -2 removed lines

@@ -56,9 +56,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/Date/FormatInfo/Character.php

Indentation +34 added lines, -34 removed lines

@@ -23,19 +23,19 @@ 
 {
     const ERROR_UNHANDLED_CHARTYPE = 55601;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $type;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $char;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $description;
     
     public function __construct(string $type, string $char, string $description)
@@ -45,46 +45,46 @@ 
         $this->description = $description;
     }
     
-   /**
-    * Retrieves the format character (PHP date format).
-    * 
-    * @return string 
-    */
+    /**
+     * Retrieves the format character (PHP date format).
+     * 
+     * @return string 
+     */
     public function getChar() : string
     {
         return $this->char;
     }
     
-   /**
-    * Retrieves a human readable description of the character's role.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves a human readable description of the character's role.
+     * 
+     * @return string
+     */
     public function getDescription() : string
     {
         return $this->description;
     }
     
-   /**
-    * Retrieves the character type ID.
-    * 
-    * @return string
-    * 
-    * @see Mailcode_Date_FormatInfo::CHARTYPE_DATE
-    * @see Mailcode_Date_FormatInfo::CHARTYPE_TIME
-    * @see Mailcode_Date_FormatInfo::CHARTYPE_PUNCTUATION
-    */
+    /**
+     * Retrieves the character type ID.
+     * 
+     * @return string
+     * 
+     * @see Mailcode_Date_FormatInfo::CHARTYPE_DATE
+     * @see Mailcode_Date_FormatInfo::CHARTYPE_TIME
+     * @see Mailcode_Date_FormatInfo::CHARTYPE_PUNCTUATION
+     */
     public function getTypeID() : string
     {
         return $this->type;
     }
     
-   /**
-    * Retrieves a human readable label for the character's type, e.g. "Date", "Time", "Punctuation".
-    * 
-    * @throws Mailcode_Exception If the character type is unknown.
-    * @return string
-    */
+    /**
+     * Retrieves a human readable label for the character's type, e.g. "Date", "Time", "Punctuation".
+     * 
+     * @throws Mailcode_Exception If the character type is unknown.
+     * @return string
+     */
     public function getTypeLabel() : string
     {
         switch($this->type)

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     */
     public function getTypeLabel() : string
     {
-        switch($this->type)
+        switch ($this->type)
         {
             case Mailcode_Date_FormatInfo::CHARTYPE_DATE:
                 return t('Date');

src/Mailcode/Date/FormatInfo.php

Indentation +39 added lines, -39 removed lines

@@ -31,24 +31,24 @@ 
     const CHARTYPE_TIME = 'time';
     const CHARTYPE_PUNCTUATION = 'punctuation';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $defaultFormat = "Y/m/d";
     
-   /**
-    * @var Mailcode_Date_FormatInfo_Character[]
-    */
+    /**
+     * @var Mailcode_Date_FormatInfo_Character[]
+     */
     private $formatChars = array();
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     private $allowedChars = array();
     
-   /**
-    * @var Mailcode_Date_FormatInfo|NULL
-    */
+    /**
+     * @var Mailcode_Date_FormatInfo|NULL
+     */
     private static $instance;
     
     private function __construct()
@@ -66,11 +66,11 @@ 
         return self::$instance;
     }
 
-   /**
-    * Initialized the list of allowed date formatting
-    * characters. This is done only once per request
-    * by storing them statically for performance reasons.
-    */
+    /**
+     * Initialized the list of allowed date formatting
+     * characters. This is done only once per request
+     * by storing them statically for performance reasons.
+     */
     private function initCharacters() : void
     {
         $chars = array(
@@ -113,16 +113,16 @@ 
         $this->defaultFormat = $formatString;
     }
     
-   /**
-    * Validates the date format string, by ensuring that
-    * all the characters it is composed of are known.
-    *
-    * @param string $formatString
-    * @return OperationResult
-    * 
-    * @see Mailcode_Commands_Command_ShowDate::VALIDATION_EMPTY_FORMAT_STRING
-    * @see Mailcode_Commands_Command_ShowDate::VALIDATION_INVALID_FORMAT_CHARACTER
-    */
+    /**
+     * Validates the date format string, by ensuring that
+     * all the characters it is composed of are known.
+     *
+     * @param string $formatString
+     * @return OperationResult
+     * 
+     * @see Mailcode_Commands_Command_ShowDate::VALIDATION_EMPTY_FORMAT_STRING
+     * @see Mailcode_Commands_Command_ShowDate::VALIDATION_INVALID_FORMAT_CHARACTER
+     */
     public function validateFormat(string $formatString) : OperationResult
     {
         $result = new OperationResult($this);
@@ -161,23 +161,23 @@ 
         return $result;
     }
     
-   /**
-    * Retrieves all characters that are allowed to
-    * be used in a date format string, with information
-    * on each.
-    *
-    * @return Mailcode_Date_FormatInfo_Character[]
-    */
+    /**
+     * Retrieves all characters that are allowed to
+     * be used in a date format string, with information
+     * on each.
+     *
+     * @return Mailcode_Date_FormatInfo_Character[]
+     */
     public function getCharactersList() : array
     {
         return $this->formatChars;
     }
     
-   /**
-    * Retrieves the characters list, grouped by type label.
-    * 
-    * @return array<string, array>
-    */
+    /**
+     * Retrieves the characters list, grouped by type label.
+     * 
+     * @return array<string, array>
+     */
     public function getCharactersGrouped() : array
     {
         $grouped = array();

Spacing +9 added lines, -9 removed lines

@@ -58,7 +58,7 @@ 
     
     public static function getInstance() : Mailcode_Date_FormatInfo
     {
-        if(!isset(self::$instance))
+        if (!isset(self::$instance))
         {
             self::$instance = new Mailcode_Date_FormatInfo();
         }
@@ -90,7 +90,7 @@ 
             array(self::CHARTYPE_PUNCTUATION, ' ', t('Space'))
         );
         
-        foreach($chars as $def)
+        foreach ($chars as $def)
         {
             $char = new Mailcode_Date_FormatInfo_Character(
                 $def[0],
@@ -129,7 +129,7 @@ 
         
         $trimmed = trim($formatString);
         
-        if(empty($trimmed))
+        if (empty($trimmed))
         {
             $result->makeError(
                 t('Empty date format.'),
@@ -142,15 +142,15 @@ 
         $chars = ConvertHelper::string2array($formatString);
         $total = count($chars);
         
-        for($i=0; $i < $total; $i++)
+        for ($i = 0; $i < $total; $i++)
         {
             $char = $chars[$i];
             
-            if(!in_array($char, $this->allowedChars))
+            if (!in_array($char, $this->allowedChars))
             {
                 $result->makeError(
                     t('Invalid character in date format:').' '.
-                    t('%1$s at position %2$s.', '<code>'.$char.'</code>', $i+1),
+                    t('%1$s at position %2$s.', '<code>'.$char.'</code>', $i + 1),
                     self::VALIDATION_INVALID_FORMAT_CHARACTER
                 );
                 
@@ -182,11 +182,11 @@ 
     {
         $grouped = array();
         
-        foreach($this->formatChars as $char)
+        foreach ($this->formatChars as $char)
         {
             $type = $char->getTypeLabel();
             
-            if(!isset($grouped[$type]))
+            if (!isset($grouped[$type]))
             {
                 $grouped[$type] = array();
             }
@@ -196,7 +196,7 @@ 
 
         $groups = array_keys($grouped);
         
-        foreach($groups as $group)
+        foreach ($groups as $group)
         {
             usort($grouped[$group], function(Mailcode_Date_FormatInfo_Character $a, Mailcode_Date_FormatInfo_Character $b)
             {

src/Mailcode/Parser/Statement/Tokenizer/Token/StringLiteral.php

Indentation +12 added lines, -12 removed lines

@@ -20,28 +20,28 @@
  */
 class Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral extends Mailcode_Parser_Statement_Tokenizer_Token implements Mailcode_Parser_Statement_Tokenizer_Type_Value
 {
-   /**
-    * Retrieves the text with the surrounding quotes.
-    * @return string
-    */
+    /**
+     * Retrieves the text with the surrounding quotes.
+     * @return string
+     */
     public function getNormalized() : string
     {
         return $this->restoreQuotes($this->matchedText);
     }
     
-   /**
-    * Retrieves the text with the surrounding quotes.
-    * @return string
-    */
+    /**
+     * Retrieves the text with the surrounding quotes.
+     * @return string
+     */
     public function getValue() : string
     {
         return $this->getNormalized();
     }
     
-   /**
-    * Retrieves the text without the surrounding quotes.
-    * @return string
-    */
+    /**
+     * Retrieves the text without the surrounding quotes.
+     * @return string
+     */
     public function getText() : string
     {
         $quoteless = trim($this->matchedText, '"\'');

src/Mailcode/Parser/Statement/Info.php

Indentation +65 added lines, -65 removed lines

@@ -21,14 +21,14 @@ 
  */
 class Mailcode_Parser_Statement_Info
 {
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer
+     */
     protected $tokenizer;
     
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer_Token[]
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer_Token[]
+     */
     protected $tokens = array();
     
     public function __construct(Mailcode_Parser_Statement_Tokenizer $tokenizer)
@@ -37,11 +37,11 @@ 
         $this->tokens = $this->tokenizer->getTokens(); 
     }
     
-   /**
-    * Whether the whole statement is a variable being assigned a value.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the whole statement is a variable being assigned a value.
+     * 
+     * @return bool
+     */
     public function isVariableAssignment() : bool
     {
         $variable = $this->getVariableByIndex(0);
@@ -56,11 +56,11 @@ 
         return false;
     }
     
-   /**
-    * Whether the whole statement is a variable being compared to something.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the whole statement is a variable being compared to something.
+     * 
+     * @return bool
+     */
     public function isVariableComparison() : bool
     {
         $variable = $this->getVariableByIndex(0);
@@ -75,11 +75,11 @@ 
         return false;
     }
     
-   /**
-    * Retrieves all variables used in the statement.
-    * 
-    * @return \Mailcode\Mailcode_Variables_Variable[]
-    */
+    /**
+     * Retrieves all variables used in the statement.
+     * 
+     * @return \Mailcode\Mailcode_Variables_Variable[]
+     */
     public function getVariables()
     {
         $result = array();
@@ -95,14 +95,14 @@ 
         return $result;
     }
     
-   /**
-    * Retrieves a variable by its position in the command's parameters.
-    * Returns null if there is no parameter at the specified index, or
-    * if it is of another type.
-    * 
-    * @param int $index Zero-based index.
-    * @return Mailcode_Parser_Statement_Tokenizer_Token_Variable|NULL
-    */
+    /**
+     * Retrieves a variable by its position in the command's parameters.
+     * Returns null if there is no parameter at the specified index, or
+     * if it is of another type.
+     * 
+     * @param int $index Zero-based index.
+     * @return Mailcode_Parser_Statement_Tokenizer_Token_Variable|NULL
+     */
     public function getVariableByIndex(int $index) : ?Mailcode_Parser_Statement_Tokenizer_Token_Variable
     {
         $token = $this->getTokenByIndex($index);
@@ -115,14 +115,14 @@ 
         return null;
     }
     
-   /**
-    * Retrieves a string literal by its position in the command's parameters.
-    * Returns null if there is no parameter at the specified index, or
-    * if it is of another type.
-    *
-    * @param int $index Zero-based index.
-    * @return Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral|NULL
-    */
+    /**
+     * Retrieves a string literal by its position in the command's parameters.
+     * Returns null if there is no parameter at the specified index, or
+     * if it is of another type.
+     *
+     * @param int $index Zero-based index.
+     * @return Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral|NULL
+     */
     public function getStringLiteralByIndex(int $index) : ?Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral
     {
         $token = $this->getTokenByIndex($index);
@@ -135,14 +135,14 @@ 
         return null;
     }
     
-   /**
-    * Retrieves a keyword by its position in the command's parameters.
-    * Returns null if there is no parameter at the specified index, or
-    * if it is of another type.
-    *
-    * @param int $index Zero-based index.
-    * @return Mailcode_Parser_Statement_Tokenizer_Token_Keyword|NULL
-    */
+    /**
+     * Retrieves a keyword by its position in the command's parameters.
+     * Returns null if there is no parameter at the specified index, or
+     * if it is of another type.
+     *
+     * @param int $index Zero-based index.
+     * @return Mailcode_Parser_Statement_Tokenizer_Token_Keyword|NULL
+     */
     public function getKeywordByIndex(int $index) : ?Mailcode_Parser_Statement_Tokenizer_Token_Keyword
     {
         $token = $this->getTokenByIndex($index);
@@ -155,14 +155,14 @@ 
         return null;
     }
     
-   /**
-    * Retrieves an operand by its position in the command's parameters.
-    * Returns null if there is no parameter at the specified index, or
-    * if it is of another type.
-    *
-    * @param int $index Zero-based index.
-    * @return Mailcode_Parser_Statement_Tokenizer_Token_Operand|NULL
-    */
+    /**
+     * Retrieves an operand by its position in the command's parameters.
+     * Returns null if there is no parameter at the specified index, or
+     * if it is of another type.
+     *
+     * @param int $index Zero-based index.
+     * @return Mailcode_Parser_Statement_Tokenizer_Token_Operand|NULL
+     */
     public function getOperandByIndex(int $index) : ?Mailcode_Parser_Statement_Tokenizer_Token_Operand
     {
         $token = $this->getTokenByIndex($index);
@@ -175,14 +175,14 @@ 
         return null;
     }
     
-   /**
-    * Retrieves a parameter token by its position in the command's parameters,
-    * regardless of its type. Returns null if there is no parameter at the 
-    * specified index.
-    *
-    * @param int $index Zero-based index.
-    * @return Mailcode_Parser_Statement_Tokenizer_Token|NULL
-    */
+    /**
+     * Retrieves a parameter token by its position in the command's parameters,
+     * regardless of its type. Returns null if there is no parameter at the 
+     * specified index.
+     *
+     * @param int $index Zero-based index.
+     * @return Mailcode_Parser_Statement_Tokenizer_Token|NULL
+     */
     public function getTokenByIndex(int $index) : ?Mailcode_Parser_Statement_Tokenizer_Token
     {
         if(isset($this->tokens[$index]))
@@ -198,10 +198,10 @@ 
         return isset($this->tokens[$index]);
     }
     
-   /**
-    * Retrieves all string literals that were found in the command.
-    * @return \Mailcode\Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral[]
-    */
+    /**
+     * Retrieves all string literals that were found in the command.
+     * @return \Mailcode\Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral[]
+     */
     public function getStringLiterals()
     {
         $result = array();

Spacing +11 added lines, -11 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];
         }
@@ -206,9 +206,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;
             }

src/Mailcode/Commands/Command/ShowDate.php

Indentation +36 added lines, -36 removed lines

@@ -22,15 +22,15 @@ 
 {
     const VALIDATION_NOT_A_FORMAT_STRING = 55401;
     
-   /**
-    * The date format string.
-    * @var string
-    */
+    /**
+     * The date format string.
+     * @var string
+     */
     private $formatString = "Y/m/d";
     
-   /**
-    * @var Mailcode_Date_FormatInfo
-    */
+    /**
+     * @var Mailcode_Date_FormatInfo
+     */
     private $formatInfo;
     
     public function getName() : string
@@ -53,46 +53,46 @@ 
     
     protected function validateSyntax_check_format() : void
     {
-         $token = $this->params->getInfo()->getTokenByIndex(1);
+            $token = $this->params->getInfo()->getTokenByIndex(1);
          
-         // no format specified? Use the default one.
-         if($token === null)
-         {
-             return;
-         }
+            // no format specified? Use the default one.
+            if($token === null)
+            {
+                return;
+            }
          
-         if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
-         {
-             $format = $token->getText();
+            if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
+            {
+                $format = $token->getText();
              
-             $result = $this->formatInfo->validateFormat($format);
+                $result = $this->formatInfo->validateFormat($format);
              
-             if($result->isValid())
-             {
+                if($result->isValid())
+                {
                 $this->formatString = $format;
-             }
-             else
-             {
-                 $this->validationResult->makeError(
-                     $result->getErrorMessage(), 
-                     $result->getCode()
-                 );
-             }
+                }
+                else
+                {
+                    $this->validationResult->makeError(
+                        $result->getErrorMessage(), 
+                        $result->getCode()
+                    );
+                }
              
-             return;
-         }
+                return;
+            }
          
-         $this->validationResult->makeError(
+            $this->validationResult->makeError(
             t('The second parameter must be a date format string.'),
             self::VALIDATION_NOT_A_FORMAT_STRING
-         );
+            );
     }
     
-   /**
-    * Retrieves the format string used to format the date.
-    * 
-    * @return string A PHP compatible date format string.
-    */
+    /**
+     * Retrieves the format string used to format the date.
+     * 
+     * @return string A PHP compatible date format string.
+     */
     public function getFormatString() : string
     {
         return $this->formatString;

Spacing +3 added lines, -3 removed lines

@@ -56,18 +56,18 @@
          $token = $this->params->getInfo()->getTokenByIndex(1);
          
          // no format specified? Use the default one.
-         if($token === null)
+         if ($token === null)
          {
              return;
          }
          
-         if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
+         if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
          {
              $format = $token->getText();
              
              $result = $this->formatInfo->validateFormat($format);
              
-             if($result->isValid())
+             if ($result->isValid())
              {
                 $this->formatString = $format;
              }

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
              if($result->isValid())
              {
                 $this->formatString = $format;
-             }
-             else
+             } else
              {
                  $this->validationResult->makeError(
                      $result->getErrorMessage(), 

src/Mailcode/Factory.php

Indentation +58 added lines, -58 removed lines

@@ -24,17 +24,17 @@ 
     
     const ERROR_UNEXPECTED_COMMAND_TYPE = 50002;
     
-   /**
-    * @var Mailcode_Renderer
-    */
+    /**
+     * @var Mailcode_Renderer
+     */
     protected static $renderer;
     
-   /**
-    * Creates a ShowVariable command.
-    * 
-    * @param string $variableName A variable name, with or without the $ sign prepended.
-    * @return Mailcode_Commands_Command_ShowVariable
-    */
+    /**
+     * Creates a ShowVariable command.
+     * 
+     * @param string $variableName A variable name, with or without the $ sign prepended.
+     * @return Mailcode_Commands_Command_ShowVariable
+     */
     public static function showVar(string $variableName) : Mailcode_Commands_Command_ShowVariable
     {
         $variableName = self::_filterVariableName($variableName);
@@ -99,12 +99,12 @@ 
     }
     
 
-   /**
-    * Creates a ShowSnippet command.
-    *
-    * @param string $snippetName A snippet name, with or without the $ sign prepended.
-    * @return Mailcode_Commands_Command_ShowSnippet
-    */
+    /**
+     * Creates a ShowSnippet command.
+     *
+     * @param string $snippetName A snippet name, with or without the $ sign prepended.
+     * @return Mailcode_Commands_Command_ShowSnippet
+     */
     public static function showSnippet(string $snippetName) : Mailcode_Commands_Command_ShowSnippet
     {
         $snippetName = self::_filterVariableName($snippetName);
@@ -126,17 +126,17 @@ 
         throw self::_exceptionUnexpectedType('ShowSnippet', $cmd);
     }
     
-   /**
-    * Creates a SetVariable command.
-    * 
-    * @param string $variableName A variable name, with or without the $ sign prepended.
-    * @param string $value
-    * @param bool $quoteValue Whether to treat the value as a string literal, and add quotes to it.
-    * @return Mailcode_Commands_Command_SetVariable
-    * @throws Mailcode_Factory_Exception
-    * 
-    * @see Mailcode_Factory::ERROR_INVALID_COMMAND_CREATED
-    */
+    /**
+     * Creates a SetVariable command.
+     * 
+     * @param string $variableName A variable name, with or without the $ sign prepended.
+     * @param string $value
+     * @param bool $quoteValue Whether to treat the value as a string literal, and add quotes to it.
+     * @return Mailcode_Commands_Command_SetVariable
+     * @throws Mailcode_Factory_Exception
+     * 
+     * @see Mailcode_Factory::ERROR_INVALID_COMMAND_CREATED
+     */
     public static function setVar(string $variableName, string $value, bool $quoteValue=true) : Mailcode_Commands_Command_SetVariable
     {
         $variableName = self::_filterVariableName($variableName);
@@ -165,14 +165,14 @@ 
         throw self::_exceptionUnexpectedType('SetVariable', $cmd);
     }
     
-   /**
-    * Like setVar(), but treats the value as a string literal
-    * and automatically adds quotes to it.
-    * 
-    * @param string $variableName
-    * @param string $value
-    * @return Mailcode_Commands_Command_SetVariable
-    */
+    /**
+     * Like setVar(), but treats the value as a string literal
+     * and automatically adds quotes to it.
+     * 
+     * @param string $variableName
+     * @param string $value
+     * @return Mailcode_Commands_Command_SetVariable
+     */
     public static function setVarString(string $variableName, string $value) : Mailcode_Commands_Command_SetVariable
     {
         return self::setVar($variableName, $value, true);
@@ -504,12 +504,12 @@ 
         return '$'.ltrim($name, '$');
     }
     
-   /**
-    * Quotes a string literal: adds the quotes, and escapes any quotes already present in it.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Quotes a string literal: adds the quotes, and escapes any quotes already present in it.
+     * 
+     * @param string $string
+     * @return string
+     */
     protected static function _quoteString(string $string) : string
     {
         return '"'.str_replace('"', '\"', $string).'"';
@@ -542,34 +542,34 @@ 
         );
     }
     
-   /**
-    * Creates a renderer instance, which can be used to easily
-    * create and convert commands to strings.
-    * 
-    * @return Mailcode_Renderer
-    */
+    /**
+     * Creates a renderer instance, which can be used to easily
+     * create and convert commands to strings.
+     * 
+     * @return Mailcode_Renderer
+     */
     public static function createRenderer() : Mailcode_Renderer
     {
         return new Mailcode_Renderer();
     }
     
-   /**
-    * Creates a printer instance, which works like the renderer,
-    * but outputs the generated strings to standard output.
-    * 
-    * @return Mailcode_Printer
-    */
+    /**
+     * Creates a printer instance, which works like the renderer,
+     * but outputs the generated strings to standard output.
+     * 
+     * @return Mailcode_Printer
+     */
     public static function createPrinter() : Mailcode_Printer
     {
         return new Mailcode_Printer();
     }
     
-   /**
-    * Gets/creates the global instance of the date format info
-    * class, used to handle date formatting aspects.
-    * 
-    * @return Mailcode_Date_FormatInfo
-    */
+    /**
+     * Gets/creates the global instance of the date format info
+     * class, used to handle date formatting aspects.
+     * 
+     * @return Mailcode_Date_FormatInfo
+     */
     public static function createDateInfo() : Mailcode_Date_FormatInfo
     {
         return Mailcode_Date_FormatInfo::getInstance();

Spacing +45 added lines, -45 removed lines

@@ -48,7 +48,7 @@ 
         
         self::_checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_ShowVariable)
+        if ($cmd instanceof Mailcode_Commands_Command_ShowVariable)
         {
             return $cmd;
         }
@@ -64,12 +64,12 @@ 
      * @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
     {
         $variableName = self::_filterVariableName($variableName);
         
         $format = '';
-        if(!empty($formatString))
+        if (!empty($formatString))
         {
             $format = sprintf(
                 ' "%s"',
@@ -90,7 +90,7 @@ 
         
         self::_checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_ShowDate)
+        if ($cmd instanceof Mailcode_Commands_Command_ShowDate)
         {
             return $cmd;
         }
@@ -118,7 +118,7 @@ 
         
         self::_checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_ShowSnippet)
+        if ($cmd instanceof Mailcode_Commands_Command_ShowSnippet)
         {
             return $cmd;
         }
@@ -137,11 +137,11 @@ 
     * 
     * @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
     {
         $variableName = self::_filterVariableName($variableName);
         
-        if($quoteValue)
+        if ($quoteValue)
         {
             $value = self::_quoteString($value);
         }
@@ -157,7 +157,7 @@ 
         
         self::_checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_SetVariable)
+        if ($cmd instanceof Mailcode_Commands_Command_SetVariable)
         {
             return $cmd;
         }
@@ -192,7 +192,7 @@ 
         
         self::_checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_Comment)
+        if ($cmd instanceof Mailcode_Commands_Command_Comment)
         {
             return $cmd;
         }
@@ -211,7 +211,7 @@ 
         
         self::_checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_Else)
+        if ($cmd instanceof Mailcode_Commands_Command_Else)
         {
             return $cmd;
         }
@@ -230,7 +230,7 @@ 
         
         self::_checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_End)
+        if ($cmd instanceof Mailcode_Commands_Command_End)
         {
             return $cmd;
         }
@@ -238,11 +238,11 @@ 
         throw self::_exceptionUnexpectedType('End', $cmd);
     }
     
-    protected static function _buildIf(string $ifType, string $params, string $type='') : Mailcode_Commands_IfBase
+    protected static function _buildIf(string $ifType, string $params, string $type = '') : Mailcode_Commands_IfBase
     {
         $stringType = $type;
         
-        if(!empty($type))
+        if (!empty($type))
         {
             $stringType = ' '.$type;
         }
@@ -261,7 +261,7 @@ 
         
         self::_checkCommand($command);
         
-        if($command instanceof Mailcode_Commands_IfBase)
+        if ($command instanceof Mailcode_Commands_IfBase)
         {
             return $command;
         }
@@ -269,9 +269,9 @@ 
         throw self::_exceptionUnexpectedType('IfBase', $command);
     }
   
-    protected static function _buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_IfBase
+    protected static function _buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_IfBase
     {
-        if($quoteValue)
+        if ($quoteValue)
         {
             $value = self::_quoteString($value);
         }
@@ -286,11 +286,11 @@ 
         return self::_buildIf($ifType, $condition, 'variable');
     }
     
-    public static function if(string $condition, string $type='') : Mailcode_Commands_Command_If
+    public static function if (string $condition, string $type = '') : Mailcode_Commands_Command_If
     {
         $command = self::_buildIf('If', $condition, $type);
         
-        if($command instanceof Mailcode_Commands_Command_If)
+        if ($command instanceof Mailcode_Commands_Command_If)
         {
             return $command;
         }
@@ -298,11 +298,11 @@ 
         throw self::_exceptionUnexpectedType('If', $command);
     }
     
-    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
     {
         $command = self::_buildIfVar('If', $variable, $operand, $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -314,7 +314,7 @@ 
     {
         $command = self::_buildIfVar('If', $variable, $operand, $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -322,11 +322,11 @@ 
         throw self::_exceptionUnexpectedType('IfVarString', $command);
     }
     
-    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
     {
         $command = self::_buildIfVar('If', $variable, '==', $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -338,7 +338,7 @@ 
     {
         $command = self::_buildIfVar('If', $variable, '==', $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -346,11 +346,11 @@ 
         throw self::_exceptionUnexpectedType('IfarEqualsString', $command);
     }
     
-    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
     {
         $command = self::_buildIfVar('If', $variable, '!=', $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -362,7 +362,7 @@ 
     {
         $command = self::_buildIfVar('If', $variable, '!=', $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -370,11 +370,11 @@ 
         throw self::_exceptionUnexpectedType('IfVarNotEqualsString', $command);
     }
     
-    public static function elseIf(string $condition, string $type='') : Mailcode_Commands_Command_ElseIf
+    public static function elseIf (string $condition, string $type = '') : Mailcode_Commands_Command_ElseIf
     {
         $command = self::_buildIf('ElseIf', $condition, $type);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $command;
         }
@@ -382,11 +382,11 @@ 
         throw self::_exceptionUnexpectedType('ElseIf', $command);
     }
     
-    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
     {
         $command = self::_buildIfVar('ElseIf', $variable, $operand, $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -398,7 +398,7 @@ 
     {
         $command = self::_buildIfVar('ElseIf', $variable, $operand, $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -406,11 +406,11 @@ 
         throw self::_exceptionUnexpectedType('ElseIfVarString', $command);
     }
     
-    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
     {
         $command = self::_buildIfVar('ElseIf', $variable, '==', $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -422,7 +422,7 @@ 
     {
         $command = self::_buildIfVar('ElseIf', $variable, '==', $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -430,11 +430,11 @@ 
         throw self::_exceptionUnexpectedType('ElseIfVarEqualsString', $command);
     }
     
-    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
     {
         $command = self::_buildIfVar('ElseIf', $variable, '!=', $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -446,7 +446,7 @@ 
     {
         $command = self::_buildIfVar('ElseIf', $variable, '!=', $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -454,11 +454,11 @@ 
         throw self::_exceptionUnexpectedType('ElseIfVarNotEqualsString', $command);
     }
     
-    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
     {
         $command = self::_buildIfContains('If', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_Contains)
+        if ($command instanceof Mailcode_Commands_Command_If_Contains)
         {
             return $command;
         }
@@ -466,11 +466,11 @@ 
         throw self::_exceptionUnexpectedType('ElseIfContains', $command);
     }
     
-    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
     {
         $command = self::_buildIfContains('ElseIf', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Contains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Contains)
         {
             return $command;
         }
@@ -478,11 +478,11 @@ 
         throw self::_exceptionUnexpectedType('ElseIfContains', $command);
     }
     
-    protected static function _buildIfContains(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    protected static function _buildIfContains(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         $keyword = ' ';
         
-        if($caseInsensitive)
+        if ($caseInsensitive)
         {
             $keyword = ' insensitive: ';
         }
@@ -517,7 +517,7 @@ 
     
     protected static function _checkCommand(Mailcode_Commands_Command $command) : void
     {
-        if($command->isValid())
+        if ($command->isValid())
         {
             return;
         }