Mistralys / mailcode

src/Mailcode/Parser/Statement/Tokenizer.php

Indentation +51 added lines, -51 removed lines

@@ -23,9 +23,9 @@ 
 {
     const ERROR_TOKENIZE_METHOD_MISSING = 49801;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $operands = array(
         '==',
         '<=',
@@ -40,17 +40,17 @@ 
         '<'
     );
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $keywords = array(
         'in:',
         'insensitive:'
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $delimiter = '§§';
     
     /**
@@ -66,19 +66,19 @@ 
         'extract_tokens'
     );
     
-   /**
-    * @var Mailcode_Parser_Statement
-    */
+    /**
+     * @var Mailcode_Parser_Statement
+     */
     protected $statement;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $tokenized;
     
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer_Token[]
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer_Token[]
+     */
     protected $tokensTemporary = array();
     
     /**
@@ -86,9 +86,9 @@ 
      */
     protected $tokensOrdered = array();
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected static $ids = array();
     
     public function __construct(Mailcode_Parser_Statement $statement)
@@ -98,12 +98,12 @@ 
         $this->tokenize($statement->getStatementString());
     }
 
-   /**
-    * Retrieves all tokens detected in the statement string, in 
-    * the order they were found.
-    * 
-    * @return Mailcode_Parser_Statement_Tokenizer_Token[]
-    */
+    /**
+     * Retrieves all tokens detected in the statement string, in 
+     * the order they were found.
+     * 
+     * @return Mailcode_Parser_Statement_Tokenizer_Token[]
+     */
     public function getTokens()
     {
         return $this->tokensOrdered;
@@ -114,11 +114,11 @@ 
         return !empty($this->tokensOrdered);
     }
     
-   /**
-    * Whether there were any unknown tokens in the statement.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether there were any unknown tokens in the statement.
+     * 
+     * @return bool
+     */
     public function hasUnknown() : bool
     {
         $unknown = $this->getUnknown();
@@ -126,11 +126,11 @@ 
         return !empty($unknown);
     }
     
-   /**
-    * Retrieves all unknown content tokens, if any.
-    * 
-    * @return \Mailcode\Mailcode_Parser_Statement_Tokenizer_Token_Unknown[]
-    */
+    /**
+     * Retrieves all unknown content tokens, if any.
+     * 
+     * @return \Mailcode\Mailcode_Parser_Statement_Tokenizer_Token_Unknown[]
+     */
     public function getUnknown()
     {
         $result = array();
@@ -200,13 +200,13 @@ 
         }
     }
    
-   /**
-    * Registers a token to add in the statement string.
-    * 
-    * @param string $type
-    * @param string $matchedText
-    * @param mixed $subject
-    */
+    /**
+     * Registers a token to add in the statement string.
+     * 
+     * @param string $type
+     * @param string $matchedText
+     * @param mixed $subject
+     */
     protected function registerToken(string $type, string $matchedText, $subject=null) : void
     {
         $tokenID = $this->generateID();
@@ -318,13 +318,13 @@ 
         }
     }
     
