Mistralys / mailcode

src/Mailcode/Date/FormatInfo.php

Indentation +39 added lines, -39 removed lines

@@ -31,24 +31,24 @@ 
     const CHARTYPE_TIME = 'time';
     const CHARTYPE_PUNCTUATION = 'punctuation';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $defaultFormat = "Y/m/d";
     
-   /**
-    * @var Mailcode_Date_FormatInfo_Character[]
-    */
+    /**
+     * @var Mailcode_Date_FormatInfo_Character[]
+     */
     private $formatChars = array();
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     private $allowedChars = array();
     
-   /**
-    * @var Mailcode_Date_FormatInfo|NULL
-    */
+    /**
+     * @var Mailcode_Date_FormatInfo|NULL
+     */
     private static $instance;
     
     private function __construct()
@@ -66,11 +66,11 @@ 
         return self::$instance;
     }
 
-   /**
-    * Initialized the list of allowed date formatting
-    * characters. This is done only once per request
-    * by storing them statically for performance reasons.
-    */
+    /**
+     * Initialized the list of allowed date formatting
+     * characters. This is done only once per request
+     * by storing them statically for performance reasons.
+     */
     private function initCharacters() : void
     {
         $chars = array(
@@ -113,16 +113,16 @@ 
         $this->defaultFormat = $formatString;
     }
     
-   /**
-    * Validates the date format string, by ensuring that
-    * all the characters it is composed of are known.
-    *
-    * @param string $formatString
-    * @return OperationResult
-    * 
-    * @see Mailcode_Commands_Command_ShowDate::VALIDATION_EMPTY_FORMAT_STRING
-    * @see Mailcode_Commands_Command_ShowDate::VALIDATION_INVALID_FORMAT_CHARACTER
-    */
+    /**
+     * Validates the date format string, by ensuring that
+     * all the characters it is composed of are known.
+     *
+     * @param string $formatString
+     * @return OperationResult
+     * 
+     * @see Mailcode_Commands_Command_ShowDate::VALIDATION_EMPTY_FORMAT_STRING
+     * @see Mailcode_Commands_Command_ShowDate::VALIDATION_INVALID_FORMAT_CHARACTER
+     */
     public function validateFormat(string $formatString) : OperationResult
     {
         $result = new OperationResult($this);
@@ -161,23 +161,23 @@ 
         return $result;
     }
     
-   /**
-    * Retrieves all characters that are allowed to
-    * be used in a date format string, with information
-    * on each.
-    *
-    * @return Mailcode_Date_FormatInfo_Character[]
-    */
+    /**
+     * Retrieves all characters that are allowed to
+     * be used in a date format string, with information
+     * on each.
+     *
+     * @return Mailcode_Date_FormatInfo_Character[]
+     */
     public function getCharactersList() : array
     {
         return $this->formatChars;
     }
     
-   /**
-    * Retrieves the characters list, grouped by type label.
-    * 
-    * @return array<string, array>
-    */
+    /**
+     * Retrieves the characters list, grouped by type label.
+     * 
+     * @return array<string, array>
+     */
     public function getCharactersGrouped() : array
     {
         $grouped = array();

Spacing +9 added lines, -9 removed lines

@@ -58,7 +58,7 @@ 
     
     public static function getInstance() : Mailcode_Date_FormatInfo
     {
-        if(!isset(self::$instance))
+        if (!isset(self::$instance))
         {
             self::$instance = new Mailcode_Date_FormatInfo();
         }
@@ -90,7 +90,7 @@ 
             array(self::CHARTYPE_PUNCTUATION, ' ', t('Space'))
         );
         
-        foreach($chars as $def)
+        foreach ($chars as $def)
         {
             $char = new Mailcode_Date_FormatInfo_Character(
                 $def[0],
@@ -129,7 +129,7 @@ 
         
         $trimmed = trim($formatString);
         
-        if(empty($trimmed))
+        if (empty($trimmed))
         {
             $result->makeError(
                 t('Empty date format.'),
@@ -142,15 +142,15 @@ 
         $chars = ConvertHelper::string2array($formatString);
         $total = count($chars);
         
-        for($i=0; $i < $total; $i++)
+        for ($i = 0; $i < $total; $i++)
         {
             $char = $chars[$i];
             
-            if(!in_array($char, $this->allowedChars))
+            if (!in_array($char, $this->allowedChars))
             {
                 $result->makeError(
                     t('Invalid character in date format:').' '.
-                    t('%1$s at position %2$s.', '<code>'.$char.'</code>', $i+1),
+                    t('%1$s at position %2$s.', '<code>'.$char.'</code>', $i + 1),
                     self::VALIDATION_INVALID_FORMAT_CHARACTER
                 );
                 
@@ -182,11 +182,11 @@ 
     {
         $grouped = array();
         
-        foreach($this->formatChars as $char)
+        foreach ($this->formatChars as $char)
         {
             $type = $char->getTypeLabel();
             
-            if(!isset($grouped[$type]))
+            if (!isset($grouped[$type]))
             {
                 $grouped[$type] = array();
             }
@@ -196,7 +196,7 @@ 
 
         $groups = array_keys($grouped);
         
-        foreach($groups as $group)
+        foreach ($groups as $group)
         {
             usort($grouped[$group], function(Mailcode_Date_FormatInfo_Character $a, Mailcode_Date_FormatInfo_Character $b)
             {

src/Mailcode/Factory/CommandSets/Set.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         
         $this->instantiator->checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_End)
+        if ($cmd instanceof Mailcode_Commands_Command_End)
         {
             return $cmd;
         }

Indentation +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  */
 abstract class Mailcode_Factory_CommandSets_Set
 {
-   /**
-    * @var Mailcode_Factory_Instantiator
-    */
+    /**
+     * @var Mailcode_Factory_Instantiator
+     */
     protected $instantiator;
 
     /**

src/Mailcode/Factory/CommandSets/IfBase.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         
         $this->instantiator->checkCommand($cmd);
         
-        if($cmd instanceof Mailcode_Commands_Command_Else)
+        if ($cmd instanceof Mailcode_Commands_Command_Else)
         {
             return $cmd;
         }

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,8 @@ 
  */
 abstract class Mailcode_Factory_CommandSets_IfBase extends Mailcode_Factory_CommandSets_Set
 {
-    public function else() : Mailcode_Commands_Command_Else
+    public function else {
+        () : Mailcode_Commands_Command_Else
     {
         $cmd = Mailcode::create()->getCommands()->createCommand(
             'Else',
@@ -28,6 +29,7 @@ 
             '',
             '{else}'
         );
+    }
         
         $this->instantiator->checkCommand($cmd);
         

src/Mailcode/Factory/CommandSets.php

Indentation +6 added lines, -6 removed lines

@@ -35,14 +35,14 @@
      */
     private $misc;
     
-   /**
-    * @var Mailcode_Factory_CommandSets_Set_Set
-    */
+    /**
+     * @var Mailcode_Factory_CommandSets_Set_Set
+     */
     private $set;
     
-   /**
-    * @var Mailcode_Factory_CommandSets_Set_ElseIf
-    */
+    /**
+     * @var Mailcode_Factory_CommandSets_Set_ElseIf
+     */
     private $elseIf;
     
     public function if() : Mailcode_Factory_CommandSets_Set_If

Spacing +7 added lines, -7 removed lines

@@ -45,9 +45,9 @@ 
     */
     private $elseIf;
     
-    public function if() : Mailcode_Factory_CommandSets_Set_If
+    public function if () : Mailcode_Factory_CommandSets_Set_If
     {
-        if(!isset($this->if))
+        if (!isset($this->if))
         {
             $this->if = new Mailcode_Factory_CommandSets_Set_If();
         }
@@ -55,9 +55,9 @@ 
         return $this->if;
     }
     
-    public function elseIf() : Mailcode_Factory_CommandSets_Set_ElseIf
+    public function elseIf () : Mailcode_Factory_CommandSets_Set_ElseIf
     {
-        if(!isset($this->elseIf))
+        if (!isset($this->elseIf))
         {
             $this->elseIf = new Mailcode_Factory_CommandSets_Set_ElseIf();
         }
@@ -67,7 +67,7 @@ 
     
     public function show() : Mailcode_Factory_CommandSets_Set_Show
     {
-        if(!isset($this->show))
+        if (!isset($this->show))
         {
             $this->show = new Mailcode_Factory_CommandSets_Set_Show();
         }
@@ -77,7 +77,7 @@ 
     
     public function misc() : Mailcode_Factory_CommandSets_Set_Misc
     {
-        if(!isset($this->misc))
+        if (!isset($this->misc))
         {
             $this->misc = new Mailcode_Factory_CommandSets_Set_Misc();
         }
@@ -87,7 +87,7 @@ 
     
     public function set() : Mailcode_Factory_CommandSets_Set_Set
     {
-        if(!isset($this->set))
+        if (!isset($this->set))
         {
             $this->set = new Mailcode_Factory_CommandSets_Set_Set();
         }

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

@@ -39,7 +39,7 @@ 
         // IF type.
         $method = 'translate'.$this->getIfType($command);
 
-        if(method_exists($this, $method))
+        if (method_exists($this, $method))
         {
             return strval($this->$method($command));
         }
@@ -53,11 +53,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);
             }
@@ -80,7 +80,7 @@ 
     
     protected function getSign(Mailcode_Commands_LogicKeywords_Keyword $keyword) : string
     {
-        switch($keyword->getName())
+        switch ($keyword->getName())
         {
             case 'and':
                 return '&&';
@@ -113,7 +113,7 @@ 
     {
         $sign = '';
         
-        if($notEmpty)
+        if ($notEmpty)
         {
             $sign = '!';
         }
@@ -129,12 +129,12 @@ 
     {
         $params = $command->getParams();
 
-        if(!$params)
+        if (!$params)
         {
             return '';
         }
 
-        if($command->hasFreeformParameters())
+        if ($command->hasFreeformParameters())
         {
             return $params->getStatementString();
         }
@@ -142,18 +142,18 @@ 
         return $params->getNormalized();
     }
     
-    protected function _translateVariable(Mailcode_Variables_Variable $variable, string $comparator, string $value, bool $insensitive=false) : string
+    protected function _translateVariable(Mailcode_Variables_Variable $variable, string $comparator, string $value, bool $insensitive = false) : string
     {
         $booleanCheck = strtolower(trim($value, '"'));
         $fullName = $variable->getFullName();
 
-        if(in_array($booleanCheck, array('true', 'false')))
+        if (in_array($booleanCheck, array('true', 'false')))
         {
             $insensitive = true;
             $value = '"'.$booleanCheck.'"';
         }
 
-        if($insensitive)
+        if ($insensitive)
         {
             $fullName .= '.toLowerCase()';
             $value = mb_strtolower($value);
@@ -185,7 +185,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,14 +68,14 @@ 
     {
         $params = $command->getParams();
         
-        if($params === null)
+        if ($params === null)
         {
             return;
         }
         
         $tokens = $params->getInfo()->getTokens();
 
-        if(!empty($tokens))
+        if (!empty($tokens))
         {
             $this->parts[] = '<span class="mailcode-params">';
 
@@ -95,14 +95,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);
         }
@@ -114,7 +114,7 @@ 
         
         $type = $keyword->getType();
         
-        if(!empty($type))
+        if (!empty($type))
         {
             $this->parts[] = ' '.$this->renderTag(array('command-type'), $type);
         }
@@ -133,7 +133,7 @@ 
     {
         $parts = array();
         
-        foreach($classes as $class)
+        foreach ($classes as $class)
         {
             $parts[] = 'mailcode-'.$class;
         }