Mistralys / mailcode

src/Mailcode/Parser/Safeguard/Formatter.php

Indentation +24 added lines, -24 removed lines

@@ -27,19 +27,19 @@ 
 {
     const ERROR_INVALID_LOCATION_INSTANCE = 65601;
     
-   /**
-    * @var Mailcode_Parser_Safeguard_Formatting
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard_Formatting
+     */
     protected $formatting;
     
-   /**
-    * @var Mailcode_StringContainer
-    */
+    /**
+     * @var Mailcode_StringContainer
+     */
     protected $subject;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $log = array();
     
     public function __construct(Mailcode_Parser_Safeguard_Formatting $formatting)
@@ -93,12 +93,12 @@ 
         );
     }
     
-   /**
-    * Retrieves all formatter-specific placeholder locations 
-    * in the subject string.
-    * 
-    * @return Mailcode_Parser_Safeguard_Formatter_Location[]
-    */
+    /**
+     * Retrieves all formatter-specific placeholder locations 
+     * in the subject string.
+     * 
+     * @return Mailcode_Parser_Safeguard_Formatter_Location[]
+     */
     protected function resolveLocations() : array
     {
         $placeholders = $this->formatting->getSafeguard()->getPlaceholders();
@@ -113,12 +113,12 @@ 
         return $result;
     }
     
