Mistralys / mailcode

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

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',

Indentation +29 added lines, -29 removed lines

@@ -24,14 +24,14 @@ 
 {
     public 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(

src/Mailcode/Commands/LogicKeywords/Keyword.php

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

Indentation +51 added lines, -51 removed lines

@@ -29,39 +29,39 @@ 
     public const VALIDATION_NO_COMMAND_CREATED = 61101;
     public 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();

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

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 +6 added lines, -6 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,19 +65,19 @@ 
                     Mailcode_Factory::misc()->comment('Some comments here'),
                     Mailcode_Factory::show()->snippet('snippet_name'),
                     Mailcode_Factory::show()->date('DATE.VARIABLE'),
-                    Mailcode_Factory::if()->if('1 + 1 == 2'),
-                    Mailcode_Factory::if()->contains('CUSTOMER.NAME', array('John')),
-                    Mailcode_Factory::if()->varEquals('NUMBER', '124'),
+                    Mailcode_Factory::if ()->if('1 + 1 == 2'),
+                    Mailcode_Factory::if ()->contains('CUSTOMER.NAME', array('John')),
+                    Mailcode_Factory::if ()->varEquals('NUMBER', '124'),
                 );
                 
-                $and = Mailcode_Factory::elseIf()->varEqualsString('STRINGVAR', 'John');
+                $and = Mailcode_Factory::elseIf ()->varEqualsString('STRINGVAR', 'John');
                 $and->getLogicKeywords()->appendOR('$STRINGVAR == "Steve"', "variable");
                 
                 $commands[] = $and;
                 
                 $commands[] = Mailcode_Factory::misc()->end();
                 
-                foreach($commands as $command)
+                foreach ($commands as $command)
                 {
                     ?>
                     	<p>

Braces +6 added lines, -2 removed lines

@@ -65,12 +65,16 @@
                     Mailcode_Factory::misc()->comment('Some comments here'),
                     Mailcode_Factory::show()->snippet('snippet_name'),
                     Mailcode_Factory::show()->date('DATE.VARIABLE'),
-                    Mailcode_Factory::if()->if('1 + 1 == 2'),
+                    Mailcode_Factory::if() {
+                        ->if('1 + 1 == 2'),
                     Mailcode_Factory::if()->contains('CUSTOMER.NAME', array('John')),
                     Mailcode_Factory::if()->varEquals('NUMBER', '124'),
                 );
+                    }
                 
-                $and = Mailcode_Factory::elseIf()->varEqualsString('STRINGVAR', 'John');
+                $and = Mailcode_Factory::elseIf() {
+                    ->varEqualsString('STRINGVAR', 'John');
+                }
                 $and->getLogicKeywords()->appendOR('$STRINGVAR == "Steve"', "variable");
                 
                 $commands[] = $and;

src/Mailcode/Parser/Statement/Validator/TokenType.php

Spacing +5 added lines, -5 removed lines

@@ -72,12 +72,12 @@ 
     protected function isMatch(Mailcode_Parser_Statement_Tokenizer_Token $token, int $index) : bool
     {
         // filter out tokens of other types
-        if(!is_a($token, $this->getTokenClass()))
+        if (!is_a($token, $this->getTokenClass()))
         {
             return false;
         }
         
-        if($this->searchIndex >= 0 && $index !== $this->searchIndex)
+        if ($this->searchIndex >= 0 && $index !== $this->searchIndex)
         {
             return false;
         }
@@ -96,9 +96,9 @@ 
     {
         $tokens = $this->params->getTokens();
         
-        foreach($tokens as $index => $token)
+        foreach ($tokens as $index => $token)
         {
-            if($this->isMatch($token, $index))
+            if ($this->isMatch($token, $index))
             {
                 return $token;
             }
@@ -111,7 +111,7 @@ 
     {
         $token = $this->findToken();
         
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token && is_a($token, $this->getTokenClass()))
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token && is_a($token, $this->getTokenClass()))
         {
             $this->token = $token;
             return true;

Indentation +52 added lines, -52 removed lines

@@ -22,53 +22,53 @@ 
 {
     public const VALIDATION_ERROR_COMMAND_WITHOUT_PARAMETERS = 62401;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $searchIndex = -1;
     
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer_Token|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer_Token|NULL
+     */
     protected $token;
     
-   /**
-    * Retrieves the class name of the token type to 
-    * limit the token search to. Only a token of this
-    * type will be stored.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the class name of the token type to 
+     * limit the token search to. Only a token of this
+     * type will be stored.
+     * 
+     * @return string
+     */
     abstract protected function getTokenClass() : string;
     
-   /**
-    * Allows the validator to apply custom search
-    * criteria to the tokens that are searched 
-    * through to find the target token.
-    * 
-    * NOTE: Should return true if there are no
-    * custom criteria to apply.
-    * 
-    * @param Mailcode_Parser_Statement_Tokenizer_Token $token
-    * @return bool
-    */
+    /**
+     * Allows the validator to apply custom search
+     * criteria to the tokens that are searched 
+     * through to find the target token.
+     * 
+     * NOTE: Should return true if there are no
+     * custom criteria to apply.
+     * 
+     * @param Mailcode_Parser_Statement_Tokenizer_Token $token
+     * @return bool
+     */
     abstract protected function _isMatch(Mailcode_Parser_Statement_Tokenizer_Token $token) : bool;
     
-   /**
-    * @return Mailcode_Parser_Statement_Tokenizer_Token
-    */
+    /**
+     * @return Mailcode_Parser_Statement_Tokenizer_Token
+     */
     abstract public function getToken();
     
-   /**
-    * Checks if the specified token matches the current
-    * search criteria (index, type...). If the token is
-    * a match, the `_isMatch()` method is called to allow
-    * the validator class to apply some custom criteria. 
-    * 
-    * @param Mailcode_Parser_Statement_Tokenizer_Token $token
-    * @param int $index
-    * @return bool
-    */
+    /**
+     * Checks if the specified token matches the current
+     * search criteria (index, type...). If the token is
+     * a match, the `_isMatch()` method is called to allow
+     * the validator class to apply some custom criteria. 
+     * 
+     * @param Mailcode_Parser_Statement_Tokenizer_Token $token
+     * @param int $index
+     * @return bool
+     */
     protected function isMatch(Mailcode_Parser_Statement_Tokenizer_Token $token, int $index) : bool
     {
         // filter out tokens of other types
@@ -85,13 +85,13 @@ 
         return $this->_isMatch($token);
     }
     
-   /**
-    * Attempts to find a token in the statement
-    * that matches the current criteria, and the
-    * first one it finds is returned.
-    * 
-    * @return Mailcode_Parser_Statement_Tokenizer_Token|NULL
-    */
+    /**
+     * Attempts to find a token in the statement
+     * that matches the current criteria, and the
+     * first one it finds is returned.
+     * 
+     * @return Mailcode_Parser_Statement_Tokenizer_Token|NULL
+     */
     protected function findToken() : ?Mailcode_Parser_Statement_Tokenizer_Token
     {
         $tokens = $this->params->getTokens();
@@ -120,14 +120,14 @@ 
         return false;
     }
     
-   /**
-    * Searches for a specific token index.
-    * 
-    * NOTE: only relevant when trying to find a single token.
-    * 
-    * @param int $index
-    * @return $this
-    */
+    /**
+     * Searches for a specific token index.
+     * 
+     * NOTE: only relevant when trying to find a single token.
+     * 
+     * @param int $index
+     * @return $this
+     */
     public function setIndex(int $index) : Mailcode_Parser_Statement_Validator_TokenType
     {
         $this->searchIndex = $index;

src/Mailcode/Parser/Statement/Validator/Type.php

Indentation +12 added lines, -12 removed lines

@@ -20,9 +20,9 @@ 
  */
 abstract class Mailcode_Parser_Statement_Validator_Type
 {
-   /**
-    * @var Mailcode_Parser_Statement
-    */
+    /**
+     * @var Mailcode_Parser_Statement
+     */
     protected $statement;
     
     /**
@@ -30,14 +30,14 @@ 
      */
     protected $params;
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     private $valid = true;
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     private $validated = false;
     
     public function __construct(Mailcode_Parser_Statement $statement)
@@ -53,9 +53,9 @@ 
         
     }
     
-   /**
-    * @return $this
-    */
+    /**
+     * @return $this
+     */
     public function validate() : Mailcode_Parser_Statement_Validator_Type
     {
         if(!$this->validated)

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     */
     public function validate() : Mailcode_Parser_Statement_Validator_Type
     {
-        if(!$this->validated)
+        if (!$this->validated)
         {
             $this->valid = $this->_validate();
             $this->validated = true;

src/Mailcode/Parser/Statement/Validator/Type/Keyword.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     
     public function getToken() : Mailcode_Parser_Statement_Tokenizer_Token_Keyword
     {
-        if($this->token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
+        if ($this->token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
         {
             return $this->token;
         }

Indentation +4 added lines, -4 removed lines

@@ -22,10 +22,10 @@
 {
     public const ERROR_NO_KEYWORD_TOKEN_FOUND = 62701;
     
-   /**
-    * The name of the keyword, with ":" appended.
-    * @var string
-    */
+    /**
+     * The name of the keyword, with ":" appended.
+     * @var string
+     */
     protected $keywordName;
     
     public function __construct(Mailcode_Parser_Statement $statement, string $keywordName)