Mistralys / mailcode

src/Mailcode/Parser/Statement/Info.php

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;
             }

Indentation +69 added lines, -69 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,19 +198,19 @@ 
         return isset($this->tokens[$index]);
     }
     
-   /**
-    * Retrieves all tokens.
-    * @return Mailcode_Parser_Statement_Tokenizer_Token[]
-    */
+    /**
+     * Retrieves all tokens.
+     * @return Mailcode_Parser_Statement_Tokenizer_Token[]
+     */
     public function getTokens() : array
     {
         return $this->tokens;
     }
     
-   /**
-    * 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();

src/Mailcode/Commands/Command/ShowDate.php

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(), 

Indentation +36 added lines, -36 removed lines

@@ -24,15 +24,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
@@ -88,46 +88,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;

src/Mailcode/Parser/Statement.php

Indentation +13 added lines, -13 removed lines

@@ -29,24 +29,24 @@ 
     
     const VALIDATION_UNQUOTED_STRING_LITERALS = 48802;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $statement;
     
-   /**
-    * @var OperationResult
-    */
+    /**
+     * @var OperationResult
+     */
     protected $result;
     
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer
+     */
     protected $tokenizer;
     
-   /**
-    * @var Mailcode_Parser_Statement_Info|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Info|NULL
+     */
     protected $info;
     
     public function __construct(string $statement)
