Mistralys / mailcode

src/Mailcode/Parser.php

Braces +3 added lines, -6 removed lines

@@ -146,8 +146,7 @@ 
         if($cmd instanceof Mailcode_Commands_Command_Type_Opening)
         {
             $this->stack[] = $cmd;
-        }
-        else if($cmd instanceof Mailcode_Commands_Command_Type_Closing)
+        } else if($cmd instanceof Mailcode_Commands_Command_Type_Closing)
         {
             array_pop($this->stack);
         }
@@ -177,13 +176,11 @@ 
         if(!empty($matches[1][$index]))
         {
             $name = $matches[1][$index];
-        }
-        else if(!empty($matches[2][$index]))
+        } else if(!empty($matches[2][$index]))
         {
             $name = $matches[2][$index];
             $params = $matches[3][$index];
-        }
-        else if(!empty($matches[4][$index]))
+        } else if(!empty($matches[4][$index]))
         {
             $name = $matches[4][$index];
             $type = $matches[5][$index];

Indentation +51 added lines, -51 removed lines

@@ -28,14 +28,14 @@ 
         '{\s*([a-z]+)\s+([a-z-]+)\s*:([^}]*)}'
     );
     
-   /**
-    * @var Mailcode
-    */
+    /**
+     * @var Mailcode
+     */
     protected $mailcode;
     
-   /**
-    * @var Mailcode_Commands
-    */
+    /**
+     * @var Mailcode_Commands
+     */
     protected $commands;
 
     /**
@@ -49,24 +49,24 @@ 
         $this->commands = $this->mailcode->getCommands();
     }
     
-   /**
-    * Gets the regex format string used to detect commands.
-    * 
-    * @return string
-    */
+    /**
+     * Gets the regex format string used to detect commands.
+     * 
+     * @return string
+     */
     protected static function getRegex() : string
     {
         return '/'.implode('|', self::COMMAND_REGEX_PARTS).'/sixU';
     }
     
-   /**
-    * Parses a string to detect all commands within. Returns a
-    * collection instance that contains information on all the 
-    * commands.
-    * 
-    * @param string $string
-    * @return Mailcode_Collection A collection with all unique commands found.
-    */
+    /**
+     * Parses a string to detect all commands within. Returns a
+     * collection instance that contains information on all the 
+     * commands.
+     * 
+     * @param string $string
+     * @return Mailcode_Collection A collection with all unique commands found.
+     */
     public function parseString(string $string) : Mailcode_Collection
     {
         $collection = new Mailcode_Collection();
@@ -99,14 +99,14 @@ 
         return preg_replace('%<style\b[^>]*>(.*?)</style>%six', '', $subject);
     }
     
-   /**
-    * Processes a single match found in the string: creates the command,
-    * and adds it to the collection if it's a valid command, or to the list
-    * of invalid commands otherwise.
-    * 
-    * @param Mailcode_Parser_Match $match
-    * @param Mailcode_Collection $collection
-    */
+    /**
+     * Processes a single match found in the string: creates the command,
+     * and adds it to the collection if it's a valid command, or to the list
+     * of invalid commands otherwise.
+     * 
+     * @param Mailcode_Parser_Match $match
+     * @param Mailcode_Collection $collection
+     */
     protected function processMatch(Mailcode_Parser_Match $match, Mailcode_Collection $collection) : void
     {
         $name = $match->getName();
@@ -156,14 +156,14 @@ 
         }
     }
     
-   /**
-    * Parses a single regex match: determines which named group
-    * matches, and retrieves the according information.
-    * 
-    * @param array[] $matches The regex results array.
-    * @param int $index The matched index.
-    * @return Mailcode_Parser_Match
-    */
+    /**
+     * Parses a single regex match: determines which named group
+     * matches, and retrieves the according information.
+     * 
+     * @param array[] $matches The regex results array.
+     * @param int $index The matched index.
+     * @return Mailcode_Parser_Match
+     */
     protected function parseMatch(array $matches, int $index) : Mailcode_Parser_Match
     {
         $name = ''; // the command name, e.g. "showvar"
@@ -201,27 +201,27 @@ 
         );
     }
     