-   /**
-    * 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);
@@ -150,9 +150,9 @@ 
         );
     }
  
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     public function getLog() : array
     {
         return $this->log;

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
         
         $instance = new $class($this, $placeholder);
         
-        if($instance instanceof Mailcode_Parser_Safeguard_Formatter_Location)
+        if ($instance instanceof Mailcode_Parser_Safeguard_Formatter_Location)
         {
             return $instance;
         }
@@ -105,7 +105,7 @@ 
         
         $result = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $result[] = $this->createLocation($placeholder);
         }
@@ -123,7 +123,7 @@ 
     {
         $eol = ConvertHelper::detectEOLCharacter($subject);
         
-        if($eol)
+        if ($eol)
         {
             $this->log(sprintf(
                 'Detected EOL character: %s.', 

src/Mailcode/Traits/Formatting/HTMLHighlighting.php

Indentation +22 added lines, -22 removed lines

@@ -23,21 +23,21 @@ 
  */
 trait Mailcode_Traits_Formatting_HTMLHighlighting
 {
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     private $excludeTags = array(
         'style', // NOTE: style tags are excluded natively on the parser level.
         'script'
     );
     
-   /**
-    * Adds an HTML tag name to the list of tags within which
-    * commands may not be highlighted.
-    *
-    * @param string $tagName Case insensitive.
-    * @return $this
-    */
+    /**
+     * Adds an HTML tag name to the list of tags within which
+     * commands may not be highlighted.
+     *
+     * @param string $tagName Case insensitive.
+     * @return $this
+     */
     public function excludeTag(string $tagName)
     {
         $tagName = strtolower($tagName);
@@ -50,12 +50,12 @@ 
         return $this;
     }
     
-   /**
-    * Adds several exluded tag names at once.
-    *
-    * @param string[] $tagNames
-    * @return $this
-    */
+    /**
+     * Adds several exluded tag names at once.
+     *
+     * @param string[] $tagNames
+     * @return $this
+     */
     public function excludeTags(array $tagNames)
     {
         foreach($tagNames as $tagName)
@@ -66,12 +66,12 @@ 
         return $this;
     }
     
-   /**
-    * Whether the specified tag name is in the exlusion list.
-    *
-    * @param string $tagName
-    * @return bool
-    */
+    /**
+     * Whether the specified tag name is in the exlusion list.
+     *
+     * @param string $tagName
+     * @return bool
+     */
     public function isTagExcluded(string $tagName) : bool
     {
         $tagName = strtolower($tagName);

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
     {
         $tagName = strtolower($tagName);
         
-        if(!in_array($tagName, $this->excludeTags))
+        if (!in_array($tagName, $this->excludeTags))
         {
             $this->excludeTags[] = $tagName;
         }
@@ -58,7 +58,7 @@ 
     */
     public function excludeTags(array $tagNames)
     {
-        foreach($tagNames as $tagName)
+        foreach ($tagNames as $tagName)
         {
             $this->excludeTag((string)$tagName);
         }

src/Mailcode/Collection.php

Spacing +12 added lines, -12 removed lines

@@ -99,7 +99,7 @@ 
         
         $errors = $this->errors;
         
-        if(!$result->isValid())
+        if (!$result->isValid())
         {
             $errors[] = new Mailcode_Collection_Error_Message(
                 '',
@@ -115,7 +115,7 @@ 
     {
         $errors = $this->getErrors();
         
-        if(!empty($errors))
+        if (!empty($errors))
         {
             return array_shift($errors);
         }
@@ -157,11 +157,11 @@ 
     {
         $hashes = array();
         
-        foreach($this->commands as $command)
+        foreach ($this->commands as $command)
         {
             $hash = $command->getHash();
             
-            if(!isset($hashes[$hash]))
+            if (!isset($hashes[$hash]))
             {
                 $hashes[$hash] = $command;
             }
@@ -178,7 +178,7 @@ 
     */
     public function addCommands(array $commands) : Mailcode_Collection
     {
-        foreach($commands as $command)
+        foreach ($commands as $command)
         {
             $this->addCommand($command);
         }
@@ -197,7 +197,7 @@ 
     {
         $collection = new Mailcode_Variables_Collection_Regular();
         
-        foreach($this->commands as $command)
+        foreach ($this->commands as $command)
         {
             $collection->mergeWith($command->getVariables());
         }
@@ -207,7 +207,7 @@ 
     
     public function getValidationResult() : OperationResult
     {
-        if($this->validationResult instanceof OperationResult)
+        if ($this->validationResult instanceof OperationResult)
         {
             return $this->validationResult;
         }
@@ -223,9 +223,9 @@ 
     {
         $errors = $this->getErrors();
         
-        foreach($errors as $error)
+        foreach ($errors as $error)
         {
-            if($error->getCode() === $code)
+            if ($error->getCode() === $code)
             {
                 return true;
             }
@@ -262,9 +262,9 @@ 
     {
         $result = array();
 
-        foreach($this->commands as $command)
+        foreach ($this->commands as $command)
         {
-            if($command instanceof $className)
+            if ($command instanceof $className)
             {
                 $result[] = $command;
             }
@@ -277,7 +277,7 @@ 
     {
         $commands = $this->getCommands();
         
-        if(!empty($commands))
+        if (!empty($commands))
         {
             return array_shift($commands);
         }

Indentation +55 added lines, -55 removed lines

@@ -24,9 +24,9 @@ 
 {
     const ERROR_CANNOT_RETRIEVE_FIRST_ERROR = 52301;
     
-   /**
-    * @var Mailcode_Commands_Command[]
-    */
+    /**
+     * @var Mailcode_Commands_Command[]
+     */
     protected $commands = array();
     
     /**
@@ -34,17 +34,17 @@ 
      */
     protected $errors = array();
     
-   /**
-    * @var OperationResult|NULL
-    */
+    /**
+     * @var OperationResult|NULL
+     */
     protected $validationResult;
     
-   /**
-    * Adds a command to the collection.
-    * 
-    * @param Mailcode_Commands_Command $command
-    * @return Mailcode_Collection
-    */
+    /**
+     * Adds a command to the collection.
+     * 
+     * @param Mailcode_Commands_Command $command
+     * @return Mailcode_Collection
+     */
     public function addCommand(Mailcode_Commands_Command $command) : Mailcode_Collection
     {
         $this->commands[] = $command;
@@ -56,21 +56,21 @@ 
         return $this;
     }
     
-   /**
-    * Whether there are any commands in the collection.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether there are any commands in the collection.
+     * 
+     * @return bool
+     */
     public function hasCommands() : bool
     {
         return !empty($this->commands);
     }
     
-   /**
-    * Counts the amount of commands in the collection.
-    * 
-    * @return int
-    */
+    /**
+     * Counts the amount of commands in the collection.
+     * 
+     * @return int
+     */
     public function countCommands() : int
     {
         return count($this->commands);
@@ -90,9 +90,9 @@ 
         $this->errors[] = new Mailcode_Collection_Error_Command($command);
     }
     
-   /**
-    * @return Mailcode_Collection_Error[]
-    */
+    /**
+     * @return Mailcode_Collection_Error[]
+     */
     public function getErrors()
     {
         $result = $this->getValidationResult();
@@ -134,25 +134,25 @@ 
         return empty($errors);
     }
     
-   /**
-    * Retrieves all commands that were detected, in the exact order
-    * they were found.
-    * 
-    * @return \Mailcode\Mailcode_Commands_Command[]
-    */
+    /**
+     * Retrieves all commands that were detected, in the exact order
+     * they were found.
+     * 
+     * @return \Mailcode\Mailcode_Commands_Command[]
+     */
     public function getCommands()
     {
-       return $this->commands;
+        return $this->commands;
     }
     
-   /**
-    * Retrieves all unique commands by their matched
-    * string hash: this ensures only commands that were
-    * written the exact same way (including spacing)
-    * are returned.
-    * 
-    * @return \Mailcode\Mailcode_Commands_Command[]
-    */
+    /**
+     * Retrieves all unique commands by their matched
+     * string hash: this ensures only commands that were
+     * written the exact same way (including spacing)
+     * are returned.
+     * 
+     * @return \Mailcode\Mailcode_Commands_Command[]
+     */
     public function getGroupedByHash()
     {
         $hashes = array();
@@ -170,12 +170,12 @@ 
         return array_values($hashes);
     }
 
-   /**
-    * Adds several commands at once.
-    * 
-    * @param Mailcode_Commands_Command[] $commands
-    * @return Mailcode_Collection
-    */
+    /**
+     * Adds several commands at once.
+     * 
+     * @param Mailcode_Commands_Command[] $commands
+     * @return Mailcode_Collection
+     */
     public function addCommands(array $commands) : Mailcode_Collection
     {
         foreach($commands as $command)
@@ -246,10 +246,10 @@ 
     }
 
     /**
-    * Retrieves only show variable commands in the collection, if any.
-    * 
-    * @return Mailcode_Commands_Command_ShowVariable[]
-    */
+     * Retrieves only show variable commands in the collection, if any.
+     * 
+     * @return Mailcode_Commands_Command_ShowVariable[]
+     */
     public function getShowVariableCommands()
     {
         return $this->getCommandsByClass(Mailcode_Commands_Command_ShowVariable::class);
@@ -263,11 +263,11 @@ 
         return $this->getCommandsByClass(Mailcode_Commands_Command_For::class);
     }
 
-   /**
-    * Retrieves only show date commands in the collection, if any.
-    *
-    * @return Mailcode_Commands_Command_ShowDate[]
-    */
+    /**
+     * Retrieves only show date commands in the collection, if any.
+     *
+     * @return Mailcode_Commands_Command_ShowDate[]
+     */
     public function getShowDateCommands() : array
     {
         return $this->getCommandsByClass(Mailcode_Commands_Command_ShowDate::class);

src/Mailcode/Parser.php

Indentation +50 added lines, -50 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();
@@ -153,14 +153,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"
@@ -198,26 +198,26 @@ 
         );
     }
     
-   /**
-    * 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
-    * @return Mailcode_Parser_Statement
-    */
+    /**
+     * Creates a statement parser, which is used to validate arbitrary
+     * command statements.
+     * 
+     * @param string $statement
+     * @return Mailcode_Parser_Statement
+     */
     public function createStatement(string $statement) : Mailcode_Parser_Statement
     {
         return new Mailcode_Parser_Statement($statement);

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

Spacing +8 added lines, -8 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];

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/ShowVariable.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         $varName = ltrim($command->getVariableName(), '$');
 
         // Automatically URL escape the variable if it's in an URL.
-        if($command->isURLEncoded())
+        if ($command->isURLEncoded())
         {
             return sprintf(
                 '${esc.url($%s)}',

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

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     {
         $varName = ltrim($command->getVariableName(), '$');
 
-        if($command->isURLEncoded())
+        if ($command->isURLEncoded())
         {
             return sprintf(
                 '${esc.url($%s.replaceAll($esc.newline, "<br/>"))}',

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