@@ -102,7 +102,7 @@ 
         if($unknown)
         {
             $this->result->makeError(
-               t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')',
+                t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')',
                 self::VALIDATION_UNQUOTED_STRING_LITERALS
             );
         }

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
     
     public function getInfo() : Mailcode_Parser_Statement_Info
     {
-        if($this->info instanceof Mailcode_Parser_Statement_Info)
+        if ($this->info instanceof Mailcode_Parser_Statement_Info)
         {
             return $this->info; 
         }
@@ -87,7 +87,7 @@ 
     
     protected function validate() : void
     {
-        if(!$this->tokenizer->hasTokens())
+        if (!$this->tokenizer->hasTokens())
         {
             $this->result->makeError(
                 t('Empty statement'),
@@ -99,7 +99,7 @@ 
         
         $unknown = $this->tokenizer->getFirstUnknown();
         
-        if($unknown)
+        if ($unknown)
         {
             $this->result->makeError(
                t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')',

src/Mailcode/Commands.php

Spacing +13 added lines, -13 removed lines

@@ -46,7 +46,7 @@ 
     {
         static $ids = array();
         
-        if(empty($ids)) {
+        if (empty($ids)) {
             $ids = \AppUtils\FileHelper::createFileFinder(__DIR__.'/Commands/Command')
             ->getPHPClassNames();
         }
@@ -63,7 +63,7 @@ 
     */
     public function getAll()
     {
-        if(!empty($this->commands)) {
+        if (!empty($this->commands)) {
             return $this->commands;
         }
         
@@ -71,7 +71,7 @@ 
         
         $result = array();
         
-        foreach($ids as $id) 
+        foreach ($ids as $id) 
         {
             $result[] = $this->getDummyCommand($id);
         }
@@ -96,7 +96,7 @@ 
     {
         static $instances = array();
         
-        if(!isset($instances[$id])) 
+        if (!isset($instances[$id])) 
         {
             $instances[$id] = $this->createCommand($id, '__dummy', '', '');
         }
@@ -117,9 +117,9 @@ 
     {
         $items = $this->getAll();
         
-        foreach($items as $item) 
+        foreach ($items as $item) 
         {
-            if($item->getName() === $name) {
+            if ($item->getName() === $name) {
                 return $item->getID();
             }
         }
@@ -151,9 +151,9 @@ 
     {
         $items = $this->getAll();
         
-        foreach($items as $item)
+        foreach ($items as $item)
         {
-            if($item->getName() === $name) {
+            if ($item->getName() === $name) {
                 return true;
             }
         }
@@ -165,7 +165,7 @@ 
     {
         $class = $this->resolveClassName($id, $type);
         
-        if(!class_exists($class))
+        if (!class_exists($class))
         {
             throw new Mailcode_Exception(
                 'No such command',
@@ -187,9 +187,9 @@ 
         
         $dummy = $this->getDummyCommand($id);
         
-        if($dummy->supportsType())
+        if ($dummy->supportsType())
         {
-            if(empty($type))
+            if (empty($type))
             {
                 $type = $dummy->getDefaultType();
             }
@@ -209,13 +209,13 @@ 
     */
     private function getDummyCommand(string $id) : Mailcode_Commands_Command
     {
-        if(!isset(self::$dummyCommands[$id]))
+        if (!isset(self::$dummyCommands[$id]))
         {
             $class = 'Mailcode\Mailcode_Commands_Command_'.$id;
             self::$dummyCommands[$id] = new $class('__dummy');
         }
         
-        if(self::$dummyCommands[$id] instanceof Mailcode_Commands_Command)
+        if (self::$dummyCommands[$id] instanceof Mailcode_Commands_Command)
         {
             return self::$dummyCommands[$id];
         }

Indentation +54 added lines, -54 removed lines

@@ -27,21 +27,21 @@ 
     
     const ERROR_INVALID_DUMMY_COMMAND_TYPE = 45903;
     
-   /**
-    * @var Mailcode_Commands_Command[]
-    */
+    /**
+     * @var Mailcode_Commands_Command[]
+     */
     private $commands = array();
     
-   /**
-    * @var string[]Mailcode_Commands_Command
-    */
+    /**
+     * @var string[]Mailcode_Commands_Command
+     */
     private static $dummyCommands = array();
     
-   /**
-    * Retrieves a list of all available command IDs.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all available command IDs.
+     * 
+     * @return string[]
+     */
     public function getIDs() : array
     {
         static $ids = array();
@@ -54,13 +54,13 @@ 
         return $ids;
     }
     
-   /**
-    * Retrieves a list of all available commands, sorted by label.
-    * 
-    * NOTE: These instances are only used for information purposes.
-    * 
-    * @return Mailcode_Commands_Command[]
-    */
+    /**
+     * Retrieves a list of all available commands, sorted by label.
+     * 
+     * NOTE: These instances are only used for information purposes.
+     * 
+     * @return Mailcode_Commands_Command[]
+     */
     public function getAll()
     {
         if(!empty($this->commands)) {
@@ -86,12 +86,12 @@ 
         return $result;
     }
     
-   /**
-    * Gets an available command by its ID.
-    * 
-    * @param string $id
-    * @return Mailcode_Commands_Command
-    */
+    /**
+     * Gets an available command by its ID.
+     * 
+     * @param string $id
+     * @return Mailcode_Commands_Command
+     */
     public function getByID(string $id) : Mailcode_Commands_Command
     {
         static $instances = array();
@@ -104,15 +104,15 @@ 
         return $instances[$id];
     }
     
-   /**
-    * Retrieves the ID of a command by its name.
-    * 
-    * @param string $name
-    * @throws Mailcode_Exception
-    * @return string
-    * 
-    * @see Mailcode_Commands::ERROR_COMMAND_NAME_DOES_NOT_EXIST
-    */
+    /**
+     * Retrieves the ID of a command by its name.
+     * 
+     * @param string $name
+     * @throws Mailcode_Exception
+     * @return string
+     * 
+     * @see Mailcode_Commands::ERROR_COMMAND_NAME_DOES_NOT_EXIST
+     */
     public function getIDByName(string $name) : string
     {
         $items = $this->getAll();
@@ -141,12 +141,12 @@ 
         return in_array($id, $ids);
     }
     
-   /**
-    * Checks wether the specified name exists.
-    * 
-    * @param string $name For example: "showvar".
-    * @return bool
-    */
+    /**
+     * Checks wether the specified name exists.
+     * 
+     * @param string $name For example: "showvar".
+     * @return bool
+     */
     public function nameExists(string $name) : bool
     {
         $items = $this->getAll();
@@ -200,14 +200,14 @@ 
         return $class;
     }
     
-   /**
-    * Translates the command type to the expected class naming scheme.
-    * 
-    * Example: not-empty => NotEmpty
-    * 
-    * @param string $type
-    * @return string
-    */
+    /**
+     * Translates the command type to the expected class naming scheme.
+     * 
+     * Example: not-empty => NotEmpty
+     * 
+     * @param string $type
+     * @return string
+     */
     private function adjustTypeName(string $type) : string
     {
         $type = str_replace('-', ' ', $type);
@@ -217,13 +217,13 @@ 
         return $type;
     }
     
-   /**
-    * Retrieves the dummy command of the specified type, which
-    * is used to retrieve information on the command's capabilities.
-    *  
-    * @param string $id
-    * @return Mailcode_Commands_Command
-    */
+    /**
+     * Retrieves the dummy command of the specified type, which
+     * is used to retrieve information on the command's capabilities.
+     *  
+     * @param string $id
+     * @return Mailcode_Commands_Command
+     */
     private function getDummyCommand(string $id) : Mailcode_Commands_Command
     {
         if(!isset(self::$dummyCommands[$id]))

src/Mailcode/Factory.php

Braces +3 added lines, -1 removed lines

@@ -97,10 +97,12 @@
         return self::$commandSets->misc()->comment($comments);
     }
     
-    public static function else() : Mailcode_Commands_Command_Else
+    public static function else {
+        () : Mailcode_Commands_Command_Else
     {
         return self::$commandSets->if()->else();
     }
+    }
     
     public static function end() : Mailcode_Commands_Command_End
     {

Indentation +68 added lines, -68 removed lines

@@ -23,17 +23,17 @@ 
     const ERROR_INVALID_COMMAND_CREATED = 50001;
     const ERROR_UNEXPECTED_COMMAND_TYPE = 50002;
 
-   /**
-    * @var Mailcode_Factory_CommandSets
-    */
+    /**
+     * @var Mailcode_Factory_CommandSets
+     */
     private static $commandSets;
     
-   /**
-    * 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
     {
         return self::$commandSets->show()->showVar($variableName);
@@ -52,41 +52,41 @@ 
         return self::$commandSets->show()->showDate($variableName, $formatString);
     }
 
-   /**
-    * 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
     {
         return self::$commandSets->show()->showSnippet($snippetName);
     }
     
-   /**
-    * 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
     {
         return self::$commandSets->set()->setVar($variableName, $value, $quoteValue);
     }
     
-   /**
-    * 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::$commandSets->set()->setVar($variableName, $value, true);
@@ -212,14 +212,14 @@ 
         return self::$commandSets->if()->ifContains($variable, array($search), $caseInsensitive);
     }
     
-   /**
-    * Creates if contains command, with several search terms.
-    * 
-    * @param string $variable
-    * @param string[] $searchTerms List of search terms. Do not add surrounding quotes.
-    * @param bool $caseInsensitive
-    * @return Mailcode_Commands_Command_If_Contains
-    */
+    /**
+     * Creates if contains command, with several search terms.
+     * 
+     * @param string $variable
+     * @param string[] $searchTerms List of search terms. Do not add surrounding quotes.
+     * @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
     {
         return self::$commandSets->if()->ifContains($variable, $searchTerms, $caseInsensitive);
@@ -230,14 +230,14 @@ 
         return self::$commandSets->elseIf()->elseIfContains($variable, array($search), $caseInsensitive);
     }
     
-   /**
-    * Creates else if contains command, with several search terms.
-    * 
-    * @param string $variable
-    * @param string[] $searchTerms List of search terms. Do not add surrounding quotes.
-    * @param bool $caseInsensitive
-    * @return Mailcode_Commands_Command_ElseIf_Contains
-    */
+    /**
+     * Creates else if contains command, with several search terms.
+     * 
+     * @param string $variable
+     * @param string[] $searchTerms List of search terms. Do not add surrounding quotes.
+     * @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
     {
         return self::$commandSets->elseIf()->elseIfContains($variable, $searchTerms, $caseInsensitive);
@@ -258,34 +258,34 @@ 
         return self::$commandSets->misc()->for($sourceVariable, $loopVariable);
     }
     
-   /**
-    * 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 +20 added lines, -20 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);
     }
@@ -74,7 +74,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);
     }
@@ -107,12 +107,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);
     }
@@ -122,7 +122,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);
     }
@@ -132,7 +132,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);
     }
@@ -142,7 +142,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);
     }
@@ -157,7 +157,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);
     }
@@ -167,7 +167,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);
     }
@@ -177,7 +177,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);
     }
@@ -187,27 +187,27 @@ 
         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);
     }
 
-    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);
     }
@@ -220,12 +220,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);
     }
@@ -238,7 +238,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);
     }
@@ -253,7 +253,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);
     }
@@ -293,7 +293,7 @@ 
     
     public static function init() : void
     {
-        if(!isset(self::$commandSets))
+        if (!isset(self::$commandSets))
         {
             self::$commandSets = new Mailcode_Factory_CommandSets();
         }

src/Mailcode/Factory/CommandSets/Set.php

Indentation +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  */
 abstract class Mailcode_Factory_CommandSets_Set
 {
-   /**
-    * @var Mailcode_Factory_Instantiator
-    */
+    /**
+     * @var Mailcode_Factory_Instantiator
+     */
     protected $instantiator;
     
     public function __construct()

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         
         $this->instantiator->checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_End)
+        if ($cmd instanceof Mailcode_Commands_Command_End)
         {
             return $cmd;
         }

src/Mailcode/Factory/CommandSets/IfBase.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         
         $this->instantiator->checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_Else)
+        if ($cmd instanceof Mailcode_Commands_Command_Else)
         {
             return $cmd;
         }

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,8 @@ 
  */
 abstract class Mailcode_Factory_CommandSets_IfBase extends Mailcode_Factory_CommandSets_Set
 {
-    public function else() : Mailcode_Commands_Command_Else
+    public function else {
+        () : Mailcode_Commands_Command_Else
     {
         $cmd = Mailcode::create()->getCommands()->createCommand(
             'Else',
@@ -28,6 +29,7 @@ 
             '',
             '{else}'
         );
+    }
         
         $this->instantiator->checkCommand($cmd);
         

src/Mailcode/Factory/CommandSets/Set/Show.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
         
         $this->instantiator->checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_ShowVariable)
+        if ($cmd instanceof Mailcode_Commands_Command_ShowVariable)
         {
             return $cmd;
         }
@@ -41,12 +41,12 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ShowVariable', $cmd);
     }
     
-    public function showDate(string $variableName, string $formatString="") : Mailcode_Commands_Command_ShowDate
+    public function showDate(string $variableName, string $formatString = "") : Mailcode_Commands_Command_ShowDate
     {
         $variableName = $this->instantiator->filterVariableName($variableName);
         
         $format = '';
-        if(!empty($formatString))
+        if (!empty($formatString))
         {
             $format = sprintf(
                 ' "%s"',
@@ -67,7 +67,7 @@ 
         
         $this->instantiator->checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_ShowDate)
+        if ($cmd instanceof Mailcode_Commands_Command_ShowDate)
         {
             return $cmd;
         }
@@ -88,7 +88,7 @@ 
         
         $this->instantiator->checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_ShowSnippet)
+        if ($cmd instanceof Mailcode_Commands_Command_ShowSnippet)
         {
             return $cmd;
         }

src/Mailcode/Factory/CommandSets/Set/Set.php

Spacing +3 added lines, -3 removed lines

@@ -20,11 +20,11 @@ 
  */
 class Mailcode_Factory_CommandSets_Set_Set extends Mailcode_Factory_CommandSets_Set
 {
-    public function setVar(string $variableName, string $value, bool $quoteValue=true) : Mailcode_Commands_Command_SetVariable
+    public function setVar(string $variableName, string $value, bool $quoteValue = true) : Mailcode_Commands_Command_SetVariable
     {
         $variableName = $this->instantiator->filterVariableName($variableName);
         
-        if($quoteValue)
+        if ($quoteValue)
         {
             $value = $this->instantiator->quoteString($value);
         }
@@ -40,7 +40,7 @@ 
         
         $this->instantiator->checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_SetVariable)
+        if ($cmd instanceof Mailcode_Commands_Command_SetVariable)
         {
             return $cmd;
         }