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 +43 added lines, -43 removed lines

@@ -30,14 +30,14 @@ 
         '{\s*([a-z]+)\s+([a-z-]+)\s*:([^}]*)}'
     );
     
-   /**
-    * @var Mailcode
-    */
+    /**
+     * @var Mailcode
+     */
     protected $mailcode;
     
-   /**
-    * @var Mailcode_Commands
-    */
+    /**
+     * @var Mailcode_Commands
+     */
     protected $commands;
 
     /**
@@ -51,24 +51,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();
@@ -103,14 +103,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();
@@ -173,14 +173,14 @@ 
         throw new Mailcode_Exception('Not a command', '', self::ERROR_NOT_A_COMMAND);
     }
     
-   /**
-    * 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"
@@ -218,14 +218,14 @@ 
         );
     }
     
-   /**
-    * 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);

Spacing +10 added lines, -10 removed lines

@@ -80,7 +80,7 @@ 
         
         $total = count($matches[0]);
         
-        for($i=0; $i < $total; $i++)
+        for ($i = 0; $i < $total; $i++)
         {
             $match = $this->parseMatch($matches, $i);
             
@@ -94,7 +94,7 @@ 
 
     protected function prepareString(string $subject) : string
     {
-        if(!ConvertHelper::isStringHTML($subject))
+        if (!ConvertHelper::isStringHTML($subject))
         {
             return $subject;
         }
@@ -145,17 +145,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->getStackLast());
         }
 
         // 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);
         }
@@ -165,7 +165,7 @@ 
     {
         $cmd = $this->stack[array_key_last($this->stack)];
 
-        if($cmd instanceof Mailcode_Commands_Command)
+        if ($cmd instanceof Mailcode_Commands_Command)
         {
             return $cmd;
         }
@@ -194,16 +194,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];
@@ -240,7 +240,7 @@ 
      * @param Mailcode_Commands_Command|null $sourceCommand
      * @return Mailcode_Parser_Statement
      */
-    public function createStatement(string $statement, bool $freeform=false, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Parser_Statement
+    public function createStatement(string $statement, bool $freeform = false, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Parser_Statement
     {
         return new Mailcode_Parser_Statement($statement, $freeform, $sourceCommand);
     }

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 +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
         $varName = ltrim($command->getVariableName(), '$');
         $javaFormat = $this->translateFormat($command->getFormatString());
 
-        if(empty($internalFormat))
+        if (empty($internalFormat))
         {
             $internalFormat = self::DEFAULT_INTERNAL_FORMAT;
         }
@@ -76,9 +76,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/Commands/Command/ShowDate.php

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;

Indentation +12 added lines, -12 removed lines

@@ -20,15 +20,15 @@ 
  */
 class Mailcode_Commands_Command_ShowDate extends Mailcode_Commands_ShowBase
 {
-   /**
-    * 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
@@ -88,11 +88,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;

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/Traits/Commands/IfNumber.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     {
         $value = $this->getRawNumber();
 
-        if(!is_numeric($value))
+        if (!is_numeric($value))
         {
             $this->validationResult->makeError(
                 t(

src/Mailcode/Translator/Syntax.php

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

Indentation +14 added lines, -14 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);

src/Mailcode/Translator.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function createSyntax(string $name) : Mailcode_Translator_Syntax
     {
-        if($this->syntaxExists($name))
+        if ($this->syntaxExists($name))
         {
             return new Mailcode_Translator_Syntax($name);
         }
@@ -59,7 +59,7 @@ 
         $names = $this->getSyntaxNames();
         $result = array();
 
-        foreach($names as $name)
+        foreach ($names as $name)
         {
             $result[] = $this->createSyntax($name);
         }