Mistralys / mailcode

src/Mailcode/Commands/Normalizer.php

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
     
     public function normalize() : string
     {
-        if(!$this->command->isValid())
+        if (!$this->command->isValid())
         {
             return '';
         }
@@ -57,7 +57,7 @@ 
     
     private function addType() : void
     {
-        if(!$this->command->supportsType() || !$this->command->hasType())
+        if (!$this->command->supportsType() || !$this->command->hasType())
         {
             return;
         }
@@ -67,14 +67,14 @@ 
     
     private function addParams(Mailcode_Commands_Command $command) : void
     {
-        if(!$command->requiresParameters())
+        if (!$command->requiresParameters())
         {
             return;
         }
         
         $params = $command->getParams();
         
-        if($params === null)
+        if ($params === null)
         {
             return;
         }
@@ -85,14 +85,14 @@ 
     
     private function addLogicKeywords() : void
     {
-        if(!$this->command->supportsLogicKeywords())
+        if (!$this->command->supportsLogicKeywords())
         {
             return;
         }
         
         $keywords = $this->command->getLogicKeywords()->getKeywords();
         
-        foreach($keywords as $keyword)
+        foreach ($keywords as $keyword)
         {
             $this->parts[] = ' ';
             $this->parts[] = $keyword->getKeywordString(); // e.g. "if variable"

src/Mailcode/Translator/Syntax/ApacheVelocity/Base/AbstractIf.php

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
             if($keyCommand instanceof Mailcode_Commands_IfBase)
             {
                 $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand);
-            }
-            else
+            } else
             {
                 throw new Mailcode_Exception(
                     'Keyword command type does not match expected base class.',

Spacing +7 added lines, -7 removed lines

@@ -33,11 +33,11 @@ 
         
         $keywords = $command->getLogicKeywords()->getKeywords();
         
-        foreach($keywords as $keyword)
+        foreach ($keywords as $keyword)
         {
             $keyCommand = $keyword->getCommand();
             
-            if($keyCommand instanceof Mailcode_Commands_IfBase)
+            if ($keyCommand instanceof Mailcode_Commands_IfBase)
             {
                 $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand);
             }
@@ -60,7 +60,7 @@ 
     
     protected function getSign(Mailcode_Commands_LogicKeywords_Keyword $keyword) : string
     {
-        switch($keyword->getName())
+        switch ($keyword->getName())
         {
             case 'and':
                 return '&&';
@@ -83,7 +83,7 @@ 
     {
         $sign = '';
         
-        if($notEmpty)
+        if ($notEmpty)
         {
             $sign = '!';
         }
@@ -99,7 +99,7 @@ 
     {
         $params = $command->getParams();
         
-        if(!$params)
+        if (!$params)
         {
             return '';
         }
@@ -120,7 +120,7 @@ 
     protected function _translateContains(Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string
     {
         $opts = 's';
-        if($caseSensitive)
+        if ($caseSensitive)
         {
             $opts = 'is';
         }
@@ -136,7 +136,7 @@ 
     protected function _translateSearch(string $mode, Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string
     {
         $method = $mode.'With';
-        if($caseSensitive)
+        if ($caseSensitive)
         {
             $method = $mode.'WithIgnoreCase';
         }

src/Mailcode/Commands/LogicKeywords.php

Indentation +45 added lines, -45 removed lines

@@ -31,27 +31,27 @@ 
     const VALIDATION_CANNOT_MIX_LOGIC_KEYWORDS = 60701;
     const VALIDATION_INVALID_SUB_COMMAND = 60702;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $paramsString;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     private $names = array(
         'and', 
         'or'
     );
     
-   /**
-    * @var Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * @var Mailcode_Commands_LogicKeywords_Keyword[]
+     */
     private $keywords = array();
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $mainParams = '';
     
     public function __construct(Mailcode_Commands_Command $command, string $paramsString)
@@ -136,9 +136,9 @@ 
         }
     }
     
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     private function detectParameters() : array
     {
         $params = $this->paramsString;
@@ -156,13 +156,13 @@ 
         return $stack;
     }
 
-   /**
-    * @param string $params
-    * @param Mailcode_Commands_LogicKeywords_Keyword $keyword
-    * @param string[] $stack
-    * @throws Mailcode_Exception
-    * @return string
-    */
+    /**
+     * @param string $params
+     * @param Mailcode_Commands_LogicKeywords_Keyword $keyword
+     * @param string[] $stack
+     * @throws Mailcode_Exception
+     * @return string
+     */
     private function detectParamsKeyword(string $params, Mailcode_Commands_LogicKeywords_Keyword $keyword, array &$stack) : string
     {
         $search = $keyword->getMatchedString();
@@ -187,22 +187,22 @@ 
         return $params;
     }
     
-   /**
-    * Extracts the parameters string to use for the 
-    * original command itself, omitting all the logic
-    * keywords for the sub-commands.
-    * 
-    * @return string
-    */
+    /**
+     * Extracts the parameters string to use for the 
+     * original command itself, omitting all the logic
+     * keywords for the sub-commands.
+     * 
+     * @return string
+     */
     public function getMainParamsString() : string
     {
         return $this->mainParams;
     }
     
-   /**
-    * Retrieves the detected keyword names.
-    * @return string[]
-    */
+    /**
+     * Retrieves the detected keyword names.
+     * @return string[]
+     */
     public function getDetectedNames() : array
     {
         $names = array();
@@ -220,23 +220,23 @@ 
         return $names;
     }
     
-   /**
-    * Retrieves all keywords that were detected in the
-    * command's parameters string, if any.
-    * 
-    * @return Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * Retrieves all keywords that were detected in the
+     * command's parameters string, if any.
+     * 
+     * @return Mailcode_Commands_LogicKeywords_Keyword[]
+     */
     public function getKeywords() : array
     {
         return $this->keywords;
     }
     
-   /**
-    * Detects any keyword statements in the parameters by keyword name.
-    * 
-    * @param string $name
-    * @return Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * Detects any keyword statements in the parameters by keyword name.
+     * 
+     * @param string $name
+     * @return Mailcode_Commands_LogicKeywords_Keyword[]
+     */
     private function detectKeywords(string $name) : array
     {
         $regex = sprintf('/%1$s\s+([a-z\-0-9]+):|%1$s:/x', $name);

Spacing +20 added lines, -20 removed lines

@@ -71,9 +71,9 @@ 
     
     private function parse() : void
     {
-        foreach($this->names as $name)
+        foreach ($this->names as $name)
         {
-            if(!stristr($this->paramsString, $name))
+            if (!stristr($this->paramsString, $name))
             {
                 continue;
             }
@@ -90,7 +90,7 @@ 
         $names = $this->getDetectedNames();
         $amount = count($names);
         
-        if($amount > 1)
+        if ($amount > 1)
         {
             $this->makeError(
                 t(
@@ -109,7 +109,7 @@ 
     
     private function splitParams() : void
     {
-        if(empty($this->keywords))
+        if (empty($this->keywords))
         {
             $this->mainParams = $this->paramsString;
             
@@ -118,13 +118,13 @@ 
         
         $params = $this->detectParameters();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $kParams = array_shift($params);
             
             $keyword->setParamsString($kParams);
             
-            if(!$keyword->isValid())
+            if (!$keyword->isValid())
             {
                 $this->makeError(
                     t('Error #%1$s:', $keyword->getCode()).' '.$keyword->getErrorMessage(),
@@ -144,7 +144,7 @@ 
         $params = $this->paramsString;
         $stack = array();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $params = $this->detectParamsKeyword($params, $keyword, $stack);
         }
@@ -168,7 +168,7 @@ 
         $search = $keyword->getMatchedString();
         $pos = strpos($params, $search, 0);
         
-        if($pos === false)
+        if ($pos === false)
         {
             throw new Mailcode_Exception(
                 'Keyword matched string not found',
@@ -180,7 +180,7 @@ 
         $length = strlen($search);
         
         $store = substr($params, 0, $pos);
-        $params = trim(substr($params, $pos+$length));
+        $params = trim(substr($params, $pos + $length));
         
         $stack[] = $store;
         
@@ -207,11 +207,11 @@ 
     {
         $names = array();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $name = $keyword->getName();
             
-            if(!in_array($name, $names))
+            if (!in_array($name, $names))
             {
                 $names[] = $name;
             }
@@ -244,7 +244,7 @@ 
         $matches = array();
         preg_match_all($regex, $this->paramsString, $matches, PREG_PATTERN_ORDER);
         
-        if(!isset($matches[0][0]) || empty($matches[0][0]))
+        if (!isset($matches[0][0]) || empty($matches[0][0]))
         {
             return array();
         }
@@ -252,7 +252,7 @@ 
         $amount = count($matches[0]);
         $result = array();
         
-        for($i=0; $i < $amount; $i++)
+        for ($i = 0; $i < $amount; $i++)
         {
             $result[] = $this->createKeyword(
                 $name, 
@@ -269,22 +269,22 @@ 
         return !empty($this->keywords);
     }
     
-    public function appendAND(string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword
+    public function appendAND(string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
         return $this->appendKeyword('and', $paramsString, $type);
     }
     
-    public function appendOR(string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword
+    public function appendOR(string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
         return $this->appendKeyword('or', $paramsString, $type);
     }
     
-    public function appendKeyword(string $name, string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword
+    public function appendKeyword(string $name, string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
         $keyword = $this->createKeyword($name, $type);
         $keyword->setParamsString($paramsString);
         
-        if(!$keyword->isValid())
+        if (!$keyword->isValid())
         {
             throw new Mailcode_Exception(
                 'Cannot append invalid logic keyword',
@@ -305,13 +305,13 @@ 
         return $keyword;
     }
     
-    private function createKeyword(string $name, string $type='', string $matchedString='') : Mailcode_Commands_LogicKeywords_Keyword
+    private function createKeyword(string $name, string $type = '', string $matchedString = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
-        if(empty($matchedString))
+        if (empty($matchedString))
         {
             $matchedString = $name;
             
-            if(!empty($type))
+            if (!empty($type))
             {
                 $matchedString .= ' '.$type;
             }

src/Mailcode/Styler.php

Indentation +29 added lines, -29 removed lines

@@ -24,14 +24,14 @@ 
 {
     const ERROR_CSS_FILE_NOT_FOUND = 60901;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $path;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $fileName = 'highlight.css';
     
     public function __construct()
@@ -54,22 +54,22 @@ 
         $this->path = $path;
     }
    
-   /**
-    * Retrieves the raw CSS source for the highlighting.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the raw CSS source for the highlighting.
+     * 
+     * @return string
+     */
     public function getCSS() : string
     {
         return FileHelper::readContents($this->path);
     }
     
-   /**
-    * Retrieves a fully formed `code` tag with the CSS,
-    * to inject inline into an HTML document.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves a fully formed `code` tag with the CSS,
+     * to inject inline into an HTML document.
+     * 
+     * @return string
+     */
     public function getStyleTag() : string
     {
         return sprintf(
@@ -78,23 +78,23 @@ 
         );
     }
     
-   /**
-    * Retrieves the path to the stylesheet file.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the path to the stylesheet file.
+     * 
+     * @return string
+     */
     public function getStylesheetPath() : string
     {
         return $this->path;
     }
     
-   /**
-    * Retrieves the URL to the stylesheet file, given the
-    * local URL to the application's vendor folder.
-    *  
-    * @param string $vendorURL The URL to the vendor folder (must be accessible in the webroot).
-    * @return string
-    */
+    /**
+     * Retrieves the URL to the stylesheet file, given the
+     * local URL to the application's vendor folder.
+     *  
+     * @param string $vendorURL The URL to the vendor folder (must be accessible in the webroot).
+     * @return string
+     */
     public function getStylesheetURL(string $vendorURL) : string
     {
         return sprintf(

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $folder = sprintf(__DIR__.'/../../css/%s', $this->fileName);
         $path = realpath($folder);
         
-        if($path === false)
+        if ($path === false)
         {
             throw new Mailcode_Exception(
                 'Could not find the highlight CSS file',

src/Mailcode/Commands/LogicKeywords/Keyword.php

Indentation +51 added lines, -51 removed lines

@@ -29,39 +29,39 @@ 
     const VALIDATION_NO_COMMAND_CREATED = 61101;
     const VALIDATION_INVALID_COMMAND_CREATED = 61102;
     
-   /**
-    * @var Mailcode_Commands_LogicKeywords
-    */
+    /**
+     * @var Mailcode_Commands_LogicKeywords
+     */
     private $keywords;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $name;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $keywordType;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $matchedString;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $params = '';
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     private $paramsSet = false;
     
-   /**
-    * @var Mailcode_Collection
-    */
+    /**
+     * @var Mailcode_Collection
+     */
     private $collection;
     
     public function __construct(Mailcode_Commands_LogicKeywords $keywords, string $name, string $matchedString, string $type)
@@ -72,10 +72,10 @@ 
         $this->matchedString = $matchedString;
     }
     
-   /**
-    * The keyword name, e.g. "and". Always lowercase.
-    * @return string
-    */
+    /**
+     * The keyword name, e.g. "and". Always lowercase.
+     * @return string
+     */
     public function getName() : string
     {
         return $this->name;
@@ -98,24 +98,24 @@ 
         return $string;
     }
     
-   /**
-    * The full string that was matched in the command's parameters
-    * string. Examples: "and:", "and variable:"...
-    * 
-    * @return string
-    */
+    /**
+     * The full string that was matched in the command's parameters
+     * string. Examples: "and:", "and variable:"...
+     * 
+     * @return string
+     */
     public function getMatchedString() : string
     {
         return $this->matchedString;
     }
     
-   /**
-    * Sets the parameters string matching this logic keyword,
-    * which is used to build the actual sub-command. Set by
-    * the LogicKeywords class instance.
-    * 
-    * @param string $params
-    */
+    /**
+     * Sets the parameters string matching this logic keyword,
+     * which is used to build the actual sub-command. Set by
+     * the LogicKeywords class instance.
+     * 
+     * @param string $params
+     */
     public function setParamsString(string $params) : void
     {
         if($this->paramsSet)
@@ -133,13 +133,13 @@ 
         $this->createCommand();
     }
     
-   /**
-    * Retrieves the full command string used to create 
-    * the actual command. For opening commands like IF,
-    * this includes the closing {end} command.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the full command string used to create 
+     * the actual command. For opening commands like IF,
+     * this includes the closing {end} command.
+     * 
+     * @return string
+     */
     public function getCommandString() : string
     {
         $string = sprintf(
@@ -182,12 +182,12 @@ 
         }
     }
     
-   /**
-    * Retrieves the command for the keyword.
-    * 
-    * @throws Mailcode_Exception
-    * @return Mailcode_Commands_Command
-    */
+    /**
+     * Retrieves the command for the keyword.
+     * 
+     * @throws Mailcode_Exception
+     * @return Mailcode_Commands_Command
+     */
     public function getCommand() : Mailcode_Commands_Command
     {
         $command = $this->collection->getFirstCommand();

Spacing +5 added lines, -5 removed lines

@@ -90,7 +90,7 @@ 
     {
         $string = $this->name;
         
-        if(!empty($this->keywordType))
+        if (!empty($this->keywordType))
         {
             $string .= ' '.$this->keywordType;
         }
@@ -118,7 +118,7 @@ 
     */
     public function setParamsString(string $params) : void
     {
-        if($this->paramsSet)
+        if ($this->paramsSet)
         {
             throw new Mailcode_Exception(
                 'Cannot set parameters twice',
@@ -160,7 +160,7 @@ 
         
         $command = $this->collection->getFirstCommand();
         
-        if($command === null)
+        if ($command === null)
         {
             $this->makeError(
                 t('No command could be created using the following string:').' '.
@@ -172,7 +172,7 @@ 
             return;
         }
         
-        if(!$command->isValid())
+        if (!$command->isValid())
         {
             $this->makeError(
                 t('Invalid command created:').' '.
@@ -192,7 +192,7 @@ 
     {
         $command = $this->collection->getFirstCommand();
         
-        if($command !== null && $command->isValid())
+        if ($command !== null && $command->isValid())
         {
             return $command;
         }

src/Mailcode/Commands/Highlighter.php

Indentation +12 added lines, -12 removed lines

@@ -20,19 +20,19 @@ 
  */
 class Mailcode_Commands_Highlighter
 {
-   /**
-    * @var Mailcode_Commands_Command
-    */
+    /**
+     * @var Mailcode_Commands_Command
+     */
     protected $command;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $parts = array();
     
     public function __construct(Mailcode_Commands_Command $command)
     {
-       $this->command = $command;
+        $this->command = $command;
     }
     
     public function highlight() : string
@@ -121,11 +121,11 @@ 
         $this->appendParams($keyword->getCommand());
     }
     
-   /**
-    * @param string[] $classes
-    * @param string $content
-    * @return string
-    */
+    /**
+     * @param string[] $classes
+     * @param string $content
+     * @return string
+     */
     protected function renderTag(array $classes, string $content) : string
     {
         $parts = array();

Spacing +8 added lines, -8 removed lines

@@ -52,12 +52,12 @@ 
     {
         $this->parts[] = $this->renderTag(array('command-name'), $this->command->getName());
         
-        if($this->command->hasType())
+        if ($this->command->hasType())
         {
             $this->parts[] = ' '.$this->renderTag(array('command-type'), $this->command->getType());
         }
         
-        if($this->command->requiresParameters())
+        if ($this->command->requiresParameters())
         {
             $this->parts[] = $this->renderTag(array('hyphen'), ':');
             $this->parts[] = '<wbr>';
@@ -68,7 +68,7 @@ 
     {
         $params = $command->getParams();
         
-        if($params === null)
+        if ($params === null)
         {
             return;
         }
@@ -77,7 +77,7 @@ 
         
         $this->parts[] = '<span class="mailcode-params">';
         
-        foreach($tokens as $token)
+        foreach ($tokens as $token)
         {
             $this->appendParamToken($token);
         }
@@ -92,14 +92,14 @@ 
     
     protected function appendLogicKeywords() : void
     {
-        if(!$this->command->supportsLogicKeywords())
+        if (!$this->command->supportsLogicKeywords())
         {
             return;
         }
         
         $keywords = $this->command->getLogicKeywords()->getKeywords();
         
-        foreach($keywords as $keyword)
+        foreach ($keywords as $keyword)
         {
             $this->appendLogicKeyword($keyword);
         }
@@ -111,7 +111,7 @@ 
         
         $type = $keyword->getType();
         
-        if(!empty($type))
+        if (!empty($type))
         {
             $this->parts[] = ' '.$this->renderTag(array('command-type'), $type);
         }
@@ -130,7 +130,7 @@ 
     {
         $parts = array();
         
-        foreach($classes as $class)
+        foreach ($classes as $class)
         {
             $parts[] = 'mailcode-'.$class;
         }

css/index.php

Indentation +7 added lines, -7 removed lines

@@ -48,13 +48,13 @@
     <body>
     	<p>
     		<?php 
-    		    pts('This showcases the command\'s syntax highlighting.');
-    		    pts(
-    		        'It is based on the %1$s color scheme%2$s:',
-    		        '<a href="https://ethanschoonover.com/solarized/">"Solarized"',
-    		        '</a>'
-		        );
-    		?>
+                pts('This showcases the command\'s syntax highlighting.');
+                pts(
+                    'It is based on the %1$s color scheme%2$s:',
+                    '<a href="https://ethanschoonover.com/solarized/">"Solarized"',
+                    '</a>'
+                );
+            ?>
 		</p>
 		<br>
     	<div class="commands">

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
     $autoload = realpath($root.'/../vendor/autoload.php');
     
     // we need the autoloader to be present
-    if($autoload === false) 
+    if ($autoload === false) 
     {
         die('<b>ERROR:</b> Autoloader not present. Run composer update first.');
     }
@@ -65,7 +65,7 @@ 
                     Mailcode_Factory::comment('Some comments here'),
                     Mailcode_Factory::showSnippet('snippet_name'),
                     Mailcode_Factory::showDate('DATE.VARIABLE'),
-                    Mailcode_Factory::if('1 + 1 == 2'),
+                    Mailcode_Factory::if ('1 + 1 == 2'),
                     Mailcode_Factory::ifContains('CUSTOMER.NAME', 'John'),
                     Mailcode_Factory::ifVarEquals('NUMBER', 124),
                 );
@@ -77,7 +77,7 @@ 
                 
                 $commands[] = Mailcode_Factory::end();
                 
-                foreach($commands as $command)
+                foreach ($commands as $command)
                 {
                     ?>
                     	<p>

Braces +3 added lines, -1 removed lines

@@ -65,10 +65,12 @@
                     Mailcode_Factory::comment('Some comments here'),
                     Mailcode_Factory::showSnippet('snippet_name'),
                     Mailcode_Factory::showDate('DATE.VARIABLE'),
-                    Mailcode_Factory::if('1 + 1 == 2'),
+                    Mailcode_Factory::if('1 + 1 == 2') {
+                        ,
                     Mailcode_Factory::ifContains('CUSTOMER.NAME', 'John'),
                     Mailcode_Factory::ifVarEquals('NUMBER', 124),
                 );
+                    }
                 
                 $and = Mailcode_Factory::elseIfVarEqualsString('STRINGVAR', 'John');
                 $and->getLogicKeywords()->appendOR('$STRINGVAR == "Steve"', "variable");

src/Mailcode/Parser/Safeguard.php

Indentation +150 added lines, -150 removed lines

@@ -61,50 +61,50 @@ 
     
     const ERROR_NOT_A_SINGLE_LINES_FORMATTER = 47806;
     
-   /**
-    * @var Mailcode_Parser
-    */
+    /**
+     * @var Mailcode_Parser
+     */
     protected $parser;
     
-   /**
-    * @var Mailcode_Collection
-    */
+    /**
+     * @var Mailcode_Collection
+     */
     protected $commands;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $originalString;
     
-   /**
-    * @var Mailcode_Collection
-    */
+    /**
+     * @var Mailcode_Collection
+     */
     protected $collection;
     
-   /**
-    * Counter for the placeholders, global for all placeholders.
-    * @var integer
-    */
+    /**
+     * Counter for the placeholders, global for all placeholders.
+     * @var integer
+     */
     private static $counter = 0;
     
-   /**
-    * @var Mailcode_Parser_Safeguard_Placeholder[]
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard_Placeholder[]
+     */
     protected $placeholders;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $delimiter = '__';
     
-   /**
-    * @var string[]|NULL
-    */
+    /**
+     * @var string[]|NULL
+     */
     protected $placeholderStrings;
     
-   /**
-    * @var Mailcode_Parser_Safeguard_Formatter
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard_Formatter
+     */
     protected $formatter;
     
     public function __construct(Mailcode_Parser $parser, string $subject)
@@ -113,25 +113,25 @@ 
         $this->originalString = $subject;
     }
     
-   /**
-    * Retrieves the string the safeguard was created for.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the string the safeguard was created for.
+     * 
+     * @return string
+     */
     public function getOriginalString() : string
     {
         return $this->originalString;
     }
     
-   /**
-    * Sets the delimiter character sequence used to prepend
-    * and append to the placeholders.
-    * 
-    * The delimiter's default is "__" (two underscores).
-    * 
-    * @param string $delimiter
-    * @return Mailcode_Parser_Safeguard
-    */
+    /**
+     * Sets the delimiter character sequence used to prepend
+     * and append to the placeholders.
+     * 
+     * The delimiter's default is "__" (two underscores).
+     * 
+     * @param string $delimiter
+     * @return Mailcode_Parser_Safeguard
+     */
     public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard
     {
         if(empty($delimiter))
@@ -153,15 +153,15 @@ 
         return $this->delimiter;
     }
     
-   /**
-    * Retrieves the safe string in which all commands have been replaced
-    * by placeholder strings.
-    *
-    * @return string
-    * @throws Mailcode_Exception 
-    *
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    */
+    /**
+     * Retrieves the safe string in which all commands have been replaced
+     * by placeholder strings.
+     *
+     * @return string
+     * @throws Mailcode_Exception 
+     *
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     */
     public function makeSafe() : string
     {
         $this->requireValidCollection();
@@ -169,16 +169,16 @@ 
         return $this->makeSafePartial();
     }
     
-   /**
-    * Like makeSafe(), but allows partial (invalid) commands: use this
-    * if the subject string may contain only part of the whole set of
-    * commands. 
-    * 
-    * Example: parsing a text with an opening if statement, without the 
-    * matching end statement.
-    * 
-    * @return string
-    */
+    /**
+     * Like makeSafe(), but allows partial (invalid) commands: use this
+     * if the subject string may contain only part of the whole set of
+     * commands. 
+     * 
+     * Example: parsing a text with an opening if statement, without the 
+     * matching end statement.
+     * 
+     * @return string
+     */
     public function makeSafePartial() : string
     {
         $replaces = $this->getReplaces();
@@ -216,10 +216,10 @@ 
         );
     }
     
-   /**
-    * Enables the formatter that ensures that all commands that
-    * @return Mailcode_Parser_Safeguard_Formatter_SingleLines
-    */
+    /**
+     * Enables the formatter that ensures that all commands that
+     * @return Mailcode_Parser_Safeguard_Formatter_SingleLines
+     */
     public function selectSingleLinesFormatter() : Mailcode_Parser_Safeguard_Formatter_SingleLines
     {
         $formatter = $this->selectFormatter('SingleLines');
@@ -239,13 +239,13 @@ 
         );
     }
     
-   /**
-    * Retrieves an associative array with pairs of
-    * [placeholder string => replacement text]. 
-    * 
-    * @param bool $highlighted
-    * @return string[]string
-    */
+    /**
+     * Retrieves an associative array with pairs of
+     * [placeholder string => replacement text]. 
+     * 
+     * @param bool $highlighted
+     * @return string[]string
+     */
     protected function getReplaces(bool $highlighted=false, bool $normalize=false) : array
     {
         $placeholders = $this->getPlaceholders();
@@ -276,12 +276,12 @@ 
     }
     
     
-   /**
-    * Retrieves all placeholders that have to be added to
-    * the subject text.
-    * 
-    * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[]
-    */
+    /**
+     * Retrieves all placeholders that have to be added to
+     * the subject text.
+     * 
+     * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[]
+     */
     public function getPlaceholders()
     {
         if(isset($this->placeholders))
@@ -336,17 +336,17 @@ 
         return str_replace($placeholderStrings, array_values($replaces), $string);
     }
     
-   /**
-    * Makes the string whole again after transforming or filtering it,
-    * by replacing the command placeholders with the original commands.
-    *
-    * @param string $string
-    * @return string
-    * @throws Mailcode_Exception
-    *
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING
-    */
+    /**
+     * Makes the string whole again after transforming or filtering it,
+     * by replacing the command placeholders with the original commands.
+     *
+     * @param string $string
+     * @return string
+     * @throws Mailcode_Exception
+     *
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING
+     */
     public function makeWhole(string $string) : string
     {
         return $this->restore(
@@ -356,15 +356,15 @@ 
         );
     }
     
-   /**
-    * Like `makeWhole()`, but ignores missing command placeholders.
-    *
-    * @param string $string
-    * @return string
-    * @throws Mailcode_Exception
-    *
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    */
+    /**
+     * Like `makeWhole()`, but ignores missing command placeholders.
+     *
+     * @param string $string
+     * @return string
+     * @throws Mailcode_Exception
+     *
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     */
     public function makeWholePartial(string $string) : string
     {
         return $this->restore(
@@ -374,20 +374,20 @@ 
         );
     }
 
-   /**
-    * Like `makeWhole()`, but replaces the commands with a syntax
-    * highlighted version, meant for human readable texts only.
-    * 
-    * Note: the commands lose their functionality (They cannot be 
-    * parsed from that string again).
-    *
-    * @param string $string
-    * @return string
-    * @throws Mailcode_Exception
-    *
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING
-    */
+    /**
+     * Like `makeWhole()`, but replaces the commands with a syntax
+     * highlighted version, meant for human readable texts only.
+     * 
+     * Note: the commands lose their functionality (They cannot be 
+     * parsed from that string again).
+     *
+     * @param string $string
+     * @return string
+     * @throws Mailcode_Exception
+     *
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING
+     */
     public function makeHighlighted(string $string) : string
     {
         return $this->restore(
@@ -397,15 +397,15 @@ 
         );
     }
     
-   /**
-    * Like `makeHighlighted()`, but ignores missing command placeholders.
-    * 
-    * @param string $string
-    * @return string
-    * @throws Mailcode_Exception
-    *
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    */
+    /**
+     * Like `makeHighlighted()`, but ignores missing command placeholders.
+     * 
+     * @param string $string
+     * @return string
+     * @throws Mailcode_Exception
+     *
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     */
     public function makeHighlightedPartial(string $string) : string
     {
         return $this->restore(
@@ -415,11 +415,11 @@ 
         );
     }
     
-   /**
-    * Retrieves the commands collection contained in the string.
-    * 
-    * @return Mailcode_Collection
-    */
+    /**
+     * Retrieves the commands collection contained in the string.
+     * 
+     * @return Mailcode_Collection
+     */
     public function getCollection() : Mailcode_Collection
     {
         if(isset($this->collection))
@@ -437,11 +437,11 @@ 
         return $this->getCollection()->isValid();
     }
     
-   /**
-    * @throws Mailcode_Exception
-    * 
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    */
+    /**
+     * @throws Mailcode_Exception
+     * 
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     */
     protected function requireValidCollection() : void
     {
         if($this->getCollection()->isValid())
@@ -460,11 +460,11 @@ 
         );
     }
     
-   /**
-    * Retrieves a list of all placeholder IDs used in the text.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all placeholder IDs used in the text.
+     * 
+     * @return string[]
+     */
     public function getPlaceholderStrings() : array
     {
         if(is_array($this->placeholderStrings))
@@ -491,13 +491,13 @@ 
         return in_array($subject, $ids);
     }
     
-   /**
-    * Retrieves a placeholder instance by its ID.
-    * 
-    * @param int $id
-    * @throws Mailcode_Exception If the placeholder was not found.
-    * @return Mailcode_Parser_Safeguard_Placeholder
-    */
+    /**
+     * Retrieves a placeholder instance by its ID.
+     * 
+     * @param int $id
+     * @throws Mailcode_Exception If the placeholder was not found.
+     * @return Mailcode_Parser_Safeguard_Placeholder
+     */
     public function getPlaceholderByID(int $id) : Mailcode_Parser_Safeguard_Placeholder
     {
         $placeholders = $this->getPlaceholders();
@@ -520,13 +520,13 @@ 
         );
     }
     
-   /**
-    * Retrieves a placeholder instance by its replacement text.
-    * 
-    * @param string $string
-    * @throws Mailcode_Exception
-    * @return Mailcode_Parser_Safeguard_Placeholder
-    */
+    /**
+     * Retrieves a placeholder instance by its replacement text.
+     * 
+     * @param string $string
+     * @throws Mailcode_Exception
+     * @return Mailcode_Parser_Safeguard_Placeholder
+     */
     public function getPlaceholderByString(string $string) : Mailcode_Parser_Safeguard_Placeholder
     {
         $placeholders = $this->getPlaceholders();

Spacing +22 added lines, -22 removed lines

@@ -134,7 +134,7 @@ 
     */
     public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard
     {
-        if(empty($delimiter))
+        if (empty($delimiter))
         {
             throw new Mailcode_Exception(
                 'Empty delimiter',
@@ -186,7 +186,7 @@ 
         $safe = str_replace(array_values($replaces), array_keys($replaces), $this->originalString);
 
         // If a formatter has been selected, let it modify the string.
-        if(isset($this->formatter))
+        if (isset($this->formatter))
         {
             $safe = $this->formatter->format($safe);
         }
@@ -198,7 +198,7 @@ 
     {
         $class = 'Mailcode\Mailcode_Parser_Safeguard_Formatter_'.$formatterID;
         
-        if(class_exists($class))
+        if (class_exists($class))
         {
             $this->formatter = new $class($this);
             
@@ -224,7 +224,7 @@ 
     {
         $formatter = $this->selectFormatter('SingleLines');
         
-        if($formatter instanceof Mailcode_Parser_Safeguard_Formatter_SingleLines)
+        if ($formatter instanceof Mailcode_Parser_Safeguard_Formatter_SingleLines)
         {
             return $formatter;
         }
@@ -246,21 +246,21 @@ 
     * @param bool $highlighted
     * @return string[]string
     */
-    protected function getReplaces(bool $highlighted=false, bool $normalize=false) : array
+    protected function getReplaces(bool $highlighted = false, bool $normalize = false) : array
     {
         $placeholders = $this->getPlaceholders();
         
         $replaces = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $replace = '';
             
-            if($highlighted)
+            if ($highlighted)
             {
                 $replace = $placeholder->getHighlightedText();
             }
-            else if($normalize)
+            else if ($normalize)
             {
                 $replace = $placeholder->getNormalizedText();
             }
@@ -284,7 +284,7 @@ 
     */
     public function getPlaceholders()
     {
-        if(isset($this->placeholders))
+        if (isset($this->placeholders))
         {
             return $this->placeholders;
         }
@@ -293,7 +293,7 @@ 
         
         $cmds = $this->getCollection()->getGroupedByHash();
         
-        foreach($cmds as $command)
+        foreach ($cmds as $command)
         {
             self::$counter++;
             
@@ -307,9 +307,9 @@ 
         return $this->placeholders;
     }
     
-    protected function restore(string $string, bool $partial=false, bool $highlighted=false) : string
+    protected function restore(string $string, bool $partial = false, bool $highlighted = false) : string
     {
-        if(!$partial)
+        if (!$partial)
         {
             $this->requireValidCollection();
         }
@@ -318,9 +318,9 @@ 
         
         $placeholderStrings = array_keys($replaces);
         
-        foreach($placeholderStrings as $search)
+        foreach ($placeholderStrings as $search)
         {
-            if(!$partial && !strstr($string, $search))
+            if (!$partial && !strstr($string, $search))
             {
                 throw new Mailcode_Exception(
                     'Command placeholder not found',
@@ -422,7 +422,7 @@ 
     */
     public function getCollection() : Mailcode_Collection
     {
-        if(isset($this->collection))
+        if (isset($this->collection))
         {
             return $this->collection;
         }
@@ -444,7 +444,7 @@ 
     */
     protected function requireValidCollection() : void
     {
-        if($this->getCollection()->isValid())
+        if ($this->getCollection()->isValid())
         {
             return;
         }
@@ -467,7 +467,7 @@ 
     */
     public function getPlaceholderStrings() : array
     {
-        if(is_array($this->placeholderStrings))
+        if (is_array($this->placeholderStrings))
         {
             return $this->placeholderStrings;
         }
@@ -476,7 +476,7 @@ 
         
         $this->placeholderStrings = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $this->placeholderStrings[] = $placeholder->getReplacementText();
         }
@@ -502,9 +502,9 @@ 
     {
         $placeholders = $this->getPlaceholders();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
-            if($placeholder->getID() === $id)
+            if ($placeholder->getID() === $id)
             {
                 return $placeholder;
             }
@@ -531,9 +531,9 @@ 
     {
         $placeholders = $this->getPlaceholders();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
-            if($placeholder->getReplacementText() === $string)
+            if ($placeholder->getReplacementText() === $string)
             {
                 return $placeholder;
             }

Braces +2 added lines, -4 removed lines

@@ -259,12 +259,10 @@
             if($highlighted)
             {
                 $replace = $placeholder->getHighlightedText();
-            }
-            else if($normalize)
+            } else if($normalize)
             {
                 $replace = $placeholder->getNormalizedText();
-            }
-            else
+            } else
             {
                 $replace = $placeholder->getOriginalText();
             }

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

Spacing +7 added lines, -7 removed lines

@@ -32,37 +32,37 @@
     
     protected function translateBody(Mailcode_Commands_IfBase $command) : string
     {
-        if($command instanceof Mailcode_Commands_Command_If_Command)
+        if ($command instanceof Mailcode_Commands_Command_If_Command)
         {
             return $this->translateCommand($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $this->translateVariable($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_If_Contains)
+        if ($command instanceof Mailcode_Commands_Command_If_Contains)
         {
             return $this->translateContains($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_If_Empty)
+        if ($command instanceof Mailcode_Commands_Command_If_Empty)
         {
             return $this->translateEmpty($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_If_NotEmpty)
+        if ($command instanceof Mailcode_Commands_Command_If_NotEmpty)
         {
             return $this->translateNotEmpty($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_If_BeginsWith)
+        if ($command instanceof Mailcode_Commands_Command_If_BeginsWith)
         {
             return $this->translateBeginsWith($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_If_EndsWith)
+        if ($command instanceof Mailcode_Commands_Command_If_EndsWith)
         {
             return $this->translateEndsWith($command);
         }