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();

Spacing +5 added lines, -5 removed lines

@@ -73,7 +73,7 @@ 
     {
         $val = $this->validator->createVariable()->setIndex(0);
         
-        if($val->isValid())
+        if ($val->isValid())
         {
             $this->variableToken = $val->getToken();
         }
@@ -90,7 +90,7 @@ 
     {
         $val = $this->validator->createOperand('=')->setIndex(1);
         
-        if(!$val->isValid())
+        if (!$val->isValid())
         {
             $this->validationResult->makeError(
                 t('The second parameter must be an equals sign (%1$s).', '<code>=</code>'),
@@ -103,7 +103,7 @@ 
     {
         $tokens = $this->getAssignmentTokens();
         
-        if(empty($tokens))
+        if (empty($tokens))
         {
             $this->validationResult->makeError(
                 t('No value assigned to the variable.'),
@@ -114,7 +114,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();
         }
@@ -145,7 +145,7 @@ 
         
         $items = array();
         
-        foreach($tokens as $token)
+        foreach ($tokens as $token)
         {
             $items[] = $token->getNormalized();
         }

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

src/Mailcode/Factory/CommandSets/Set/If.php

Spacing +19 added lines, -19 removed lines

@@ -20,11 +20,11 @@ 
  */
 class Mailcode_Factory_CommandSets_Set_If extends Mailcode_Factory_CommandSets_IfBase
 {
-    public function if(string $condition, string $type='') : Mailcode_Commands_Command_If
+    public function if (string $condition, string $type = '') : Mailcode_Commands_Command_If
     {
         $command = $this->instantiator->buildIf('If', $condition, $type);
         
-        if($command instanceof Mailcode_Commands_Command_If)
+        if ($command instanceof Mailcode_Commands_Command_If)
         {
             return $command;
         }
@@ -32,11 +32,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('If', $command);
     }
     
-    public function ifVar(string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If_Variable
+    public function ifVar(string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If_Variable
     {
         $command = $this->instantiator->buildIfVar('If', $variable, $operand, $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -48,7 +48,7 @@ 
     {
         $command = $this->instantiator->buildIfVar('If', $variable, $operand, $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -56,11 +56,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfVarString', $command);
     }
     
-    public function ifVarEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If_Variable
+    public function ifVarEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If_Variable
     {
         $command = $this->instantiator->buildIfVar('If', $variable, '==', $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -72,7 +72,7 @@ 
     {
         $command = $this->instantiator->buildIfVar('If', $variable, '==', $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -80,11 +80,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfarEqualsString', $command);
     }
     
-    public function ifVarNotEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If_Variable
+    public function ifVarNotEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If_Variable
     {
         $command = $this->instantiator->buildIfVar('If', $variable, '!=', $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -96,7 +96,7 @@ 
     {
         $command = $this->instantiator->buildIfVar('If', $variable, '!=', $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -108,7 +108,7 @@ 
     {
         $command = $this->instantiator->buildIfEmpty('If', $variable);
         
-        if($command instanceof Mailcode_Commands_Command_If_Empty)
+        if ($command instanceof Mailcode_Commands_Command_If_Empty)
         {
             return $command;
         }
@@ -120,7 +120,7 @@ 
     {
         $command = $this->instantiator->buildIfNotEmpty('If', $variable);
         
-        if($command instanceof Mailcode_Commands_Command_If_NotEmpty)
+        if ($command instanceof Mailcode_Commands_Command_If_NotEmpty)
         {
             return $command;
         }
@@ -128,11 +128,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfNotEmpty', $command);
     }
     
-    public function ifContains(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_Contains
+    public function ifContains(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_Contains
     {
         $command = $this->instantiator->buildIfContains('If', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_Contains)
+        if ($command instanceof Mailcode_Commands_Command_If_Contains)
         {
             return $command;
         }
@@ -140,11 +140,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfContains', $command);
     }
     
-    public function ifBeginsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_BeginsWith
+    public function ifBeginsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_BeginsWith
     {
         $command = $this->instantiator->buildIfBeginsWith('If', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_BeginsWith)
+        if ($command instanceof Mailcode_Commands_Command_If_BeginsWith)
         {
             return $command;
         }
@@ -152,11 +152,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfBeginsWith', $command);
     }
     
-    public function ifEndsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_EndsWith
+    public function ifEndsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_EndsWith
     {
         $command = $this->instantiator->buildIfEndsWith('If', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_EndsWith)
+        if ($command instanceof Mailcode_Commands_Command_If_EndsWith)
         {
             return $command;
         }

src/Mailcode/Factory/CommandSets/Set/ElseIf.php

Spacing +19 added lines, -19 removed lines

@@ -20,11 +20,11 @@ 
  */
 class Mailcode_Factory_CommandSets_Set_ElseIf extends Mailcode_Factory_CommandSets_IfBase
 {
-    public function elseIf(string $condition, string $type='') : Mailcode_Commands_Command_ElseIf
+    public function elseIf (string $condition, string $type = '') : Mailcode_Commands_Command_ElseIf
     {
         $command = $this->instantiator->buildIf('ElseIf', $condition, $type);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $command;
         }
@@ -32,11 +32,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIf', $command);
     }
     
-    public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, $operand, $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -48,7 +48,7 @@ 
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, $operand, $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -56,11 +56,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfVarString', $command);
     }
     
-    public function elseIfVarEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function elseIfVarEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '==', $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -72,7 +72,7 @@ 
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '==', $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -80,11 +80,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfVarEqualsString', $command);
     }
     
-    public function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '!=', $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -96,7 +96,7 @@ 
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '!=', $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -104,11 +104,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfVarNotEqualsString', $command);
     }
     
-    public function elseIfContains(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_Contains
+    public function elseIfContains(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_Contains
     {
         $command = $this->instantiator->buildIfContains('ElseIf', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Contains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Contains)
         {
             return $command;
         }
@@ -116,11 +116,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfContains', $command);
     }
     
-    public function elseIfBeginsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_BeginsWith
+    public function elseIfBeginsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_BeginsWith
     {
         $command = $this->instantiator->buildIfBeginsWith('ElseIf', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_BeginsWith)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_BeginsWith)
         {
             return $command;
         }
@@ -128,11 +128,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfBeginsWith', $command);
     }
     
-    public function elseIfEndsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_EndsWith
+    public function elseIfEndsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_EndsWith
     {
         $command = $this->instantiator->buildIfEndsWith('ElseIf', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_EndsWith)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_EndsWith)
         {
             return $command;
         }
@@ -144,7 +144,7 @@ 
     {
         $command = $this->instantiator->buildIfEmpty('ElseIf', $variable);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Empty)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Empty)
         {
             return $command;
         }
@@ -156,7 +156,7 @@ 
     {
         $command = $this->instantiator->buildIfNotEmpty('ElseIf', $variable);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_NotEmpty)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_NotEmpty)
         {
             return $command;
         }

src/Mailcode/Factory/Instantiator.php

Spacing +11 added lines, -11 removed lines

@@ -20,11 +20,11 @@ 
  */
 class Mailcode_Factory_Instantiator
 {
-    public function buildIf(string $ifType, string $params, string $type='') : Mailcode_Commands_IfBase
+    public function buildIf(string $ifType, string $params, string $type = '') : Mailcode_Commands_IfBase
     {
         $stringType = $type;
         
-        if(!empty($type))
+        if (!empty($type))
         {
             $stringType = ' '.$type;
         }
@@ -43,7 +43,7 @@ 
         
         $this->checkCommand($command);
         
-        if($command instanceof Mailcode_Commands_IfBase)
+        if ($command instanceof Mailcode_Commands_IfBase)
         {
             return $command;
         }
@@ -51,9 +51,9 @@ 
         throw $this->exceptionUnexpectedType('IfBase', $command);
     }
     
-    public function buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_IfBase
+    public function buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_IfBase
     {
-        if($quoteValue)
+        if ($quoteValue)
         {
             $value = $this->quoteString($value);
         }
@@ -78,26 +78,26 @@ 
         return $this->buildIf($ifType, $this->filterVariableName($variable), 'not-empty');
     }
     
-    public function buildIfContains(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    public function buildIfContains(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         return $this->buildIfSearch($ifType, 'contains', $variable, $search, $caseInsensitive);
     }
     
-    public function buildIfBeginsWith(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    public function buildIfBeginsWith(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         return $this->buildIfSearch($ifType, 'begins-with', $variable, $search, $caseInsensitive);
     }
     
-    public function buildIfEndsWith(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    public function buildIfEndsWith(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         return $this->buildIfSearch($ifType, 'ends-with', $variable, $search, $caseInsensitive);
     }
     
-    private function buildIfSearch(string $ifType, string $subType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    private function buildIfSearch(string $ifType, string $subType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         $keyword = ' ';
         
-        if($caseInsensitive)
+        if ($caseInsensitive)
         {
             $keyword = ' insensitive: ';
         }
@@ -121,7 +121,7 @@ 
     
     public function checkCommand(Mailcode_Commands_Command $command) : void
     {
-        if($command->isValid())
+        if ($command->isValid())
         {
             return;
         }

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