-   /**
-    * Creates an instance of the safeguard tool, which
-    * is used to safeguard commands in a string with placeholders.
-    * 
-    * @param string $subject The string to use to safeguard commands in.
-    * @return Mailcode_Parser_Safeguard
-    * @see Mailcode_Parser_Safeguard
-    */
+    /**
+     * Creates an instance of the safeguard tool, which
+     * is used to safeguard commands in a string with placeholders.
+     * 
+     * @param string $subject The string to use to safeguard commands in.
+     * @return Mailcode_Parser_Safeguard
+     * @see Mailcode_Parser_Safeguard
+     */
     public function createSafeguard(string $subject) : Mailcode_Parser_Safeguard
     {
         return new Mailcode_Parser_Safeguard($this, $subject);
     }
     
-   /**
-    * Creates a statement parser, which is used to validate arbitrary
-    * command statements.
-    * 
-    * @param string $statement
-    * @param bool $freeform
-    * @return Mailcode_Parser_Statement
-    */
+    /**
+     * Creates a statement parser, which is used to validate arbitrary
+     * command statements.
+     * 
+     * @param string $statement
+     * @param bool $freeform
+     * @return Mailcode_Parser_Statement
+     */
     public function createStatement(string $statement, bool $freeform=false) : Mailcode_Parser_Statement
     {
         return new Mailcode_Parser_Statement($statement, $freeform);

Spacing +9 added lines, -9 removed lines

@@ -78,7 +78,7 @@ 
         
         $total = count($matches[0]);
         
-        for($i=0; $i < $total; $i++)
+        for ($i = 0; $i < $total; $i++)
         {
             $match = $this->parseMatch($matches, $i);
             
@@ -90,7 +90,7 @@ 
     
     protected function prepareString(string $subject) : string
     {
-        if(!ConvertHelper::isStringHTML($subject))
+        if (!ConvertHelper::isStringHTML($subject))
         {
             return $subject;
         }
@@ -140,17 +140,17 @@ 
     private function handleNesting(Mailcode_Commands_Command $cmd) : void
     {
         // Set the command's parent from the stack, if any is present.
-        if(!empty($this->stack))
+        if (!empty($this->stack))
         {
             $cmd->setParent($this->stack[array_key_last($this->stack)]);
         }
 
         // Handle opening and closing commands, adding and removing from the stack.
-        if($cmd instanceof Mailcode_Commands_Command_Type_Opening)
+        if ($cmd instanceof Mailcode_Commands_Command_Type_Opening)
         {
             $this->stack[] = $cmd;
         }
-        else if($cmd instanceof Mailcode_Commands_Command_Type_Closing)
+        else if ($cmd instanceof Mailcode_Commands_Command_Type_Closing)
         {
             array_pop($this->stack);
         }
@@ -177,16 +177,16 @@ 
         // 5 = parameter type command, type
         // 6 = parameter type command, params
         
-        if(!empty($matches[1][$index]))
+        if (!empty($matches[1][$index]))
         {
             $name = $matches[1][$index];
         }
-        else if(!empty($matches[2][$index]))
+        else if (!empty($matches[2][$index]))
         {
             $name = $matches[2][$index];
             $params = $matches[3][$index];
         }
-        else if(!empty($matches[4][$index]))
+        else if (!empty($matches[4][$index]))
         {
             $name = $matches[4][$index];
             $type = $matches[5][$index];
@@ -222,7 +222,7 @@ 
     * @param bool $freeform
     * @return Mailcode_Parser_Statement
     */
-    public function createStatement(string $statement, bool $freeform=false) : Mailcode_Parser_Statement
+    public function createStatement(string $statement, bool $freeform = false) : Mailcode_Parser_Statement
     {
         return new Mailcode_Parser_Statement($statement, $freeform);
     }

src/Mailcode/Parser/Safeguard/Formatter/Type/MarkVariables.php

Spacing +5 added lines, -5 removed lines

@@ -60,7 +60,7 @@ 
     
     public function setTemplate(string $template) : Mailcode_Parser_Safeguard_Formatter_Type_MarkVariables
     {
-        if(substr_count($template, '%s') !== 1)
+        if (substr_count($template, '%s') !== 1)
         {
             throw new Mailcode_Exception(
                 'Invalid tag template',
@@ -101,7 +101,7 @@ 
         $parts = explode('%s', $this->getTemplate());
         $tag = array_shift($parts);
 
-        if($this->templateMode === self::TEMPLATE_MODE_INLINE)
+        if ($this->templateMode === self::TEMPLATE_MODE_INLINE)
         {
             $tag = str_replace('__STYLES__', $this->getInlineStyles(), $tag);
         }
@@ -129,12 +129,12 @@ 
         $styles = '';
         $regex = '/\.'.self::DEFAULT_CLASS_NAME.'{([^}]+)}/';
 
-        if(preg_match($regex, $this->getCSS(), $matches))
+        if (preg_match($regex, $this->getCSS(), $matches))
         {
             $styles = $matches[1];
         }
 
-        if(empty($styles))
+        if (empty($styles))
         {
             throw new Mailcode_Exception(
                 'Cannot extract styles.',
@@ -191,7 +191,7 @@ 
         $file = MAILCODE_INSTALL_FOLDER.'/css/marked-variables.css';
         $path = realpath($file);
 
-        if($path !== false)
+        if ($path !== false)
         {
             return $path;
         }

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

Indentation +7 added lines, -7 removed lines

@@ -24,15 +24,15 @@
 {
     const ERROR_UNKNOWN_DATE_FORMAT_CHARACTER = 55501;
 
-   /**
-    * The date format used in the date variable. This is used to convert
-    * the native date to the format specified in the variable command.
-    */
+    /**
+     * The date format used in the date variable. This is used to convert
+     * the native date to the format specified in the variable command.
+     */
     const DEFAULT_INTERNAL_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
 
-   /**
-    * @var string[]string
-    */
+    /**
+     * @var string[]string
+     */
     private $charTable = array(
         'd' => 'dd',
         'j' => 'd',

Spacing +4 added lines, -4 removed lines

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

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

Spacing +4 added lines, -4 removed lines

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

src/Mailcode/Parser/Statement/Tokenizer.php

Spacing +26 added lines, -26 removed lines

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

Indentation +56 added lines, -56 removed lines

@@ -24,9 +24,9 @@ 
     const ERROR_TOKENIZE_METHOD_MISSING = 49801;
     const ERROR_INVALID_TOKEN_CREATED = 49802;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $operands = array(
         '==',
         '<=',
@@ -41,14 +41,14 @@ 
         '<'
     );
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $keywords = array();
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $delimiter = '§§';
     
     /**
@@ -65,19 +65,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();
     
     /**
@@ -85,9 +85,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
     {
         $this->tokensTemporary[] = $this->createToken($type, $matchedText, $subject);
@@ -285,11 +285,11 @@ 
         return null;
     }
     
-   /**
-    * Some WYSIWYG editors like using pretty quotes instead
-    * of the usual double quotes. This simply replaces all
-    * occurrences with the regular variant.
-    */
+    /**
+     * Some WYSIWYG editors like using pretty quotes instead
+     * of the usual double quotes. This simply replaces all
+     * occurrences with the regular variant.
+     */
     protected function tokenize_normalize_quotes() : void
     {
         $this->tokenized = str_replace(array('“', '”'), '"', $this->tokenized);
@@ -378,13 +378,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;

src/Mailcode/Commands/Command/ShowDate.php

Indentation +12 added lines, -12 removed lines

@@ -22,15 +22,15 @@ 
 {
     const VALIDATION_NOT_A_FORMAT_STRING = 55401;
     
-   /**
-    * The date format string.
-    * @var string
-    */
+    /**
+     * The date format string.
+     * @var string
+     */
     private $formatString;
     
-   /**
-    * @var Mailcode_Date_FormatInfo
-    */
+    /**
+     * @var Mailcode_Date_FormatInfo
+     */
     private $formatInfo;
 
     public function getName() : string
@@ -90,11 +90,11 @@ 
         );
     }
     
-   /**
-    * Retrieves the format string used to format the date.
-    * 
-    * @return string A PHP compatible date format string.
-    */
+    /**
+     * Retrieves the format string used to format the date.
+     * 
+     * @return string A PHP compatible date format string.
+     */
     public function getFormatString() : string
     {
         return $this->formatString;

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
         $tokens = $this->params->getInfo()->getStringLiterals();
 
         // no format specified? Use the default one.
-        if(empty($tokens))
+        if (empty($tokens))
         {
             return;
         }
@@ -78,7 +78,7 @@ 
     {
         $result = $this->formatInfo->validateFormat($format);
 
-        if($result->isValid())
+        if ($result->isValid())
         {
             $this->formatString = $format;
             return;

src/Mailcode/Commands/Command/ShowNumber.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
          $tokens = $this->params->getInfo()->getStringLiterals();
          
          // no format specified? Use the default one.
-         if(empty($tokens))
+         if (empty($tokens))
          {
              return;
          }
@@ -79,7 +79,7 @@ 
     {
         $result = new Mailcode_Number_Info($format);
 
-        if($result->isValid())
+        if ($result->isValid())
         {
             $this->formatString = $format;
             return;

Indentation +17 added lines, -17 removed lines

@@ -31,10 +31,10 @@ 
     const VALIDATION_INVALID_DECIMAL_SEPARATOR = 72209;
     const VALIDATION_SEPARATORS_SAME_CHARACTER = 72210;
     
-   /**
-    * The default number format string.
-    * @var string
-    */
+    /**
+     * The default number format string.
+     * @var string
+     */
     private $formatString = Mailcode_Number_Info::DEFAULT_FORMAT;
     
     public function getName() : string
@@ -58,16 +58,16 @@ 
 
     protected function validateSyntax_check_format() : void
     {
-         $tokens = $this->params->getInfo()->getStringLiterals();
+            $tokens = $this->params->getInfo()->getStringLiterals();
          
-         // no format specified? Use the default one.
-         if(empty($tokens))
-         {
-             return;
-         }
+            // no format specified? Use the default one.
+            if(empty($tokens))
+            {
+                return;
+            }
 
-         $token = array_pop($tokens);
-         $this->parseFormatString($token->getText());
+            $token = array_pop($tokens);
+            $this->parseFormatString($token->getText());
     }
 
     private function parseFormatString(string $format) : void
@@ -86,11 +86,11 @@ 
         );
     }
     
-   /**
-    * Retrieves the format string used to format the number.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the format string used to format the number.
+     * 
+     * @return string
+     */
     public function getFormatString() : string
     {
         return $this->formatString;

src/Mailcode/Number/Info.php

Spacing +18 added lines, -18 removed lines

@@ -42,7 +42,7 @@ 
     {
         $format = trim($format);
 
-        if(empty($format))
+        if (empty($format))
         {
             $format = self::DEFAULT_FORMAT;
         }
@@ -108,15 +108,15 @@ 
     {
         $format = $this->format;
 
-        foreach($this->validations as $validation)
+        foreach ($this->validations as $validation)
         {
             $method = 'parse_'.$validation;
 
-            if(method_exists($this, $method))
+            if (method_exists($this, $method))
             {
                 $format = $this->$method($format);
 
-                if(!$this->isValid())
+                if (!$this->isValid())
                 {
                     return;
                 }
@@ -138,13 +138,13 @@ 
 
     private function parse_padding(string $format) : string
     {
-        if(strstr($format, ':') === false) {
+        if (strstr($format, ':') === false) {
             return $format;
         }
 
         $parts = ConvertHelper::explodeTrim(':', $this->format);
 
-        if(count($parts) !== 2)
+        if (count($parts) !== 2)
         {
             $this->makeError(
                 t(
@@ -159,7 +159,7 @@ 
 
         $padding = $parts[1];
 
-        if(!preg_match('/\A[#]+\z/x', $padding))
+        if (!preg_match('/\A[#]+\z/x', $padding))
         {
             $this->makeError(
                 t('The padding may only contain hashes (%1$s given).', '<code>'.$padding.'</code>'),
@@ -176,7 +176,7 @@ 
 
     private function parse_number(string $format) : string
     {
-        if($format[0] !== '1')
+        if ($format[0] !== '1')
         {
             $this->makeError(
                 t('The first character of the format must be a %1$s.', '<code>1</code>'),
@@ -190,7 +190,7 @@ 
         $base = str_replace(array('.', ',', ' '), '', $format);
         $number = intval(substr($base, 0, 4));
 
-        if($number === 1000) {
+        if ($number === 1000) {
             return $format;
         }
 
@@ -210,7 +210,7 @@ 
         $separator = $format[1];
 
         // No thousands separator
-        if($separator === '0')
+        if ($separator === '0')
         {
             return $format;
         }
@@ -218,7 +218,7 @@ 
         // Valid thousands separator
         $validSeparators = array(' ', ',', '.');
 
-        if(in_array($separator, $validSeparators))
+        if (in_array($separator, $validSeparators))
         {
             $this->thousandsSeparator = $separator;
             $format = str_replace('1'.$separator, '1', $format);
@@ -254,7 +254,7 @@ 
 
     private function parse_separators(string $format) : string
     {
-        if(!empty($this->thousandsSeparator) && !empty($this->decimalsSeparator) && $this->thousandsSeparator === $this->decimalsSeparator)
+        if (!empty($this->thousandsSeparator) && !empty($this->decimalsSeparator) && $this->thousandsSeparator === $this->decimalsSeparator)
         {
             $this->makeError(
                 t(
@@ -270,14 +270,14 @@ 
 
     private function parse_decimals(string $format) : string
     {
-        if(empty($this->decimalsSeparator))
+        if (empty($this->decimalsSeparator))
         {
             return $format;
         }
 
         $parts = ConvertHelper::explodeTrim($this->decimalsSeparator, $format);
 
-        if(!isset($parts[1]))
+        if (!isset($parts[1]))
         {
             $this->makeError(
                 t('Cannot determine the amount of decimals.').' '.
@@ -293,7 +293,7 @@ 
             return $format;
         }
 
-        if($this->validateDecimals($parts[1]))
+        if ($this->validateDecimals($parts[1]))
         {
             $this->decimals = strlen($parts[1]);
         }
@@ -303,7 +303,7 @@ 
 
     private function validateDecimals(string $decimals) : bool
     {
-        if(preg_match('/\A[0]+\z/x', $decimals)) {
+        if (preg_match('/\A[0]+\z/x', $decimals)) {
             return true;
         }
 
@@ -322,7 +322,7 @@ 
     {
         $validSeparators = array('.', ',');
 
-        if(in_array($separator, $validSeparators)) {
+        if (in_array($separator, $validSeparators)) {
             return true;
         }
 
@@ -344,7 +344,7 @@ 
      */
     private function parse_regex(string $format) : string
     {
-        if(preg_match('/1[ ,.]?000|1[ ,.]?000[.,][0]+/x', $format))
+        if (preg_match('/1[ ,.]?000|1[ ,.]?000[.,][0]+/x', $format))
         {
             return $format;
         }

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

Spacing +8 added lines, -8 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;
         }
@@ -75,12 +75,12 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ShowDate', $cmd);
     }
 
-    public function showNumber(string $variableName, string $formatString="") : Mailcode_Commands_Command_ShowNumber
+    public function showNumber(string $variableName, string $formatString = "") : Mailcode_Commands_Command_ShowNumber
     {
         $variableName = $this->instantiator->filterVariableName($variableName);
 
         $format = '';
-        if(!empty($formatString))
+        if (!empty($formatString))
         {
             $format = sprintf(
                 ' "%s"',
@@ -101,7 +101,7 @@ 
 
         $this->instantiator->checkCommand($cmd);
 
-        if($cmd instanceof Mailcode_Commands_Command_ShowNumber)
+        if ($cmd instanceof Mailcode_Commands_Command_ShowNumber)
         {
             return $cmd;
         }
@@ -122,7 +122,7 @@ 
         
         $this->instantiator->checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_ShowSnippet)
+        if ($cmd instanceof Mailcode_Commands_Command_ShowSnippet)
         {
             return $cmd;
         }