-   /**
-    * Generates a unique alphabet-based ID without numbers
-    * to use as token name, to avoid conflicts with the
-    * numbers detection.
-    * 
-    * @return string
-    */
+    /**
+     * Generates a unique alphabet-based ID without numbers
+     * to use as token name, to avoid conflicts with the
+     * numbers detection.
+     * 
+     * @return string
+     */
     protected function generateID() : string
     {
         static $alphas;

Spacing +22 added lines, -22 removed lines

@@ -135,9 +135,9 @@ 
     {
         $result = array();
         
-        foreach($this->tokensOrdered as $token)
+        foreach ($this->tokensOrdered as $token)
         {
-            if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown)
+            if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown)
             {
                 $result[] = $token;
             }
@@ -150,7 +150,7 @@ 
     {
         $unknown = $this->getUnknown();
         
-        if(!empty($unknown))
+        if (!empty($unknown))
         {
             return array_shift($unknown);
         }
@@ -162,11 +162,11 @@ 
     {
         $parts = array();
         
-        foreach($this->tokensOrdered as $token)
+        foreach ($this->tokensOrdered as $token)
         {
             $string = $token->getNormalized();
             
-            if($string != '')
+            if ($string != '')
             {
                 $parts[] = $string;
             }
@@ -179,11 +179,11 @@ 
     {
         $this->tokenized = trim($statement);
         
-        foreach($this->tokenCategories as $token)
+        foreach ($this->tokenCategories as $token)
         {
             $method = 'tokenize_'.$token;
             
-            if(!method_exists($this, $method))
+            if (!method_exists($this, $method))
             {
                 throw new Mailcode_Exception(
                     'Unknown statement token.',
@@ -207,7 +207,7 @@ 
     * @param string $matchedText
     * @param mixed $subject
     */
-    protected function registerToken(string $type, string $matchedText, $subject=null) : void
+    protected function registerToken(string $type, string $matchedText, $subject = null) : void
     {
         $tokenID = $this->generateID();
         
@@ -224,9 +224,9 @@ 
     
     protected function getTokenByID(string $tokenID) : ?Mailcode_Parser_Statement_Tokenizer_Token
     {
-        foreach($this->tokensTemporary as $token)
+        foreach ($this->tokensTemporary as $token)
         {
-            if($token->getID() === $tokenID)
+            if ($token->getID() === $tokenID)
             {
                 return $token;
             }
@@ -242,9 +242,9 @@ 
     
     protected function tokenize_keywords() : void
     {
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
-            if(strstr($this->tokenized, $keyword))
+            if (strstr($this->tokenized, $keyword))
             {
                 $this->registerToken('Keyword', $keyword);
             }
@@ -258,12 +258,12 @@ 
         // over that could not be tokenized.
         $parts = \AppUtils\ConvertHelper::explodeTrim($this->delimiter, $this->tokenized);
 
-        foreach($parts as $part)
+        foreach ($parts as $part)
         {
             $token = $this->getTokenByID($part);
             
             // if the entry is a token, simply add it.
-            if($token)
+            if ($token)
             {
                 $this->tokensOrdered[] = $token;
             }
@@ -279,7 +279,7 @@ 
     {
         $vars = Mailcode::create()->findVariables($this->tokenized)->getGroupedByHash();
         
-        foreach($vars as $var)
+        foreach ($vars as $var)
         {
             $this->registerToken('Variable', $var->getMatchedText(), $var);
         }
@@ -287,9 +287,9 @@ 
     
     protected function tokenize_operands() : void
     {
-        foreach($this->operands as $operand)
+        foreach ($this->operands as $operand)
         {
-            if(strstr($this->tokenized, $operand))
+            if (strstr($this->tokenized, $operand))
             {
                 $this->registerToken('Operand', $operand);
             }
@@ -301,7 +301,7 @@ 
         $matches = array();
         preg_match_all('/"(.*)"/sx', $this->tokenized, $matches, PREG_PATTERN_ORDER);
         
-        foreach($matches[0] as $match)
+        foreach ($matches[0] as $match)
         {
             $this->registerToken('StringLiteral', $match);
         }
@@ -312,7 +312,7 @@ 
         $matches = array();
         preg_match_all('/-*[0-9]+\s*[.,]\s*[0-9]+|-*[0-9]+/sx', $this->tokenized, $matches, PREG_PATTERN_ORDER);
         
-        foreach($matches[0] as $match)
+        foreach ($matches[0] as $match)
         {
             $this->registerToken('Number', $match);
         }
@@ -329,7 +329,7 @@ 
     {
         static $alphas;
         
-        if(!isset($alphas))
+        if (!isset($alphas))
         {
             $alphas = range('A', 'Z');
         }
@@ -338,12 +338,12 @@ 
         
         $result = '';
         
-        for($i=0; $i < $amount; $i++)
+        for ($i = 0; $i < $amount; $i++)
         {
             $result .= $alphas[array_rand($alphas)];
         }
         
-        if(!in_array($result, self::$ids))
+        if (!in_array($result, self::$ids))
         {
             self::$ids[] = $result;
             return $result;

src/Mailcode/Translator/Syntax/ApacheVelocity.php

Indentation +7 added lines, -7 removed lines

@@ -20,13 +20,13 @@
  */
 abstract class Mailcode_Translator_Syntax_ApacheVelocity extends Mailcode_Translator_Command
 {
-   /**
-    * Filters the string for use in an Apache Velocity (Java)
-    * regex string: escapes all special characters.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Filters the string for use in an Apache Velocity (Java)
+     * regex string: escapes all special characters.
+     * 
+     * @param string $string
+     * @return string
+     */
     protected function filterRegexString(string $string) : string
     {
         $escape = array(

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
             ')'
         );
         
-        foreach($escape as $char)
+        foreach ($escape as $char)
         {
             $string = str_replace($char, '\\'.$char, $string);
         }

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 +3 added lines, -3 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,7 +101,7 @@ 
         
         $replaces = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $replaces[$placeholder->getReplacementText()] = $this->translateCommand($placeholder->getCommand());
         }

src/Mailcode/Parser/Safeguard/Formatter.php

Indentation +26 added lines, -26 removed lines

@@ -24,9 +24,9 @@ 
  */
 abstract class Mailcode_Parser_Safeguard_Formatter
 {
-   /**
-    * @var Mailcode_Parser_Safeguard
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard
+     */
     protected $safeguard;
     
     public function __construct(Mailcode_Parser_Safeguard $safeguard)
@@ -36,13 +36,13 @@ 
     
     abstract public function format(string $subject) : string;
     
-   /**
-    * Resolves a list of positions of needle in the haystack.
-    * 
-    * @param string $needle
-    * @param string $haystack
-    * @return int[]
-    */
+    /**
+     * Resolves a list of positions of needle in the haystack.
+     * 
+     * @param string $needle
+     * @param string $haystack
+     * @return int[]
+     */
     protected function resolvePositions(string $needle, string $haystack) : array
     {
         $lastPos = 0;
@@ -57,12 +57,12 @@ 
         return $positions;
     }
     
-   /**
-    * Resolves the newline character used in the string.
-    * 
-    * @param string $subject
-    * @return string
-    */
+    /**
+     * Resolves the newline character used in the string.
+     * 
+     * @param string $subject
+     * @return string
+     */
     protected function resolveNewlineChar(string $subject) : string
     {
         $eol = ConvertHelper::detectEOLCharacter($subject);
@@ -75,13 +75,13 @@ 
         return PHP_EOL;
     }
     
-   /**
-    * Resolves the list of placeholder strings that need
-    * to be formatted. This includes only commands that
-    * do not generate content.
-    *  
-    * @return string[]
-    */
+    /**
+     * Resolves the list of placeholder strings that need
+     * to be formatted. This includes only commands that
+     * do not generate content.
+     *  
+     * @return string[]
+     */
     protected function resolvePlaceholderStrings() : array
     {
         $placeholders = $this->filterPlaceholders();
@@ -96,9 +96,9 @@ 
         return $result;
     }
     
-   /**
-    * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[]
-    */
+    /**
+     * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[]
+     */
     protected function filterPlaceholders()
     {
         return $this->safeguard->getPlaceholders();

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
         $lastPos = 0;
         $positions = array();
         
-        while (($lastPos = mb_strpos($haystack, $needle, $lastPos))!== false)
+        while (($lastPos = mb_strpos($haystack, $needle, $lastPos)) !== false)
         {
             $positions[] = $lastPos;
             $lastPos = $lastPos + mb_strlen($needle);
@@ -67,7 +67,7 @@ 
     {
         $eol = ConvertHelper::detectEOLCharacter($subject);
         
-        if($eol)
+        if ($eol)
         {
             return $eol->getCharacter();
         }
@@ -88,7 +88,7 @@ 
         
         $result = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $result[] = $placeholder->getReplacementText();
         }

src/Mailcode/Parser/Safeguard/Formatter/SingleLines/Placeholder.php

Indentation +26 added lines, -26 removed lines

@@ -21,39 +21,39 @@ 
  */
 class Mailcode_Parser_Safeguard_Formatter_SingleLines_Placeholder
 {
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $eolLength;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $position;
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $subject;
     
-   /**
-    * @var Mailcode_Parser_Safeguard_Formatter_SingleLines
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard_Formatter_SingleLines
+     */
     protected $formatter;
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     protected $prepend = false;
 
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     protected $append = false;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $placeholderLength;
     
     public function __construct(Mailcode_Parser_Safeguard_Formatter_SingleLines $formatter, string $subject, int $placeholderLength, int $position)
@@ -67,11 +67,11 @@ 
         $this->analyzeAppend($subject);
     }
     
-   /**
-    * Whether an EOL character needs to be appended or prepended.
-    *  
-    * @return bool
-    */
+    /**
+     * Whether an EOL character needs to be appended or prepended.
+     *  
+     * @return bool
+     */
     public function requiresAdjustment() : bool
     {
         return $this->requiresAppend() || $this->requiresPrepend();

Spacing +6 added lines, -6 removed lines

@@ -90,21 +90,21 @@ 
     protected function analyzePrepend(string $subject) : void
     {
         // we're at the beginning of the string
-        if($this->position == 0)
+        if ($this->position == 0)
         {
             return;
         }
         
         $prevPos = $this->position - $this->eolLength;
         
-        if($prevPos < 0)
+        if ($prevPos < 0)
         {
             $prevPos = 0;
         }
         
         $prev = mb_substr($subject, $prevPos, $this->eolLength);
         
-        if($prev !== $this->formatter->getEOLChar())
+        if ($prev !== $this->formatter->getEOLChar())
         {
             $this->prepend = true;
         }
@@ -117,21 +117,21 @@ 
         $position = $this->position + $this->placeholderLength;
         
         // we're at the end of the string
-        if($position >= $subjectLength)
+        if ($position >= $subjectLength)
         {
             return;
         }
         
         $nextPos = $position + $this->eolLength;
         
-        if($nextPos > $subjectLength)
+        if ($nextPos > $subjectLength)
         {
             $nextPos = $subjectLength - $this->eolLength;
         }
         
         $next = mb_substr($subject, $nextPos, $this->eolLength);
         
-        if($next !== $this->formatter->getEOLChar())
+        if ($next !== $this->formatter->getEOLChar())
         {
             $this->append = true;
         }

src/Mailcode/Parser/Safeguard/Formatter/SingleLines.php

Indentation +13 added lines, -13 removed lines

@@ -23,14 +23,14 @@ 
  */
 class Mailcode_Parser_Safeguard_Formatter_SingleLines extends Mailcode_Parser_Safeguard_Formatter
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $eol;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $eolLength;
     
     public function format(string $subject) : string
@@ -119,13 +119,13 @@ 
         return $prepend.$placeholder.$append;
     }
     
-   /**
-    * We only use placeholders that contain commands that do
-    * not generate contents, since these are the only ones
-    * that may need adjusting.
-    * 
-    * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[]
-    */
+    /**
+     * We only use placeholders that contain commands that do
+     * not generate contents, since these are the only ones
+     * that may need adjusting.
+     * 
+     * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[]
+     */
     protected function filterPlaceholders()
     {
         $placeholders = $this->safeguard->getPlaceholders();

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
         
         $total = count($placeholders);
         
-        for($i=0; $i < $total; $i++)
+        for ($i = 0; $i < $total; $i++)
         {
             $subject = $this->process($placeholders[$i], $subject);
         }
@@ -66,7 +66,7 @@ 
         $phLength = mb_strlen($placeholder);
         $offset = 0;
         
-        foreach($positions as $position)
+        foreach ($positions as $position)
         {
             // adjust the position if previous changes made the subject longer
             $position += $offset;
@@ -78,7 +78,7 @@ 
                 $position
             );
             
-            if(!$info->requiresAdjustment())
+            if (!$info->requiresAdjustment())
             {
                 continue;
             }
@@ -106,12 +106,12 @@ 
         $prepend = '';
         $append = '';
         
-        if($info->requiresPrepend())
+        if ($info->requiresPrepend())
         {
             $prepend = $this->eol;
         }
         
-        if($info->requiresAppend())
+        if ($info->requiresAppend())
         {
             $append = $this->eol;
         }
@@ -132,9 +132,9 @@ 
         
         $result = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
-            if(!$placeholder->getCommand()->generatesContent())
+            if (!$placeholder->getCommand()->generatesContent())
             {
                 $result[] = $placeholder;
             }

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)
             {