Mistralys / mailcode

src/Mailcode/Commands/Command.php

Indentation +85 added lines, -85 removed lines

@@ -32,44 +32,44 @@ 
     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_empty',
         'params_keywords',
@@ -78,24 +78,24 @@ 
         'type_unsupported'
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $comment = '';
     
-   /**
-    * @var Mailcode_Commands_LogicKeywords|NULL
-    */
+    /**
+     * @var Mailcode_Commands_LogicKeywords|NULL
+     */
     protected $logicKeywords;
     
-   /**
-    * @var Mailcode_Parser_Statement_Validator
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Validator
+     */
     protected $validator;
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     private $validated = false;
     
     public function __construct(string $type='', string $paramsString='', string $matchedText='')
@@ -114,9 +114,9 @@ 
         
     }
     
-   /**
-    * @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
     {
         // account for commands with types: If_Variable should still return If.
@@ -125,14 +125,14 @@ 
         return array_shift($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;
@@ -140,34 +140,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();
@@ -261,9 +261,9 @@ 
         return $this->validationResult->isValid();
     }
     
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     abstract protected function getValidations() : array;
     
     protected function validateSyntax_params_empty() : void
@@ -422,12 +422,12 @@ 
     
     abstract public function supportsType() : bool;
     
-   /**
-    * Whether the command allows using logic keywords like "and:" or "or:"
-    * in the command parameters.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the command allows using logic keywords like "and:" or "or:"
+     * in the command parameters.
+     * 
+     * @return bool
+     */
     abstract public function supportsLogicKeywords() : bool;
     
     abstract public function generatesContent() : bool;
@@ -473,22 +473,22 @@ 
         return $normalizer->normalize();
     }
     
-   /**
-    * 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 +25 added lines, -25 removed lines

@@ -98,7 +98,7 @@ 
     */
     private $validated = false;
     
