Mistralys / mailcode

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

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     * @param string $matchedText
     * @param mixed $subject
     */
-    public function __construct(string $tokenID, string $matchedText, $subject=null)
+    public function __construct(string $tokenID, string $matchedText, $subject = null)
     {
         $this->tokenID = $tokenID;
         $this->matchedText = $matchedText;

Indentation +22 added lines, -22 removed lines

@@ -20,26 +20,26 @@ 
  */
 abstract class Mailcode_Parser_Statement_Tokenizer_Token implements Mailcode_Parser_Statement_Tokenizer_TypeInterface
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $tokenID;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $matchedText;
     
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $subject;
     
-   /**
-    * @param string $tokenID
-    * @param string $matchedText
-    * @param mixed $subject
-    */
+    /**
+     * @param string $tokenID
+     * @param string $matchedText
+     * @param mixed $subject
+     */
     public function __construct(string $tokenID, string $matchedText, $subject=null)
     {
         $this->tokenID = $tokenID;
@@ -47,20 +47,20 @@ 
         $this->subject = $subject;
     }
     
-   /**
-    * The ID of the type. i.e. the class name ("Keyword", "StringLiteral").
-    * @return string
-    */
+    /**
+     * The ID of the type. i.e. the class name ("Keyword", "StringLiteral").
+     * @return string
+     */
     public function getTypeID() : string
     {
         $parts = explode('_', get_class($this));
         return array_pop($parts);
     }
     
-   /**
-    * Retrieves a unique ID of the token.
-    * @return string  
-    */
+    /**
+     * Retrieves a unique ID of the token.
+     * @return string  
+     */
     public function getID() : string
     {
         return $this->tokenID;

src/Mailcode/Factory/Exception.php

Indentation +15 added lines, -15 removed lines

@@ -20,18 +20,18 @@ 
  */
 class Mailcode_Factory_Exception extends Mailcode_Exception
 {
-   /**
-    * @var Mailcode_Commands_Command|NULL
-    */
+    /**
+     * @var Mailcode_Commands_Command|NULL
+     */
     protected $command;
     
-   /**
-    * @param string $message
-    * @param string|NULL $details
-    * @param int|NULL $code
-    * @param \Exception|NULL $previous
-    * @param Mailcode_Commands_Command|NULL $command
-    */
+    /**
+     * @param string $message
+     * @param string|NULL $details
+     * @param int|NULL $code
+     * @param \Exception|NULL $previous
+     * @param Mailcode_Commands_Command|NULL $command
+     */
     public function __construct(string $message, $details=null, $code=null, $previous=null, Mailcode_Commands_Command $command=null)
     {
         parent::__construct($message, $details, $code, $previous);
@@ -39,11 +39,11 @@ 
         $this->command = $command;
     }
     
-   /**
-    * Retrieves the erroneous command, if any.
-    * 
-    * @return Mailcode_Commands_Command|NULL
-    */
+    /**
+     * Retrieves the erroneous command, if any.
+     * 
+     * @return Mailcode_Commands_Command|NULL
+     */
     public function getCommand() : ?Mailcode_Commands_Command
     {
         return $this->command;

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     * @param \Exception|NULL $previous
     * @param Mailcode_Commands_Command|NULL $command
     */
-    public function __construct(string $message, $details=null, $code=null, $previous=null, Mailcode_Commands_Command $command=null)
+    public function __construct(string $message, $details = null, $code = null, $previous = null, Mailcode_Commands_Command $command = null)
     {
         parent::__construct($message, $details, $code, $previous);
         

src/Mailcode/Renderer.php

Indentation +15 added lines, -15 removed lines

@@ -21,17 +21,17 @@ 
  */
 class Mailcode_Renderer
 {
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     protected $highlighted = false;
     
-   /**
-    * Sets whether to output highlighted commands instead of the default plain text.
-    * 
-    * @param bool $highlighted
-    * @return Mailcode_Renderer
-    */
+    /**
+     * Sets whether to output highlighted commands instead of the default plain text.
+     * 
+     * @param bool $highlighted
+     * @return Mailcode_Renderer
+     */
     public function setOutputHighlighted(bool $highlighted=true) : Mailcode_Renderer
     {
         $this->highlighted = $highlighted;
@@ -39,12 +39,12 @@ 
         return $this;
     }
     
-   /**
-    * Converts a show variable command to string.
-    * 
-    * @param string $variableName The variable name, with or without $ sign.
-    * @return string
-    */
+    /**
+     * Converts a show variable command to string.
+     * 
+     * @param string $variableName The variable name, with or without $ sign.
+     * @return string
+     */
     public function showVar(string $variableName) : string
     {
         return $this->command2string(Mailcode_Factory::showVar($variableName));

Braces +9 added lines, -3 removed lines

@@ -62,7 +62,9 @@ 
     
     public function if(string $condition, string $type='') : string
     {
-        return $this->command2string(Mailcode_Factory::if($condition, $type));
+        return $this->command2string(Mailcode_Factory::if($condition, $type) {
+            );
+        }
     }
     
     public function ifVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string
@@ -97,7 +99,9 @@ 
     
     public function elseIf(string $condition, string $type='') : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf($condition, $type));
+        return $this->command2string(Mailcode_Factory::elseIf($condition, $type) {
+            );
+        }
     }
     
     public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string
@@ -130,10 +134,12 @@ 
         return $this->command2string(Mailcode_Factory::elseIfVarNotEqualsString($variable, $value));
     }
     
-    public function else() : string
+    public function else {
+        () : string
     {
         return $this->command2string(Mailcode_Factory::else());
     }
+    }
     
     public function end() : string
     {

Spacing +13 added lines, -13 removed lines

@@ -32,7 +32,7 @@ 
     * @param bool $highlighted
     * @return Mailcode_Renderer
     */
-    public function setOutputHighlighted(bool $highlighted=true) : Mailcode_Renderer
+    public function setOutputHighlighted(bool $highlighted = true) : Mailcode_Renderer
     {
         $this->highlighted = $highlighted;
         
@@ -55,7 +55,7 @@ 
         return $this->command2string(Mailcode_Factory::showSnippet($snippetName));
     }
     
-    public function setVar(string $variableName, string $value, bool $quoteValue=false) : string
+    public function setVar(string $variableName, string $value, bool $quoteValue = false) : string
     {
         return $this->command2string(Mailcode_Factory::setVar($variableName, $value, $quoteValue));
     }
@@ -65,12 +65,12 @@ 
         return $this->command2string(Mailcode_Factory::setVarString($variableName, $value));
     }
     
-    public function if(string $condition, string $type='') : string
+    public function if (string $condition, string $type = '') : string
     {
-        return $this->command2string(Mailcode_Factory::if($condition, $type));
+        return $this->command2string(Mailcode_Factory::if ($condition, $type));
     }
     
-    public function ifVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string
+    public function ifVar(string $variable, string $operand, string $value, bool $quoteValue = false) : string
     {
         return $this->command2string(Mailcode_Factory::ifVar($variable, $operand, $value, $quoteValue));
     }
@@ -80,7 +80,7 @@ 
         return $this->command2string(Mailcode_Factory::ifVarString($variable, $operand, $value));
     }
     
-    public function ifVarEquals(string $variable, string $value, bool $quoteValue=false) : string
+    public function ifVarEquals(string $variable, string $value, bool $quoteValue = false) : string
     {
         return $this->command2string(Mailcode_Factory::ifVarEquals($variable, $value, $quoteValue));
     }
@@ -90,7 +90,7 @@ 
         return $this->command2string(Mailcode_Factory::ifVarEqualsString($variable, $value));    
     }
     
-    public function ifVarNotEquals(string $variable, string $value, bool $quoteValue=false) : string
+    public function ifVarNotEquals(string $variable, string $value, bool $quoteValue = false) : string
     {
         return $this->command2string(Mailcode_Factory::ifVarNotEquals($variable, $value, $quoteValue));
     }
@@ -100,12 +100,12 @@ 
         return $this->command2string(Mailcode_Factory::ifVarNotEqualsString($variable, $value));
     }
     
-    public function elseIf(string $condition, string $type='') : string
+    public function elseIf (string $condition, string $type = '') : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf($condition, $type));
+        return $this->command2string(Mailcode_Factory::elseIf ($condition, $type));
     }
     
