Mistralys / mailcode

src/Mailcode/Parser/Statement/Info.php

Indentation +21 added lines, -21 removed lines

@@ -21,14 +21,14 @@ 
  */
 class Mailcode_Parser_Statement_Info
 {
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer
+     */
     protected $tokenizer;
     
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer_Token[]
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer_Token[]
+     */
     protected $tokens = array();
     
     public function __construct(Mailcode_Parser_Statement_Tokenizer $tokenizer)
@@ -37,11 +37,11 @@ 
         $this->tokens = $this->tokenizer->getTokens(); 
     }
     
-   /**
-    * Whether the whole statement is a variable being assigned a value.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the whole statement is a variable being assigned a value.
+     * 
+     * @return bool
+     */
     public function isVariableAssignment() : bool
     {
         $variable = $this->getVariableByIndex(0);
@@ -56,11 +56,11 @@ 
         return false;
     }
     
-   /**
-    * Whether the whole statement is a variable being compared to something.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the whole statement is a variable being compared to something.
+     * 
+     * @return bool
+     */
     public function isVariableComparison() : bool
     {
         $variable = $this->getVariableByIndex(0);
@@ -75,11 +75,11 @@ 
         return false;
     }
     
-   /**
-    * Retrieves all variables used in the statement.
-    * 
-    * @return \Mailcode\Mailcode_Variables_Variable[]
-    */
+    /**
+     * Retrieves all variables used in the statement.
+     * 
+     * @return \Mailcode\Mailcode_Variables_Variable[]
+     */
     public function getVariables()
     {
         $result = array();

Spacing +8 added lines, -8 removed lines

@@ -48,7 +48,7 @@ 
         $operand = $this->getOperandByIndex(1);
         $value = $this->getTokenByIndex(2);
         
-        if($variable && $operand && $value && $operand->isAssignment())
+        if ($variable && $operand && $value && $operand->isAssignment())
         {
             return true;
         }
@@ -67,7 +67,7 @@ 
         $operand = $this->getOperandByIndex(1);
         $value = $this->getTokenByIndex(2);
         
-        if($variable && $operand && $value && $operand->isComparator())
+        if ($variable && $operand && $value && $operand->isComparator())
         {
             return true;
         }
@@ -84,9 +84,9 @@ 
     {
         $result = array();
         
-        foreach($this->tokens as $token)
+        foreach ($this->tokens as $token)
         {
-            if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
+            if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
             {
                 $result[] = $token->getVariable();
             }
@@ -99,7 +99,7 @@ 
     {
         $token = $this->getTokenByIndex($index);
         
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
         {
             return $token;
         }
@@ -111,7 +111,7 @@ 
     {
         $token = $this->getTokenByIndex($index);
         
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
         {
             return $token;
         }
@@ -123,7 +123,7 @@ 
     {
         $token = $this->getTokenByIndex($index);
         
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand)
         {
             return $token;
         }
@@ -133,7 +133,7 @@ 
     
     public function getTokenByIndex(int $index) : ?Mailcode_Parser_Statement_Tokenizer_Token
     {
-        if(isset($this->tokens[$index]))
+        if (isset($this->tokens[$index]))
         {
             return $this->tokens[$index];
         }

src/Mailcode/Parser/Statement/Tokenizer/Token/Operand.php

Indentation +10 added lines, -10 removed lines

@@ -30,11 +30,11 @@ 
         return $this->getOperand();
     }
     
-   /**
-    * Whether the operator is comparison related (equals, not equals, smaller, greater...).
-    *  
-    * @return bool
-    */
+    /**
+     * Whether the operator is comparison related (equals, not equals, smaller, greater...).
+     *  
+     * @return bool
+     */
     public function isComparator() : bool
     {
         return 
@@ -46,11 +46,11 @@ 
         $this->isSmallerOrEquals();
     }
     
-   /**
-    * Whether the operator is calculation related (minus, plus, divide, multiply).
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the operator is calculation related (minus, plus, divide, multiply).
+     * 
+     * @return bool
+     */
     public function isCalculator() : bool
     {
         return 

src/Mailcode/Parser/Statement/Tokenizer/Token/Variable.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     
     public function getVariable() : Mailcode_Variables_Variable
     {
-        if($this->subject instanceof Mailcode_Variables_Variable)
+        if ($this->subject instanceof Mailcode_Variables_Variable)
         {
             return $this->subject;
         }

src/Mailcode/Parser/Statement/Tokenizer/Token.php

Indentation +14 added lines, -14 removed lines

@@ -20,26 +20,26 @@
  */
 abstract class Mailcode_Parser_Statement_Tokenizer_Token
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $tokenID;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $matchedText;
     
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $subject;
     
-   /**
-    * @param string $tokenID
-    * @param string $matchedText
-    * @param mixed $subject
-    */
+    /**
+     * @param string $tokenID
+     * @param string $matchedText
+     * @param mixed $subject
+     */
     public function __construct(string $tokenID, string $matchedText, $subject=null)
     {
         $this->tokenID = $tokenID;

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     * @param string $matchedText
     * @param mixed $subject
     */
-    public function __construct(string $tokenID, string $matchedText, $subject=null)
+    public function __construct(string $tokenID, string $matchedText, $subject = null)
     {
         $this->tokenID = $tokenID;
         $this->matchedText = $matchedText;

src/Mailcode/Parser/Statement/Tokenizer.php

Indentation +51 added lines, -51 removed lines

@@ -23,9 +23,9 @@ 
 {
     const ERROR_TOKENIZE_METHOD_MISSING = 49801;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $operands = array(
         '==',
         '<=',
@@ -40,16 +40,16 @@ 
         '<'
     );
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $keywords = array(
         'in:'
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $delimiter = '§§';
     
     /**
@@ -65,19 +65,19 @@ 
         'extract_tokens'
     );
     
-   /**
-    * @var Mailcode_Parser_Statement
-    */
+    /**
+     * @var Mailcode_Parser_Statement
+     */
     protected $statement;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $tokenized;
     
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer_Token[]
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer_Token[]
+     */
     protected $tokensTemporary = array();
     
     /**
@@ -85,9 +85,9 @@ 
      */
     protected $tokensOrdered = array();
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected static $ids = array();
     
     public function __construct(Mailcode_Parser_Statement $statement)
@@ -97,12 +97,12 @@ 
         $this->tokenize($statement->getStatementString());
     }
 
-   /**
-    * Retrieves all tokens detected in the statement string, in 
-    * the order they were found.
-    * 
-    * @return Mailcode_Parser_Statement_Tokenizer_Token[]
-    */
+    /**
+     * Retrieves all tokens detected in the statement string, in 
+     * the order they were found.
+     * 
+     * @return Mailcode_Parser_Statement_Tokenizer_Token[]
+     */
     public function getTokens()
     {
         return $this->tokensOrdered;
@@ -113,11 +113,11 @@ 
         return !empty($this->tokensOrdered);
     }
     
-   /**
-    * Whether there were any unknown tokens in the statement.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether there were any unknown tokens in the statement.
+     * 
+     * @return bool
+     */
     public function hasUnknown() : bool
     {
         $unknown = $this->getUnknown();
@@ -125,11 +125,11 @@ 
         return !empty($unknown);
     }
     
-   /**
-    * Retrieves all unknown content tokens, if any.
-    * 
-    * @return \Mailcode\Mailcode_Parser_Statement_Tokenizer_Token_Unknown[]
-    */
+    /**
+     * Retrieves all unknown content tokens, if any.
+     * 
+     * @return \Mailcode\Mailcode_Parser_Statement_Tokenizer_Token_Unknown[]
+     */
     public function getUnknown()
     {
         $result = array();
@@ -199,13 +199,13 @@ 
         }
     }
    
-   /**
-    * Registers a token to add in the statement string.
-    * 
-    * @param string $type
-    * @param string $matchedText
-    * @param mixed $subject
-    */
+    /**
+     * Registers a token to add in the statement string.
+     * 
+     * @param string $type
+     * @param string $matchedText
+     * @param mixed $subject
+     */
     protected function registerToken(string $type, string $matchedText, $subject=null) : void
     {
         $tokenID = $this->generateID();
@@ -317,13 +317,13 @@ 
         }
     }
     
-   /**
-    * Generates a unique alphabet-based ID without numbers
-    * to use as token name, to avoid conflicts with the
-    * numbers detection.
-    * 
-    * @return string
-    */
+    /**
+     * Generates a unique alphabet-based ID without numbers
+     * to use as token name, to avoid conflicts with the
+     * numbers detection.
+     * 
+     * @return string
+     */
     protected function generateID() : string
     {
         static $alphas;

Spacing +22 added lines, -22 removed lines

@@ -134,9 +134,9 @@ 
     {
         $result = array();
         
-        foreach($this->tokensOrdered as $token)
+        foreach ($this->tokensOrdered as $token)
         {
-            if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown)
+            if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown)
             {
                 $result[] = $token;
             }
@@ -149,7 +149,7 @@ 
     {
         $unknown = $this->getUnknown();
         
-        if(!empty($unknown))
+        if (!empty($unknown))
         {
             return array_shift($unknown);
         }
@@ -161,11 +161,11 @@ 
     {
         $parts = array();
         
-        foreach($this->tokensOrdered as $token)
+        foreach ($this->tokensOrdered as $token)
         {
             $string = $token->getNormalized();
             
-            if(!empty($string))
+            if (!empty($string))
             {
                 $parts[] = $string;
             }
@@ -178,11 +178,11 @@ 
     {
         $this->tokenized = trim($statement);
         
-        foreach($this->tokenCategories as $token)
+        foreach ($this->tokenCategories as $token)
         {
             $method = 'tokenize_'.$token;
             
-            if(!method_exists($this, $method))
+            if (!method_exists($this, $method))
             {
                 throw new Mailcode_Exception(
                     'Unknown statement token.',
@@ -206,7 +206,7 @@ 
     * @param string $matchedText
     * @param mixed $subject
     */
-    protected function registerToken(string $type, string $matchedText, $subject=null) : void
+    protected function registerToken(string $type, string $matchedText, $subject = null) : void
     {
         $tokenID = $this->generateID();
         
@@ -223,9 +223,9 @@ 
     
     protected function getTokenByID(string $tokenID) : ?Mailcode_Parser_Statement_Tokenizer_Token
     {
-        foreach($this->tokensTemporary as $token)
+        foreach ($this->tokensTemporary as $token)
         {
-            if($token->getID() === $tokenID)
+            if ($token->getID() === $tokenID)
             {
                 return $token;
             }
@@ -241,9 +241,9 @@ 
     
     protected function tokenize_keywords() : void
     {
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
-            if(strstr($this->tokenized, $keyword))
+            if (strstr($this->tokenized, $keyword))
             {
                 $this->registerToken('Keyword', $keyword);
             }
@@ -257,12 +257,12 @@ 
         // over that could not be tokenized.
         $parts = \AppUtils\ConvertHelper::explodeTrim($this->delimiter, $this->tokenized);
 
-        foreach($parts as $part)
+        foreach ($parts as $part)
         {
             $token = $this->getTokenByID($part);
             
             // if the entry is a token, simply add it.
-            if($token)
+            if ($token)
             {
                 $this->tokensOrdered[] = $token;
             }
@@ -278,7 +278,7 @@ 
     {
         $vars = Mailcode::create()->findVariables($this->tokenized)->getGroupedByHash();
         
-        foreach($vars as $var)
+        foreach ($vars as $var)
         {
             $this->registerToken('Variable', $var->getMatchedText(), $var);
         }
@@ -286,9 +286,9 @@ 
     
     protected function tokenize_operands() : void
     {
-        foreach($this->operands as $operand)
+        foreach ($this->operands as $operand)
         {
-            if(strstr($this->tokenized, $operand))
+            if (strstr($this->tokenized, $operand))
             {
                 $this->registerToken('Operand', $operand);
             }
@@ -300,7 +300,7 @@ 
         $matches = array();
         preg_match_all('/"(.*)"/sx', $this->tokenized, $matches, PREG_PATTERN_ORDER);
         
-        foreach($matches[0] as $match)
+        foreach ($matches[0] as $match)
         {
             $this->registerToken('StringLiteral', $match);
         }
@@ -311,7 +311,7 @@ 
         $matches = array();
         preg_match_all('/-*[0-9]+\s*[.,]\s*[0-9]+|-*[0-9]+/sx', $this->tokenized, $matches, PREG_PATTERN_ORDER);
         
-        foreach($matches[0] as $match)
+        foreach ($matches[0] as $match)
         {
             $this->registerToken('Number', $match);
         }
@@ -328,7 +328,7 @@ 
     {
         static $alphas;
         
-        if(!isset($alphas))
+        if (!isset($alphas))
         {
             $alphas = range('A', 'Z');
         }
@@ -337,12 +337,12 @@ 
         
         $result = '';
         
-        for($i=0; $i < $amount; $i++)
+        for ($i = 0; $i < $amount; $i++)
         {
             $result .= $alphas[array_rand($alphas)];
         }
         
-        if(!in_array($result, self::$ids))
+        if (!in_array($result, self::$ids))
         {
             self::$ids[] = $result;
             return $result;

src/Mailcode/Parser/Statement.php

Indentation +13 added lines, -13 removed lines

@@ -29,24 +29,24 @@ 
     
     const VALIDATION_UNQUOTED_STRING_LITERALS = 48802;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $statement;
     
-   /**
-    * @var OperationResult
-    */
+    /**
+     * @var OperationResult
+     */
     protected $result;
     
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer|NULL
+     */
     protected $tokenizer;
     
-   /**
-    * @var Mailcode_Parser_Statement_Info|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Info|NULL
+     */
     protected $info;
     
     public function __construct(string $statement)
@@ -102,7 +102,7 @@ 
         if($unknown)
         {
             $this->result->makeError(
-               t('Unquoted string literal found:').' ('.$unknown->getMatchedText().')',
+                t('Unquoted string literal found:').' ('.$unknown->getMatchedText().')',
                 self::VALIDATION_UNQUOTED_STRING_LITERALS
             );
         }

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
     
     public function getInfo() : Mailcode_Parser_Statement_Info
     {
-        if(isset($this->info))
+        if (isset($this->info))
         {
             return $this->info; 
         }
@@ -87,7 +87,7 @@ 
     
     protected function validate() : void
     {
-        if(!$this->tokenizer->hasTokens())
+        if (!$this->tokenizer->hasTokens())
         {
             $this->result->makeError(
                 t('Empty statement'),
@@ -99,7 +99,7 @@ 
         
         $unknown = $this->tokenizer->getFirstUnknown();
         
-        if($unknown)
+        if ($unknown)
         {
             $this->result->makeError(
                t('Unquoted string literal found:').' ('.$unknown->getMatchedText().')',

src/Mailcode/Factory/Exception.php

Indentation +15 added lines, -15 removed lines

@@ -20,18 +20,18 @@ 
  */
 class Mailcode_Factory_Exception extends Mailcode_Exception
 {
-   /**
-    * @var Mailcode_Commands_Command|NULL
-    */
+    /**
+     * @var Mailcode_Commands_Command|NULL
+     */
     protected $command;
     
-   /**
-    * @param string $message
-    * @param string|NULL $details
-    * @param int|NULL $code
-    * @param \Exception|NULL $previous
-    * @param Mailcode_Commands_Command|NULL $command
-    */
+    /**
+     * @param string $message
+     * @param string|NULL $details
+     * @param int|NULL $code
+     * @param \Exception|NULL $previous
+     * @param Mailcode_Commands_Command|NULL $command
+     */
     public function __construct(string $message, $details=null, $code=null, $previous=null, Mailcode_Commands_Command $command=null)
     {
         parent::__construct($message, $details, $code, $previous);
@@ -39,11 +39,11 @@ 
         $this->command = $command;
     }
     
-   /**
-    * Retrieves the erroneous command, if any.
-    * 
-    * @return Mailcode_Commands_Command|NULL
-    */
+    /**
+     * Retrieves the erroneous command, if any.
+     * 
+     * @return Mailcode_Commands_Command|NULL
+     */
     public function getCommand() : ?Mailcode_Commands_Command
     {
         return $this->command;

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     * @param \Exception|NULL $previous
     * @param Mailcode_Commands_Command|NULL $command
     */
-    public function __construct(string $message, $details=null, $code=null, $previous=null, Mailcode_Commands_Command $command=null)
+    public function __construct(string $message, $details = null, $code = null, $previous = null, Mailcode_Commands_Command $command = null)
     {
         parent::__construct($message, $details, $code, $previous);
         

src/Mailcode/Commands/Command.php

Indentation +70 added lines, -70 removed lines

@@ -30,53 +30,53 @@ 
     const VALIDATION_UNKNOWN_COMMAND_NAME = 48304;
     const VALIDATION_INVALID_PARAMS_STATEMENT = 48305;
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type = '';
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $paramsString = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $matchedText = '';
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $hash = '';
     
-   /**
-    * @var \AppUtils\OperationResult
-    */
+    /**
+     * @var \AppUtils\OperationResult
+     */
     protected $validationResult = null;
     
-   /**
-    * @var \Mailcode\Mailcode
-    */
+    /**
+     * @var \Mailcode\Mailcode
+     */
     protected $mailcode;
     
-   /**
-    * @var \Mailcode\Mailcode_Parser_Statement
-    */
+    /**
+     * @var \Mailcode\Mailcode_Parser_Statement
+     */
     protected $params;
 
-   /**
-    * @var string[] 
-    */
+    /**
+     * @var string[] 
+     */
     protected $validations = array(
         'params',
         'type_supported',
         'type_unsupported'
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $comment = '';
     
     public function __construct(string $type='', string $paramsString='', string $matchedText='')
@@ -94,23 +94,23 @@ 
         
     }
     
-   /**
-    * @return string The ID of the command = the name of the command class file.
-    */
+    /**
+     * @return string The ID of the command = the name of the command class file.
+     */
     public function getID() : string
     {
         $tokens = explode('_', get_class($this));
         return array_pop($tokens);
     }
     
-   /**
-    * Sets an optional comment that is not used anywhere, but
-    * can be used by the application to track why a command is
-    * used somewhere. 
-    * 
-    * @param string $comment
-    * @return Mailcode_Commands_Command
-    */
+    /**
+     * Sets an optional comment that is not used anywhere, but
+     * can be used by the application to track why a command is
+     * used somewhere. 
+     * 
+     * @param string $comment
+     * @return Mailcode_Commands_Command
+     */
     public function setComment(string $comment) : Mailcode_Commands_Command
     {
         $this->comment = $comment;
@@ -118,34 +118,34 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves the previously set comment, if any.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the previously set comment, if any.
+     * 
+     * @return string
+     */
     public function getComment() : string
     {
         return $this->comment;
     }
     
-   /**
-    * Checks whether this is a dummy command, which is only
-    * used to access information on the command type. It cannot
-    * be used as an actual live command.
-    * 
-    * @return bool
-    */
+    /**
+     * Checks whether this is a dummy command, which is only
+     * used to access information on the command type. It cannot
+     * be used as an actual live command.
+     * 
+     * @return bool
+     */
     public function isDummy() : bool
     {
         return $this->type === '__dummy';
     }
     
-   /**
-    * Retrieves a hash of the actual matched command string,
-    * which is used in collections to detect duplicate commands.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves a hash of the actual matched command string,
+     * which is used in collections to detect duplicate commands.
+     * 
+     * @return string
+     */
     public function getHash() : string
     {
         $this->requireNonDummy();
@@ -237,9 +237,9 @@ 
         }
     }
     
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     abstract protected function getValidations() : array;
     
     protected function validateSyntax_params() : void
@@ -394,22 +394,22 @@ 
         return implode('', $parts);
     }
     
-   /**
-    * Retrieves the names of all the command's supported types: the part
-    * between the command name and the colon. Example: {command type: params}.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves the names of all the command's supported types: the part
+     * between the command name and the colon. Example: {command type: params}.
+     * 
+     * @return string[]
+     */
     public function getSupportedTypes() : array
     {
         return array();
     }
     
-   /**
-    * Retrieves all variable names used in the command.
-    * 
-    * @return Mailcode_Variables_Collection_Regular
-    */
+    /**
+     * Retrieves all variable names used in the command.
+     * 
+     * @return Mailcode_Variables_Collection_Regular
+     */
     public function getVariables() : Mailcode_Variables_Collection_Regular
     {
         return Mailcode::create()->findVariables($this->paramsString);

Spacing +20 added lines, -20 removed lines

@@ -79,7 +79,7 @@ 
     */
     protected $comment = '';
     
-    public function __construct(string $type='', string $paramsString='', string $matchedText='')
+    public function __construct(string $type = '', string $paramsString = '', string $matchedText = '')
     {
         $this->type = $type;
         $this->paramsString = $paramsString;
@@ -150,7 +150,7 @@ 
     {
         $this->requireNonDummy();
         
-        if($this->hash === '') {
+        if ($this->hash === '') {
             $this->hash = md5($this->matchedText);
         }
         
@@ -159,7 +159,7 @@ 
     
     protected function requireNonDummy() : void
     {
-        if(!$this->isDummy())
+        if (!$this->isDummy())
         {
             return;
         }
@@ -180,7 +180,7 @@ 
     {
         $this->requireNonDummy();
         
-        if(isset($this->validationResult)) 
+        if (isset($this->validationResult)) 
         {
             return $this->validationResult;
         }
@@ -194,7 +194,7 @@ 
     
     public function getValidationResult() :  \AppUtils\OperationResult
     {
-        if(isset($this->validationResult)) 
+        if (isset($this->validationResult)) 
         {
             return $this->validationResult;
         }
@@ -210,11 +210,11 @@ 
     {
         $validations = array_merge($this->validations, $this->getValidations());
         
-        foreach($validations as $validation)
+        foreach ($validations as $validation)
         {
             $method = 'validateSyntax_'.$validation;
             
-            if(!method_exists($this, $method))
+            if (!method_exists($this, $method))
             {
                 throw new Mailcode_Exception(
                     'Missing validation method',
@@ -230,7 +230,7 @@ 
             $this->$method();
             
             // break off at the first validation issue
-            if(!$this->validationResult->isValid())
+            if (!$this->validationResult->isValid())
             {
                 return;
             }
@@ -244,12 +244,12 @@ 
     
     protected function validateSyntax_params() : void
     {
-        if(!$this->requiresParameters())
+        if (!$this->requiresParameters())
         {
             return;
         }
         
-        if(empty($this->paramsString))
+        if (empty($this->paramsString))
         {
             $this->validationResult->makeError(
                 t('Parameters have to be specified.'),
@@ -260,7 +260,7 @@ 
         
         $this->params = $this->mailcode->getParser()->createStatement($this->paramsString);
         
-        if(!$this->params->isValid())
+        if (!$this->params->isValid())
         {
             $error = $this->params->getValidationResult();
             
@@ -273,14 +273,14 @@ 
     
     protected function validateSyntax_type_supported() : void
     {
-        if(!$this->supportsType() || empty($this->type))
+        if (!$this->supportsType() || empty($this->type))
         {
             return;
         }
         
         $types = $this->getSupportedTypes();
 
-        if(!in_array($this->type, $types))
+        if (!in_array($this->type, $types))
         {
             $this->validationResult->makeError(
                 t('The command addon %1$s is not supported.', $this->type).' '.
@@ -294,7 +294,7 @@ 
     
     protected function validateSyntax_type_unsupported() : void
     {
-        if($this->supportsType() || empty($this->type))
+        if ($this->supportsType() || empty($this->type))
         {
             return;
         }
@@ -312,7 +312,7 @@ 
     
     public function getType() : string
     {
-        if($this->supportsType())
+        if ($this->supportsType())
         {
             return $this->type;
         }
@@ -332,7 +332,7 @@ 
     
     public function getHighlighted() : string
     {
-        if(!$this->isValid())
+        if (!$this->isValid())
         {
             return '';
         }
@@ -343,7 +343,7 @@ 
     
     public function getParamsString() : string
     {
-        if($this->requiresParameters())
+        if ($this->requiresParameters())
         {
             return $this->paramsString;
         }
@@ -370,7 +370,7 @@ 
     
     public function getNormalized() : string
     {
-        if(!$this->isValid())
+        if (!$this->isValid())
         {
             return '';
         }
@@ -378,12 +378,12 @@ 
         $parts = array();
         $parts[] = '{'.$this->getName();
         
-        if($this->supportsType() && $this->hasType())
+        if ($this->supportsType() && $this->hasType())
         {
             $parts[] = ' '.$this->getType();
         }
         
-        if($this->requiresParameters() && isset($this->params))
+        if ($this->requiresParameters() && isset($this->params))
         {
             $parts[] = ': ';
             $parts[] = $this->params->getNormalized();

src/Mailcode/Collection.php

Indentation +51 added lines, -51 removed lines

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

Spacing +11 added lines, -11 removed lines

@@ -97,7 +97,7 @@ 
         
         $errors = $this->errors;
         
-        if(!$result->isValid())
+        if (!$result->isValid())
         {
             $errors[] = new Mailcode_Collection_Error_Message(
                 '',
@@ -139,11 +139,11 @@ 
     {
         $hashes = array();
         
-        foreach($this->commands as $command)
+        foreach ($this->commands as $command)
         {
             $hash = $command->getHash();
             
-            if(!isset($hashes[$hash]))
+            if (!isset($hashes[$hash]))
             {
                 $hashes[$hash] = $command;
             }
@@ -160,7 +160,7 @@ 
     */
     public function addCommands(array $commands) : Mailcode_Collection
     {
-        foreach($commands as $command)
+        foreach ($commands as $command)
         {
             $this->addCommand($command);
         }
@@ -179,7 +179,7 @@ 
     {
         $collection = new Mailcode_Variables_Collection_Regular();
         
-        foreach($this->commands as $command)
+        foreach ($this->commands as $command)
         {
             $collection->mergeWith($command->getVariables());
         }
@@ -189,7 +189,7 @@ 
     
     public function getValidationResult() : OperationResult
     {
-        if(isset($this->validationResult))
+        if (isset($this->validationResult))
         {
             return $this->validationResult;
         }
@@ -205,9 +205,9 @@ 
     {
         $errors = $this->getErrors();
         
-        foreach($errors as $error)
+        foreach ($errors as $error)
         {
-            if($error->getCode() === $code)
+            if ($error->getCode() === $code)
             {
                 return true;
             }
@@ -225,9 +225,9 @@ 
     {
         $result = array();
         
-        foreach($this->commands as $command)
+        foreach ($this->commands as $command)
         {
-            if($command instanceof Mailcode_Commands_Command_ShowVariable)
+            if ($command instanceof Mailcode_Commands_Command_ShowVariable)
             {
                 $result[] = $command;
             }
@@ -240,7 +240,7 @@ 
     {
         $commands = $this->getCommands();
         
-        if(!empty($commands))
+        if (!empty($commands))
         {
             return array_shift($commands);
         }