-    public function __construct(string $type='', string $paramsString='', string $matchedText='')
+    public function __construct(string $type = '', string $paramsString = '', string $matchedText = '')
     {
         $this->type = $type;
         $this->paramsString = html_entity_decode($paramsString);
@@ -172,7 +172,7 @@ 
     {
         $this->requireNonDummy();
         
-        if($this->hash === '') {
+        if ($this->hash === '') {
             $this->hash = md5($this->matchedText);
         }
         
@@ -181,7 +181,7 @@ 
     
     protected function requireNonDummy() : void
     {
-        if(!$this->isDummy())
+        if (!$this->isDummy())
         {
             return;
         }
@@ -200,7 +200,7 @@ 
     
     protected function validate() : \AppUtils\OperationResult
     {
-        if(!$this->validated)
+        if (!$this->validated)
         {
             $this->requireNonDummy();
             $this->validateSyntax();
@@ -213,7 +213,7 @@ 
     
     public function getValidationResult() :  \AppUtils\OperationResult
     {
-        if(isset($this->validationResult)) 
+        if (isset($this->validationResult)) 
         {
             return $this->validationResult;
         }
@@ -229,10 +229,10 @@ 
     {
         $validations = array_merge($this->validations, $this->getValidations());
         
-        foreach($validations as $validation)
+        foreach ($validations as $validation)
         {
             // break off at the first validation issue
-            if(!$this->validateSyntaxMethod($validation))
+            if (!$this->validateSyntaxMethod($validation))
             {
                 return;
             }
@@ -243,7 +243,7 @@ 
     {
         $method = 'validateSyntax_'.$validation;
         
-        if(!method_exists($this, $method))
+        if (!method_exists($this, $method))
         {
             throw new Mailcode_Exception(
                 'Missing validation method ['.$validation.']',
@@ -268,12 +268,12 @@ 
     
     protected function validateSyntax_params_empty() : 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.'),
@@ -285,14 +285,14 @@ 
     
     protected function validateSyntax_params_keywords() : void
     {
-        if(!$this->supportsLogicKeywords())
+        if (!$this->supportsLogicKeywords())
         {
             return;
         }
         
         $this->logicKeywords = new Mailcode_Commands_LogicKeywords($this, $this->paramsString);
         
-        if(!$this->logicKeywords->isValid())
+        if (!$this->logicKeywords->isValid())
         {
             $this->validationResult->makeError(
                 t('Invalid parameters:').' '.$this->logicKeywords->getErrorMessage(),
@@ -307,14 +307,14 @@ 
     
     protected function validateSyntax_params_parse() : void
     {
-        if(!$this->requiresParameters())
+        if (!$this->requiresParameters())
         {
             return;
         }
         
         $this->params = $this->mailcode->getParser()->createStatement($this->paramsString);
         
-        if(!$this->params->isValid())
+        if (!$this->params->isValid())
         {
             $error = $this->params->getValidationResult();
             
@@ -331,14 +331,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).' '.
@@ -352,7 +352,7 @@ 
     
     protected function validateSyntax_type_unsupported() : void
     {
-        if($this->supportsType() || empty($this->type))
+        if ($this->supportsType() || empty($this->type))
         {
             return;
         }
@@ -370,7 +370,7 @@ 
     
     public function getType() : string
     {
-        if($this->supportsType())
+        if ($this->supportsType())
         {
             return $this->type;
         }
@@ -390,7 +390,7 @@ 
     
     public function getHighlighted() : string
     {
-        if(!$this->isValid())
+        if (!$this->isValid())
         {
             return '';
         }
@@ -401,7 +401,7 @@ 
     
     public function getParamsString() : string
     {
-        if($this->requiresParameters())
+        if ($this->requiresParameters())
         {
             return $this->paramsString;
         }
@@ -436,22 +436,22 @@ 
     
     public final function getCommandType() : string
     {
-        if($this instanceof Mailcode_Commands_Command_Type_Closing)
+        if ($this instanceof Mailcode_Commands_Command_Type_Closing)
         {
             return 'Closing';
         }
         
-        if($this instanceof Mailcode_Commands_Command_Type_Opening)
+        if ($this instanceof Mailcode_Commands_Command_Type_Opening)
         {
             return 'Opening';
         }
         
-        if($this instanceof Mailcode_Commands_Command_Type_Sibling)
+        if ($this instanceof Mailcode_Commands_Command_Type_Sibling)
         {
             return 'Sibling';
         }
         
-        if($this instanceof Mailcode_Commands_Command_Type_Standalone)
+        if ($this instanceof Mailcode_Commands_Command_Type_Standalone)
         {
             return 'Standalone';
         }
@@ -501,7 +501,7 @@ 
     
     public function getLogicKeywords() : Mailcode_Commands_LogicKeywords
     {
-        if($this->supportsLogicKeywords() && isset($this->logicKeywords))
+        if ($this->supportsLogicKeywords() && isset($this->logicKeywords))
         {
             return $this->logicKeywords;
         }

src/Mailcode/Commands/Command/SetVariable.php

Indentation +6 added lines, -6 removed lines

@@ -20,9 +20,9 @@ 
  */
 class Mailcode_Commands_Command_SetVariable extends Mailcode_Commands_Command implements Mailcode_Commands_Command_Type_Standalone
 {
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer_Token_Variable|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer_Token_Variable|NULL
+     */
     private $variableToken;
     
     public function getName() : string
@@ -126,9 +126,9 @@ 
         );
     }
     
-   /**
-    * @return Mailcode_Parser_Statement_Tokenizer_Token[]
-    */
+    /**
+     * @return Mailcode_Parser_Statement_Tokenizer_Token[]
+     */
     public function getAssignmentTokens() : array
     {
         $params = $this->params->getInfo()->getTokens();

Braces +1 added lines, -2 removed lines

@@ -76,8 +76,7 @@
         if($val->isValid())
         {
             $this->variableToken = $val->getToken();
-        }
-        else
+        } else
         {
             $this->validationResult->makeError(
                 'The first parameter must be a variable name.',

Spacing +8 added lines, -8 removed lines

@@ -73,7 +73,7 @@ 
     {
         $val = $this->validator->createVariable()->setIndex(0);
         
-        if($val->isValid())
+        if ($val->isValid())
         {
             $this->variableToken = $val->getToken();
         }
@@ -90,9 +90,9 @@ 
     {
         $tokens = $this->params->getInfo()->createPruner()->limitToOperands()->getTokens();
 
-        foreach($tokens as $token)
+        foreach ($tokens as $token)
         {
-            if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand)
+            if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand)
             {
                 $this->validateOperand($token);
             }
@@ -108,7 +108,7 @@ 
         
         // ensure that the operand we have in the command is one of the
         // allowed ones.
-        if(!in_array($sign, $allowed))
+        if (!in_array($sign, $allowed))
         {
             $this->validationResult->makeError(
                 t('The %1$s sign is not allowed in this command.', '<code>'.$sign.'</code>'),
@@ -121,7 +121,7 @@ 
     {
         $tokens = $this->getAssignmentTokens();
         
-        if(empty($tokens))
+        if (empty($tokens))
         {
             $this->validationResult->makeError(
                 t('No value assigned to the variable.'),
@@ -132,7 +132,7 @@ 
     
     public function getVariable() : Mailcode_Variables_Variable
     {
-        if($this->variableToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
+        if ($this->variableToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
         {
             return $this->variableToken->getVariable();
         }
@@ -156,7 +156,7 @@ 
         $eq = array_shift($params); // equals sign
         
         // in case the equals sign was omitted.
-        if(!$eq instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand)
+        if (!$eq instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand)
         {
             array_unshift($params, $eq);
         }
@@ -170,7 +170,7 @@ 
         
         $items = array();
         
-        foreach($tokens as $token)
+        foreach ($tokens as $token)
         {
             $items[] = $token->getNormalized();
         }

src/Mailcode/Traits/Commands/IfVariable.php

Indentation +3 added lines, -3 removed lines

@@ -36,9 +36,9 @@
         );
     }
     
-   /**
-    * @return array<string>
-    */
+    /**
+     * @return array<string>
+     */
     protected function getAllowedOperands() : array
     {
         return Mailcode_Parser_Statement_Tokenizer_Token_Operand::getComparisonSigns();

src/Mailcode/Traits/Commands/Validation/SearchTerm.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     {
         $val = $this->validator->createStringLiteral();
         
-        if($val->isValid())
+        if ($val->isValid())
         {
             $this->searchTerm = $val->getToken();
         }
@@ -48,7 +48,7 @@ 
     
     public function getSearchTerm() : string
     {
-        if($this->searchTerm instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
+        if ($this->searchTerm instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
         {
             return $this->searchTerm->getNormalized();
         }

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
         if($val->isValid())
         {
             $this->searchTerm = $val->getToken();
-        }
-        else
+        } else
         {
             $this->validationResult->makeError(
                 t('No search term specified.'),

src/Mailcode/Traits/Commands/Validation/Value.php

Indentation +8 added lines, -8 removed lines

@@ -24,9 +24,9 @@ 
  */
 trait Mailcode_Traits_Commands_Validation_Value
 {
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer_ValueInterface|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer_ValueInterface|NULL
+     */
     protected $valueToken;
     
     protected function validateSyntax_value() : void
@@ -46,11 +46,11 @@ 
         }
     }
     
-   /**
-    * Retrieves the variable being compared.
-    *
-    * @return string
-    */
+    /**
+     * Retrieves the variable being compared.
+     *
+     * @return string
+     */
     public function getValue() : string
     {
         if($this->valueToken instanceof Mailcode_Parser_Statement_Tokenizer_ValueInterface)

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     {
         $var = $this->validator->createValue();
         
-        if($var->isValid())
+        if ($var->isValid())
         {
             $this->valueToken = $var->getToken();
         }
@@ -53,7 +53,7 @@ 
     */
     public function getValue() : string
     {
-        if($this->valueToken instanceof Mailcode_Parser_Statement_Tokenizer_ValueInterface)
+        if ($this->valueToken instanceof Mailcode_Parser_Statement_Tokenizer_ValueInterface)
         {
             return $this->valueToken->getValue();
         }

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
         if($var->isValid())
         {
             $this->valueToken = $var->getToken();
-        }
-        else
+        } else
         {
             $this->validationResult->makeError(
                 t('No variable has been specified.'),

src/Mailcode/Traits/Commands/Validation/Operand.php

Indentation +11 added lines, -11 removed lines

@@ -25,14 +25,14 @@ 
  */
 trait Mailcode_Traits_Commands_Validation_Operand
 {
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer_Token_Operand|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer_Token_Operand|NULL
+     */
     protected $operandToken;
     
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     abstract protected function getAllowedOperands() : array;
     
     protected function validateSyntax_operand() : void
@@ -78,11 +78,11 @@ 
         );
     }
     
-   /**
-    * Retrieves the operand sign.
-    *
-    * @return string
-    */
+    /**
+     * Retrieves the operand sign.
+     *
+     * @return string
+     */
     public function getSign() : string
     {
         return $this->getOperand()->getSign();

Spacing +3 added lines, -3 removed lines

@@ -39,9 +39,9 @@ 
     {
         $var = $this->validator->createOperand();
         
-        if($var->isValid())
+        if ($var->isValid())
         {
-            if(in_array($var->getSign(), $this->getAllowedOperands()))
+            if (in_array($var->getSign(), $this->getAllowedOperands()))
             {
                 $this->operandToken = $var->getToken();
             }
@@ -66,7 +66,7 @@ 
     
     public function getOperand() : Mailcode_Parser_Statement_Tokenizer_Token_Operand
     {
-        if($this->operandToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand)
+        if ($this->operandToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Operand)
         {
             return $this->operandToken;
         }

Braces +2 added lines, -4 removed lines

@@ -44,8 +44,7 @@ 
             if(in_array($var->getSign(), $this->getAllowedOperands()))
             {
                 $this->operandToken = $var->getToken();
-            }
-            else
+            } else
             {
                 $this->validationResult->makeError(
                     t('Invalid operand %1$s.', $var->getSign()).' '.
@@ -54,8 +53,7 @@ 
                     Mailcode_Commands_CommonConstants::VALIDATION_INVALID_OPERAND
                 );
             }
-        }
-        else
+        } else
         {
             $this->validationResult->makeError(
                 t('No operand has been specified.'),

src/Mailcode/Traits/Commands/Validation/Variable.php

Indentation +8 added lines, -8 removed lines

@@ -24,9 +24,9 @@ 
  */
 trait Mailcode_Traits_Commands_Validation_Variable
 {
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer_Token_Variable|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer_Token_Variable|NULL
+     */
     protected $variableToken;
     
     protected function validateSyntax_variable() : void
@@ -46,11 +46,11 @@ 
         }
     }
     
-   /**
-    * Retrieves the variable being compared.
-    *
-    * @return Mailcode_Variables_Variable
-    */
+    /**
+     * Retrieves the variable being compared.
+     *
+     * @return Mailcode_Variables_Variable
+     */
     public function getVariable() : Mailcode_Variables_Variable
     {
         if($this->variableToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     {
         $var = $this->validator->createVariable();
         
-        if($var->isValid())
+        if ($var->isValid())
         {
             $this->variableToken = $var->getToken();
         }
@@ -53,7 +53,7 @@ 
     */
     public function getVariable() : Mailcode_Variables_Variable
     {
-        if($this->variableToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
+        if ($this->variableToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable)
         {
             return $this->variableToken->getVariable();
         }

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
         if($var->isValid())
         {
             $this->variableToken = $var->getToken();
-        }
-        else
+        } else
         {
             $this->validationResult->makeError(
                 t('No variable has been specified.'),

src/Mailcode/Parser/Statement/Info/Pruner.php

Indentation +15 added lines, -15 removed lines

@@ -22,19 +22,19 @@ 
  */
 class Mailcode_Parser_Statement_Info_Pruner
 {
-   /**
-    * @var Mailcode_Parser_Statement_Info
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Info
+     */
     private $info;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     private $exclude = array();
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     private $classNames = array();
     
     public function __construct(Mailcode_Parser_Statement_Info $info)
@@ -74,12 +74,12 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves all tokens in the statement matching the
-    * current criteria.
-    * 
-    * @return Mailcode_Parser_Statement_Tokenizer_Token[]
-    */
+    /**
+     * Retrieves all tokens in the statement matching the
+     * current criteria.
+     * 
+     * @return Mailcode_Parser_Statement_Tokenizer_Token[]
+     */
     public function getTokens() : array
     {
         $tokens = $this->info->getTokens();

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
     {
         $id = $token->getID();
         
-        if(!in_array($id, $this->exclude))
+        if (!in_array($id, $this->exclude))
         {
             $this->exclude[] = $id;
         }
@@ -66,7 +66,7 @@ 
     
     public function limitByClassName(string $className) : Mailcode_Parser_Statement_Info_Pruner
     {
-        if(!in_array($className, $this->classNames))
+        if (!in_array($className, $this->classNames))
         {
             $this->classNames[] = $className;
         }
@@ -85,9 +85,9 @@ 
         $tokens = $this->info->getTokens();
         $keep = array(); 
         
-        foreach($tokens as $token)
+        foreach ($tokens as $token)
         {
-            if(in_array($token->getID(), $this->exclude))
+            if (in_array($token->getID(), $this->exclude))
             {
                 continue;
             }

src/Mailcode/Parser/Statement/Tokenizer.php

Spacing +22 added lines, -22 removed lines

@@ -135,9 +135,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;
             }
@@ -150,7 +150,7 @@ 
     {
         $unknown = $this->getUnknown();
         
-        if(!empty($unknown))
+        if (!empty($unknown))
         {
             return array_shift($unknown);
         }
@@ -162,11 +162,11 @@ 
     {
         $parts = array();
         
-        foreach($this->tokensOrdered as $token)
+        foreach ($this->tokensOrdered as $token)
         {
             $string = $token->getNormalized();
             
-            if($string != '')
+            if ($string != '')
             {
                 $parts[] = $string;
             }
@@ -179,11 +179,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.',
@@ -207,7 +207,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();
         
@@ -224,9 +224,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;
             }
@@ -242,9 +242,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);
             }
@@ -258,12 +258,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;
             }
@@ -279,7 +279,7 @@ 
     {
         $vars = Mailcode::create()->findVariables($this->tokenized)->getGroupedByHash();
         
-        foreach($vars as $var)
+        foreach ($vars as $var)
         {
             $this->registerToken('Variable', $var->getMatchedText(), $var);
         }
@@ -287,9 +287,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);
             }
@@ -301,7 +301,7 @@ 
         $matches = array();
         preg_match_all('/"(.*)"/sxU', $this->tokenized, $matches, PREG_PATTERN_ORDER);
         
-        foreach($matches[0] as $match)
+        foreach ($matches[0] as $match)
         {
             $this->registerToken('StringLiteral', $match);
         }
@@ -312,7 +312,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);
         }
@@ -329,7 +329,7 @@ 
     {
         static $alphas;
         
-        if(!isset($alphas))
+        if (!isset($alphas))
         {
             $alphas = range('A', 'Z');
         }
@@ -338,12 +338,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;

Indentation +56 added lines, -56 removed lines

@@ -23,9 +23,9 @@ 
 {
     const ERROR_TOKENIZE_METHOD_MISSING = 49801;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $operands = array(
         '==',
         '<=',
@@ -40,17 +40,17 @@ 
         '<'
     );
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $keywords = array(
         'in:',
         'insensitive:'
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $delimiter = '§§';
     
     /**
@@ -67,19 +67,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();
     
     /**
@@ -87,9 +87,9 @@ 
      */
     protected $tokensOrdered = array();
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected static $ids = array();
     
     public function __construct(Mailcode_Parser_Statement $statement)
@@ -99,12 +99,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;
@@ -115,11 +115,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();
@@ -127,11 +127,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();
@@ -201,13 +201,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();
@@ -236,11 +236,11 @@ 
         return null;
     }
     
-   /**
-    * Some WYSIWYG editors like using pretty quotes instead
-    * of the usual double quotes. This simply replaces all
-    * occurrences with the regular variant.
-    */
+    /**
+     * Some WYSIWYG editors like using pretty quotes instead
+     * of the usual double quotes. This simply replaces all
+     * occurrences with the regular variant.
+     */
     protected function tokenize_normalize_quotes() : void
     {
         $this->tokenized = str_replace(array('“', '”'), '"', $this->tokenized);
@@ -329,13 +329,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;