Mistralys / mailcode

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

Spacing +15 added lines, -15 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;
         }

src/Mailcode/Factory/Instantiator.php

Spacing +8 added lines, -8 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,11 +78,11 @@ 
         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
     {
         $keyword = ' ';
         
-        if($caseInsensitive)
+        if ($caseInsensitive)
         {
             $keyword = ' insensitive: ';
         }
@@ -106,7 +106,7 @@ 
     
     public function checkCommand(Mailcode_Commands_Command $command) : void
     {
-        if($command->isValid())
+        if ($command->isValid())
         {
             return;
         }

src/Mailcode/Factory/CommandSets.php

Indentation +6 added lines, -6 removed lines

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

Spacing +7 added lines, -7 removed lines

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

src/Mailcode/Translator/Syntax/ApacheVelocity/If.php

Spacing +5 added lines, -5 removed lines

@@ -32,27 +32,27 @@
     
     protected function translateBody(Mailcode_Commands_IfBase $command) : string
     {
-        if($command instanceof Mailcode_Commands_Command_If_Command)
+        if ($command instanceof Mailcode_Commands_Command_If_Command)
         {
             return $this->translateCommand($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $this->translateVariable($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_If_Contains)
+        if ($command instanceof Mailcode_Commands_Command_If_Contains)
         {
             return $this->translateContains($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_If_Empty)
+        if ($command instanceof Mailcode_Commands_Command_If_Empty)
         {
             return $this->translateEmpty($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_If_NotEmpty)
+        if ($command instanceof Mailcode_Commands_Command_If_NotEmpty)
         {
             return $this->translateNotEmpty($command);
         }

src/Mailcode/Translator/Syntax/ApacheVelocity/ElseIf.php

Spacing +5 added lines, -5 removed lines

@@ -32,27 +32,27 @@
     
     protected function translateBody(Mailcode_Commands_IfBase $command) : string
     {
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Command)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Command)
         {
             return $this->translateCommand($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $this->translateVariable($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Contains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Contains)
         {
             return $this->translateContains($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Empty)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Empty)
         {
             return $this->translateEmpty($command);
         }
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_NotEmpty)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_NotEmpty)
         {
             return $this->translateNotEmpty($command);
         }

src/Mailcode/Commands/Command.php

Indentation +79 added lines, -79 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,14 +78,14 @@ 
         'type_unsupported'
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $comment = '';
     
-   /**
-    * @var Mailcode_Commands_LogicKeywords|NULL
-    */
+    /**
+     * @var Mailcode_Commands_LogicKeywords|NULL
+     */
     protected $logicKeywords;
     
     public function __construct(string $type='', string $paramsString='', string $matchedText='')
@@ -103,9 +103,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.
@@ -114,14 +114,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;
@@ -129,34 +129,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();
@@ -253,9 +253,9 @@ 
         return $this->validationResult->isValid();
     }
     
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     abstract protected function getValidations() : array;
     
     protected function validateSyntax_params_empty() : void
@@ -410,12 +410,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;
@@ -461,22 +461,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

@@ -88,7 +88,7 @@ 
     */
     protected $logicKeywords;
     
-    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);
@@ -161,7 +161,7 @@ 
     {
         $this->requireNonDummy();
         
-        if($this->hash === '') {
+        if ($this->hash === '') {
             $this->hash = md5($this->matchedText);
         }
         
@@ -170,7 +170,7 @@ 
     
     protected function requireNonDummy() : void
     {
-        if(!$this->isDummy())
+        if (!$this->isDummy())
         {
             return;
         }
@@ -191,7 +191,7 @@ 
     {
         $this->requireNonDummy();
         
-        if(isset($this->validationResult)) 
+        if (isset($this->validationResult)) 
         {
             return $this->validationResult;
         }
@@ -205,7 +205,7 @@ 
     
     public function getValidationResult() :  \AppUtils\OperationResult
     {
-        if(isset($this->validationResult)) 
+        if (isset($this->validationResult)) 
         {
             return $this->validationResult;
         }
@@ -221,10 +221,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;
             }
@@ -235,7 +235,7 @@ 
     {
         $method = 'validateSyntax_'.$validation;
         
-        if(!method_exists($this, $method))
+        if (!method_exists($this, $method))
         {
             throw new Mailcode_Exception(
                 'Missing validation method',
@@ -260,12 +260,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.'),
@@ -277,14 +277,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(),
@@ -299,14 +299,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();
             
@@ -319,14 +319,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).' '.
@@ -340,7 +340,7 @@ 
     
     protected function validateSyntax_type_unsupported() : void
     {
-        if($this->supportsType() || empty($this->type))
+        if ($this->supportsType() || empty($this->type))
         {
             return;
         }
@@ -358,7 +358,7 @@ 
     
     public function getType() : string
     {
-        if($this->supportsType())
+        if ($this->supportsType())
         {
             return $this->type;
         }
@@ -378,7 +378,7 @@ 
     
     public function getHighlighted() : string
     {
-        if(!$this->isValid())
+        if (!$this->isValid())
         {
             return '';
         }
@@ -389,7 +389,7 @@ 
     
     public function getParamsString() : string
     {
-        if($this->requiresParameters())
+        if ($this->requiresParameters())
         {
             return $this->paramsString;
         }
@@ -424,22 +424,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';
         }
@@ -489,7 +489,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/Normalizer.php

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
     
     public function normalize() : string
     {
-        if(!$this->command->isValid())
+        if (!$this->command->isValid())
         {
             return '';
         }
@@ -57,7 +57,7 @@ 
     
     private function addType() : void
     {
-        if(!$this->command->supportsType() || !$this->command->hasType())
+        if (!$this->command->supportsType() || !$this->command->hasType())
         {
             return;
         }
@@ -67,14 +67,14 @@ 
     
     private function addParams(Mailcode_Commands_Command $command) : void
     {
-        if(!$command->requiresParameters())
+        if (!$command->requiresParameters())
         {
             return;
         }
         
         $params = $command->getParams();
         
-        if($params === null)
+        if ($params === null)
         {
             return;
         }
@@ -85,14 +85,14 @@ 
     
     private function addLogicKeywords() : void
     {
-        if(!$this->command->supportsLogicKeywords())
+        if (!$this->command->supportsLogicKeywords())
         {
             return;
         }
         
         $keywords = $this->command->getLogicKeywords()->getKeywords();
         
-        foreach($keywords as $keyword)
+        foreach ($keywords as $keyword)
         {
             $this->parts[] = ' ';
             $this->parts[] = $keyword->getKeywordString(); // e.g. "if variable"

src/Mailcode/Translator/Syntax/ApacheVelocity/Base/AbstractIf.php

Spacing +6 added lines, -6 removed lines

@@ -33,11 +33,11 @@ 
         
         $keywords = $command->getLogicKeywords()->getKeywords();
         
-        foreach($keywords as $keyword)
+        foreach ($keywords as $keyword)
         {
             $keyCommand = $keyword->getCommand();
             
-            if($keyCommand instanceof Mailcode_Commands_IfBase)
+            if ($keyCommand instanceof Mailcode_Commands_IfBase)
             {
                 $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand);
             }
@@ -60,7 +60,7 @@ 
     
     protected function getSign(Mailcode_Commands_LogicKeywords_Keyword $keyword) : string
     {
-        switch($keyword->getName())
+        switch ($keyword->getName())
         {
             case 'and':
                 return '&&';
@@ -83,7 +83,7 @@ 
     {
         $sign = '';
         
-        if($notEmpty)
+        if ($notEmpty)
         {
             $sign = '!';
         }
@@ -99,7 +99,7 @@ 
     {
         $params = $command->getParams();
         
-        if(!$params)
+        if (!$params)
         {
             return '';
         }
@@ -120,7 +120,7 @@ 
     protected function _translateContains(Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string
     {
         $opts = 's';
-        if($caseSensitive)
+        if ($caseSensitive)
         {
             $opts = 'is';
         }

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
             if($keyCommand instanceof Mailcode_Commands_IfBase)
             {
                 $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand);
-            }
-            else
+            } else
             {
                 throw new Mailcode_Exception(
                     'Keyword command type does not match expected base class.',

src/Mailcode/Commands/LogicKeywords.php

Indentation +45 added lines, -45 removed lines

@@ -31,27 +31,27 @@ 
     const VALIDATION_CANNOT_MIX_LOGIC_KEYWORDS = 60701;
     const VALIDATION_INVALID_SUB_COMMAND = 60702;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $paramsString;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     private $names = array(
         'and', 
         'or'
     );
     
-   /**
-    * @var Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * @var Mailcode_Commands_LogicKeywords_Keyword[]
+     */
     private $keywords = array();
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $mainParams = '';
     
     public function __construct(Mailcode_Commands_Command $command, string $paramsString)
@@ -136,9 +136,9 @@ 
         }
     }
     
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     private function detectParameters() : array
     {
         $params = $this->paramsString;
@@ -156,13 +156,13 @@ 
         return $stack;
     }
 
-   /**
-    * @param string $params
-    * @param Mailcode_Commands_LogicKeywords_Keyword $keyword
-    * @param string[] $stack
-    * @throws Mailcode_Exception
-    * @return string
-    */
+    /**
+     * @param string $params
+     * @param Mailcode_Commands_LogicKeywords_Keyword $keyword
+     * @param string[] $stack
+     * @throws Mailcode_Exception
+     * @return string
+     */
     private function detectParamsKeyword(string $params, Mailcode_Commands_LogicKeywords_Keyword $keyword, array &$stack) : string
     {
         $search = $keyword->getMatchedString();
@@ -187,22 +187,22 @@ 
         return $params;
     }
     
-   /**
-    * Extracts the parameters string to use for the 
-    * original command itself, omitting all the logic
-    * keywords for the sub-commands.
-    * 
-    * @return string
-    */
+    /**
+     * Extracts the parameters string to use for the 
+     * original command itself, omitting all the logic
+     * keywords for the sub-commands.
+     * 
+     * @return string
+     */
     public function getMainParamsString() : string
     {
         return $this->mainParams;
     }
     
-   /**
-    * Retrieves the detected keyword names.
-    * @return string[]
-    */
+    /**
+     * Retrieves the detected keyword names.
+     * @return string[]
+     */
     public function getDetectedNames() : array
     {
         $names = array();
@@ -220,23 +220,23 @@ 
         return $names;
     }
     
-   /**
-    * Retrieves all keywords that were detected in the
-    * command's parameters string, if any.
-    * 
-    * @return Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * Retrieves all keywords that were detected in the
+     * command's parameters string, if any.
+     * 
+     * @return Mailcode_Commands_LogicKeywords_Keyword[]
+     */
     public function getKeywords() : array
     {
         return $this->keywords;
     }
     
-   /**
-    * Detects any keyword statements in the parameters by keyword name.
-    * 
-    * @param string $name
-    * @return Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * Detects any keyword statements in the parameters by keyword name.
+     * 
+     * @param string $name
+     * @return Mailcode_Commands_LogicKeywords_Keyword[]
+     */
     private function detectKeywords(string $name) : array
     {
         $regex = sprintf('/%1$s\s+([a-z\-0-9]+):|%1$s:/x', $name);

Spacing +20 added lines, -20 removed lines

@@ -71,9 +71,9 @@ 
     
     private function parse() : void
     {
-        foreach($this->names as $name)
+        foreach ($this->names as $name)
         {
-            if(!stristr($this->paramsString, $name))
+            if (!stristr($this->paramsString, $name))
             {
                 continue;
             }
@@ -90,7 +90,7 @@ 
         $names = $this->getDetectedNames();
         $amount = count($names);
         
-        if($amount > 1)
+        if ($amount > 1)
         {
             $this->makeError(
                 t(
@@ -109,7 +109,7 @@ 
     
     private function splitParams() : void
     {
-        if(empty($this->keywords))
+        if (empty($this->keywords))
         {
             $this->mainParams = $this->paramsString;
             
@@ -118,13 +118,13 @@ 
         
         $params = $this->detectParameters();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $kParams = array_shift($params);
             
             $keyword->setParamsString($kParams);
             
-            if(!$keyword->isValid())
+            if (!$keyword->isValid())
             {
                 $this->makeError(
                     t('Error #%1$s:', $keyword->getCode()).' '.$keyword->getErrorMessage(),
@@ -144,7 +144,7 @@ 
         $params = $this->paramsString;
         $stack = array();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $params = $this->detectParamsKeyword($params, $keyword, $stack);
         }
@@ -168,7 +168,7 @@ 
         $search = $keyword->getMatchedString();
         $pos = strpos($params, $search, 0);
         
-        if($pos === false)
+        if ($pos === false)
         {
             throw new Mailcode_Exception(
                 'Keyword matched string not found',
@@ -180,7 +180,7 @@ 
         $length = strlen($search);
         
         $store = substr($params, 0, $pos);
-        $params = trim(substr($params, $pos+$length));
+        $params = trim(substr($params, $pos + $length));
         
         $stack[] = $store;
         
@@ -207,11 +207,11 @@ 
     {
         $names = array();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $name = $keyword->getName();
             
-            if(!in_array($name, $names))
+            if (!in_array($name, $names))
             {
                 $names[] = $name;
             }
@@ -244,7 +244,7 @@ 
         $matches = array();
         preg_match_all($regex, $this->paramsString, $matches, PREG_PATTERN_ORDER);
         
-        if(!isset($matches[0][0]) || empty($matches[0][0]))
+        if (!isset($matches[0][0]) || empty($matches[0][0]))
         {
             return array();
         }
@@ -252,7 +252,7 @@ 
         $amount = count($matches[0]);
         $result = array();
         
-        for($i=0; $i < $amount; $i++)
+        for ($i = 0; $i < $amount; $i++)
         {
             $result[] = $this->createKeyword(
                 $name, 
@@ -269,22 +269,22 @@ 
         return !empty($this->keywords);
     }
     
-    public function appendAND(string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword
+    public function appendAND(string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
         return $this->appendKeyword('and', $paramsString, $type);
     }
     
-    public function appendOR(string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword
+    public function appendOR(string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
         return $this->appendKeyword('or', $paramsString, $type);
     }
     
-    public function appendKeyword(string $name, string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword
+    public function appendKeyword(string $name, string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
         $keyword = $this->createKeyword($name, $type);
         $keyword->setParamsString($paramsString);
         
-        if(!$keyword->isValid())
+        if (!$keyword->isValid())
         {
             throw new Mailcode_Exception(
                 'Cannot append invalid logic keyword',
@@ -305,13 +305,13 @@ 
         return $keyword;
     }
     
-    private function createKeyword(string $name, string $type='', string $matchedString='') : Mailcode_Commands_LogicKeywords_Keyword
+    private function createKeyword(string $name, string $type = '', string $matchedString = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
-        if(empty($matchedString))
+        if (empty($matchedString))
         {
             $matchedString = $name;
             
-            if(!empty($type))
+            if (!empty($type))
             {
                 $matchedString .= ' '.$type;
             }