-    public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string
+    public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue = false) : string
     {
         return $this->command2string(Mailcode_Factory::elseIfVar($variable, $operand, $value, $quoteValue));
     }
@@ -115,7 +115,7 @@ 
         return $this->command2string(Mailcode_Factory::elseIfVarString($variable, $operand, $value));
     }
     
-    public function elseIfVarEquals(string $variable, string $value, bool $quoteValue=false) : string
+    public function elseIfVarEquals(string $variable, string $value, bool $quoteValue = false) : string
     {
         return $this->command2string(Mailcode_Factory::elseIfVarEquals($variable, $value, $quoteValue));
     }
@@ -125,7 +125,7 @@ 
         return $this->command2string(Mailcode_Factory::elseIfVarEqualsString($variable, $value));
     }
     
-    public function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue=false) : string
+    public function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue = false) : string
     {
         return $this->command2string(Mailcode_Factory::elseIfVarNotEquals($variable, $value, $quoteValue));
     }
@@ -152,7 +152,7 @@ 
     
     protected function command2string(Mailcode_Commands_Command $command) : string
     {
-        if($this->highlighted)
+        if ($this->highlighted)
         {
             return $command->getHighlighted();
         }

src/Mailcode/Variables.php

Indentation +9 added lines, -9 removed lines

@@ -22,17 +22,17 @@
 {
     const REGEX_VARIABLE_NAME = '/\$\s*([A-Z0-9_]+)\s*\.\s*([A-Z0-9_]+)|\$\s*([A-Z0-9_]+)/six';
     
-   /**
-    * @var Mailcode_Variables_Collection_Regular
-    */
+    /**
+     * @var Mailcode_Variables_Collection_Regular
+     */
     protected $collection;
     
-   /**
-    * Parses the specified string to find all variable names contained within, if any.
-    * 
-    * @param string $subject
-    * @return Mailcode_Variables_Collection_Regular
-    */
+    /**
+     * Parses the specified string to find all variable names contained within, if any.
+     * 
+     * @param string $subject
+     * @return Mailcode_Variables_Collection_Regular
+     */
     public function parseString(string $subject) : Mailcode_Variables_Collection_Regular
     {
         $this->collection = new Mailcode_Variables_Collection_Regular();

Spacing +5 added lines, -5 removed lines

@@ -40,14 +40,14 @@ 
         $matches = array();
         preg_match_all(self::REGEX_VARIABLE_NAME, $subject, $matches, PREG_PATTERN_ORDER);
         
-        if(!isset($matches[0]) || empty($matches[0]))
+        if (!isset($matches[0]) || empty($matches[0]))
         {
             return $this->collection;
         }
         
-        foreach($matches[0] as $idx => $matchedText)
+        foreach ($matches[0] as $idx => $matchedText)
         {
-            if(!empty($matches[3][$idx]))
+            if (!empty($matches[3][$idx]))
             {
                 $this->addSingle($matches[3][$idx], $matchedText);
             }
@@ -63,7 +63,7 @@ 
     protected function addSingle(string $name, string $matchedText) : void
     {
         // ignore US style numbers like $451
-        if(is_numeric($name))
+        if (is_numeric($name))
         {
             return;
         }
@@ -74,7 +74,7 @@ 
     protected function addPathed(string $path, string $name, string $matchedText) : void
     {
         // ignore US style numbers like $45.12
-        if(is_numeric($path.'.'.$name))
+        if (is_numeric($path.'.'.$name))
         {
             return;
         }

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
             if(!empty($matches[3][$idx]))
             {
                 $this->addSingle($matches[3][$idx], $matchedText);
-            }
-            else 
+            } else 
             {
                 $this->addPathed($matches[1][$idx], $matches[2][$idx], $matchedText);
             }

src/Mailcode.php

Spacing +4 added lines, -4 removed lines

@@ -73,7 +73,7 @@ 
     */
     public function getParser() : Mailcode_Parser
     {
-        if(!isset($this->parser)) 
+        if (!isset($this->parser)) 
         {
             $this->parser = new Mailcode_Parser($this);
         }
@@ -89,7 +89,7 @@ 
     */
     public function getCommands() : Mailcode_Commands
     {
-        if(!isset($this->commands)) 
+        if (!isset($this->commands)) 
         {
             $this->commands = new Mailcode_Commands();
         }
@@ -115,7 +115,7 @@ 
     
     public function createVariables() : Mailcode_Variables
     {
-        if(!isset($this->variables))
+        if (!isset($this->variables))
         {
             $this->variables = new Mailcode_Variables();
         }
@@ -131,7 +131,7 @@ 
     */
     public function createTranslator() : Mailcode_Translator
     {
-        if(!isset($this->translator))
+        if (!isset($this->translator))
         {
             $this->translator = new Mailcode_Translator(); 
         }

Indentation +51 added lines, -51 removed lines

@@ -26,51 +26,51 @@ 
  */
 class Mailcode
 {
-   /**
-    * @var Mailcode_Parser|NULL
-    */
+    /**
+     * @var Mailcode_Parser|NULL
+     */
     protected $parser = null;
     
-   /**
-    * @var Mailcode_Commands|NULL
-    */
+    /**
+     * @var Mailcode_Commands|NULL
+     */
     protected $commands = null;
     
-   /**
-    * @var Mailcode_Variables|NULL
-    */
+    /**
+     * @var Mailcode_Variables|NULL
+     */
     protected $variables = null;
     
-   /**
-    * @var Mailcode_Translator|NULL
-    */
+    /**
+     * @var Mailcode_Translator|NULL
+     */
     protected $translator = null;
     
-   /**
-    * Creates a new mailcode instance.
-    * @return Mailcode
-    */
+    /**
+     * Creates a new mailcode instance.
+     * @return Mailcode
+     */
     public static function create() : Mailcode
     {
         return new Mailcode();
     }
     
-   /**
-    * Parses the string to detect all commands contained within.
-    * 
-    * @param string $string
-    * @return Mailcode_Collection
-    */
+    /**
+     * Parses the string to detect all commands contained within.
+     * 
+     * @param string $string
+     * @return Mailcode_Collection
+     */
     public function parseString(string $string) : Mailcode_Collection
     {
         return $this->getParser()->parseString($string);
     }
     
-   /**
-    * Retrieves the string parser instance used to detect commands.
-    * 
-    * @return Mailcode_Parser
-    */
+    /**
+     * Retrieves the string parser instance used to detect commands.
+     * 
+     * @return Mailcode_Parser
+     */
     public function getParser() : Mailcode_Parser
     {
         if(!isset($this->parser)) 
@@ -81,12 +81,12 @@ 
         return $this->parser;
     }
     
-   /**
-    * Retrieves the commands collection, which is used to
-    * access information on the available commands.
-    * 
-    * @return Mailcode_Commands
-    */
+    /**
+     * Retrieves the commands collection, which is used to
+     * access information on the available commands.
+     * 
+     * @return Mailcode_Commands
+     */
     public function getCommands() : Mailcode_Commands
     {
         if(!isset($this->commands)) 
@@ -107,12 +107,12 @@ 
         return new Mailcode_StringContainer($subject);
     }
     
-   /**
-    * Attempts to find all variables in the target string.
-    * 
-    * @param string $subject
-    * @return Mailcode_Variables_Collection_Regular
-    */
+    /**
+     * Attempts to find all variables in the target string.
+     * 
+     * @param string $subject
+     * @return Mailcode_Variables_Collection_Regular
+     */
     public function findVariables(string $subject) : Mailcode_Variables_Collection_Regular
     {
         return $this->createVariables()->parseString($subject);
@@ -128,12 +128,12 @@ 
         return $this->variables;
     }
     
-   /**
-    * Creates the translator, which can be used to convert commands
-    * to another supported syntax.
-    * 
-    * @return Mailcode_Translator
-    */
+    /**
+     * Creates the translator, which can be used to convert commands
+     * to another supported syntax.
+     * 
+     * @return Mailcode_Translator
+     */
     public function createTranslator() : Mailcode_Translator
     {
         if(!isset($this->translator))
@@ -144,12 +144,12 @@ 
         return $this->translator;
     }
     
-   /**
-    * Creates the styler, which can be used to retrieve the 
-    * CSS required to style the highlighted commands in HTML.
-    * 
-    * @return Mailcode_Styler
-    */
+    /**
+     * Creates the styler, which can be used to retrieve the 
+     * CSS required to style the highlighted commands in HTML.
+     * 
+     * @return Mailcode_Styler
+     */
     public function createStyler() : Mailcode_Styler
     {
         return new Mailcode_Styler();

src/Mailcode/Translator/Syntax.php

Indentation +21 added lines, -21 removed lines

@@ -23,9 +23,9 @@ 
 {
     const ERROR_UNKNOWN_COMMAND_TYPE = 50401;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $typeID;
     
     public function __construct(string $typeID)
@@ -33,22 +33,22 @@ 
         $this->typeID = $typeID;
     }
     
-   /**
-    * Retrieves the syntax' type ID, e.g. "ApacheVelocity".
-    * @return string
-    */
+    /**
+     * Retrieves the syntax' type ID, e.g. "ApacheVelocity".
+     * @return string
+     */
     public function getTypeID() : string
     {
         return $this->typeID;
     }
     
-   /**
-    * Translates a single command to the target syntax.
-    * 
-    * @param Mailcode_Commands_Command $command
-    * @throws Mailcode_Translator_Exception
-    * @return string
-    */
+    /**
+     * Translates a single command to the target syntax.
+     * 
+     * @param Mailcode_Commands_Command $command
+     * @throws Mailcode_Translator_Exception
+     * @return string
+     */
     public function translateCommand(Mailcode_Commands_Command $command) : string
     {
         $translator = $this->createTranslator($command);
@@ -81,13 +81,13 @@ 
         return $translator;
     }
     
-   /**
-    * Translates all safeguarded commands in the subject string to the 
-    * target syntax in one go.
-    * 
-    * @param Mailcode_Parser_Safeguard $safeguard
-    * @return string
-    */
+    /**
+     * Translates all safeguarded commands in the subject string to the 
+     * target syntax in one go.
+     * 
+     * @param Mailcode_Parser_Safeguard $safeguard
+     * @return string
+     */
     public function translateSafeguard(Mailcode_Parser_Safeguard $safeguard) : string
     {
         $subject = $safeguard->makeSafe();

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
             $command->getID()
         );
         
-        if(!class_exists($class))
+        if (!class_exists($class))
         {
             throw new Mailcode_Translator_Exception(
                 sprintf('Unknown command %s in translator', $command->getID()),
@@ -92,7 +92,7 @@ 
     {
         $subject = $safeguard->makeSafe();
         
-        if(!$safeguard->hasPlaceholders())
+        if (!$safeguard->hasPlaceholders())
         {
             return $subject;
         }
@@ -101,13 +101,13 @@ 
         
         $replaces = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $command = $placeholder->getCommand();
 
             $replaces[$placeholder->getReplacementText()] = $this->translateCommand($command);
 
-            if($command instanceof Mailcode_Interfaces_Commands_ProtectedContent)
+            if ($command instanceof Mailcode_Interfaces_Commands_ProtectedContent)
             {
                 $replaces[$command->getContentPlaceholder()] = $command->getContent();
             }

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/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]))