Mistralys / mailcode

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

Spacing +2 added lines, -2 removed lines

@@ -29,12 +29,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.'),

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

Spacing +2 added lines, -2 removed lines

@@ -35,14 +35,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).' '.

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

Spacing +2 added lines, -2 removed lines

@@ -31,14 +31,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(),

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

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
     protected function validateSyntax_type_unsupported() : void
     {
-        if($this->supportsType() || empty($this->type))
+        if ($this->supportsType() || empty($this->type))
         {
             return;
         }

src/Mailcode/Renderer.php

Spacing +26 added lines, -26 removed lines

@@ -32,7 +32,7 @@ 
     * @param bool $highlighted
     * @return Mailcode_Renderer
     */
-    public function setOutputHighlighted(bool $highlighted=true) : Mailcode_Renderer
+    public function setOutputHighlighted(bool $highlighted = true) : Mailcode_Renderer
     {
         $this->highlighted = $highlighted;
         
@@ -55,7 +55,7 @@ 
         return $this->command2string(Mailcode_Factory::show()->snippet($snippetName));
     }
     
-    public function setVar(string $variableName, string $value, bool $quoteValue=false) : string
+    public function setVar(string $variableName, string $value, bool $quoteValue = false) : string
     {
         return $this->command2string(Mailcode_Factory::set()->var($variableName, $value, $quoteValue));
     }
@@ -65,79 +65,79 @@ 
         return $this->command2string(Mailcode_Factory::set()->varString($variableName, $value));
     }
     
-    public function if(string $condition, string $type='') : string
+    public function if (string $condition, string $type = '') : string
     {
-        return $this->command2string(Mailcode_Factory::if()->if($condition, $type));
+        return $this->command2string(Mailcode_Factory::if ()->if($condition, $type));
     }
     
-    public function ifVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string
+    public function ifVar(string $variable, string $operand, string $value, bool $quoteValue = false) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->var($variable, $operand, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::if ()->var($variable, $operand, $value, $quoteValue));
     }
 
     public function ifVarString(string $variable, string $operand, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->varString($variable, $operand, $value));
+        return $this->command2string(Mailcode_Factory::if ()->varString($variable, $operand, $value));
     }
     
-    public function ifVarEquals(string $variable, string $value, bool $quoteValue=false) : string
+    public function ifVarEquals(string $variable, string $value, bool $quoteValue = false) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->varEquals($variable, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::if ()->varEquals($variable, $value, $quoteValue));
     }
 
     public function ifVarEqualsString(string $variable, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->varEqualsString($variable, $value));
+        return $this->command2string(Mailcode_Factory::if ()->varEqualsString($variable, $value));
     }
     
-    public function ifVarNotEquals(string $variable, string $value, bool $quoteValue=false) : string
+    public function ifVarNotEquals(string $variable, string $value, bool $quoteValue = false) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->varNotEquals($variable, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::if ()->varNotEquals($variable, $value, $quoteValue));
     }
 
     public function ifVarNotEqualsString(string $variable, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->varNotEqualsString($variable, $value));
+        return $this->command2string(Mailcode_Factory::if ()->varNotEqualsString($variable, $value));
     }
     
-    public function elseIf(string $condition, string $type='') : string
+    public function elseIf (string $condition, string $type = '') : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->elseIf($condition, $type));
+        return $this->command2string(Mailcode_Factory::elseIf ()->elseIf($condition, $type));
     }
     
-    public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string
+    public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue = false) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->var($variable, $operand, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::elseIf ()->var($variable, $operand, $value, $quoteValue));
     }
 
     public function elseIfVarString(string $variable, string $operand, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->varString($variable, $operand, $value));
+        return $this->command2string(Mailcode_Factory::elseIf ()->varString($variable, $operand, $value));
     }
     
-    public function elseIfVarEquals(string $variable, string $value, bool $quoteValue=false) : string
+    public function elseIfVarEquals(string $variable, string $value, bool $quoteValue = false) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->varEquals($variable, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::elseIf ()->varEquals($variable, $value, $quoteValue));
     }
 
     public function elseIfVarEqualsString(string $variable, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->varEqualsString($variable, $value));
+        return $this->command2string(Mailcode_Factory::elseIf ()->varEqualsString($variable, $value));
     }
     
-    public function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue=false) : string
+    public function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue = false) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->varNotEquals($variable, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::elseIf ()->varNotEquals($variable, $value, $quoteValue));
     }
 
     public function elseIfVarNotEqualsString(string $variable, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->varNotEqualsString($variable, $value));
+        return $this->command2string(Mailcode_Factory::elseIf ()->varNotEqualsString($variable, $value));
     }
     
     public function else() : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->else());
+        return $this->command2string(Mailcode_Factory::elseIf ()->else());
     }
     
     public function end() : string
@@ -152,7 +152,7 @@ 
     
     protected function command2string(Mailcode_Commands_Command $command) : string
     {
-        if($this->highlighted)
+        if ($this->highlighted)
         {
             return $command->getHighlighted();
         }

Braces +45 added lines, -15 removed lines

@@ -67,78 +67,108 @@
     
     public function if(string $condition, string $type='') : string
     {
-        return $this->command2string(Mailcode_Factory::if()->if($condition, $type));
+        return $this->command2string(Mailcode_Factory::if() {
+            ->if($condition, $type));
+        }
     }
     
     public function ifVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->var($variable, $operand, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::if() {
+            ->var($variable, $operand, $value, $quoteValue));
+        }
     }
 
     public function ifVarString(string $variable, string $operand, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->varString($variable, $operand, $value));
+        return $this->command2string(Mailcode_Factory::if() {
+            ->varString($variable, $operand, $value));
+        }
     }
     
     public function ifVarEquals(string $variable, string $value, bool $quoteValue=false) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->varEquals($variable, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::if() {
+            ->varEquals($variable, $value, $quoteValue));
+        }
     }
 
     public function ifVarEqualsString(string $variable, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->varEqualsString($variable, $value));
+        return $this->command2string(Mailcode_Factory::if() {
+            ->varEqualsString($variable, $value));
+        }
     }
     
     public function ifVarNotEquals(string $variable, string $value, bool $quoteValue=false) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->varNotEquals($variable, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::if() {
+            ->varNotEquals($variable, $value, $quoteValue));
+        }
     }
 
     public function ifVarNotEqualsString(string $variable, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::if()->varNotEqualsString($variable, $value));
+        return $this->command2string(Mailcode_Factory::if() {
+            ->varNotEqualsString($variable, $value));
+        }
     }
     
     public function elseIf(string $condition, string $type='') : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->elseIf($condition, $type));
+        return $this->command2string(Mailcode_Factory::elseIf() {
+            ->elseIf($condition, $type));
+        }
     }
     
     public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue=false) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->var($variable, $operand, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::elseIf() {
+            ->var($variable, $operand, $value, $quoteValue));
+        }
     }
 
     public function elseIfVarString(string $variable, string $operand, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->varString($variable, $operand, $value));
+        return $this->command2string(Mailcode_Factory::elseIf() {
+            ->varString($variable, $operand, $value));
+        }
     }
     
     public function elseIfVarEquals(string $variable, string $value, bool $quoteValue=false) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->varEquals($variable, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::elseIf() {
+            ->varEquals($variable, $value, $quoteValue));
+        }
     }
 
     public function elseIfVarEqualsString(string $variable, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->varEqualsString($variable, $value));
+        return $this->command2string(Mailcode_Factory::elseIf() {
+            ->varEqualsString($variable, $value));
+        }
     }
     
     public function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue=false) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->varNotEquals($variable, $value, $quoteValue));
+        return $this->command2string(Mailcode_Factory::elseIf() {
+            ->varNotEquals($variable, $value, $quoteValue));
+        }
     }
 
     public function elseIfVarNotEqualsString(string $variable, string $value) : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf()->varNotEqualsString($variable, $value));
+        return $this->command2string(Mailcode_Factory::elseIf() {
+            ->varNotEqualsString($variable, $value));
+        }
     }
     
-    public function else() : string
+    public function else {
+        () : string
     {
         return $this->command2string(Mailcode_Factory::elseIf()->else());
     }
+    }
     
     public function end() : string
     {

Indentation +15 added lines, -15 removed lines

@@ -21,17 +21,17 @@ 
  */
 class Mailcode_Renderer
 {
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     protected bool $highlighted = false;
     
-   /**
-    * Sets whether to output highlighted commands instead of the default plain text.
-    * 
-    * @param bool $highlighted
-    * @return Mailcode_Renderer
-    */
+    /**
+     * Sets whether to output highlighted commands instead of the default plain text.
+     * 
+     * @param bool $highlighted
+     * @return Mailcode_Renderer
+     */
     public function setOutputHighlighted(bool $highlighted=true) : Mailcode_Renderer
     {
         $this->highlighted = $highlighted;
@@ -39,12 +39,12 @@ 
         return $this;
     }
     
-   /**
-    * Converts a show variable command to string.
-    * 
-    * @param string $variableName The variable name, with or without $ sign.
-    * @return string
-    */
+    /**
+     * Converts a show variable command to string.
+     * 
+     * @param string $variableName The variable name, with or without $ sign.
+     * @return string
+     */
     public function showVar(string $variableName) : string
     {
         return $this->command2string(Mailcode_Factory::show()->var($variableName));

src/Mailcode/Variables.php

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
             if(!empty($matches[3][$idx]))
             {
                 $this->addSingle($matches[3][$idx], $matchedText, $sourceCommand);
-            }
-            else 
+            } else 
             {
                 $this->addPathed($matches[1][$idx], $matches[2][$idx], $matchedText, $sourceCommand);
             }

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 {
     public const REGEX_VARIABLE_NAME = '/\$\s*([A-Z0-9_]+)\s*\.\s*([A-Z0-9_]+)|\$\s*([A-Z0-9_]+)/six';
     
-   /**
-    * @var Mailcode_Variables_Collection_Regular
-    */
+    /**
+     * @var Mailcode_Variables_Collection_Regular
+     */
     protected Mailcode_Variables_Collection_Regular $collection;
 
     /**

Spacing +11 added lines, -11 removed lines

@@ -34,21 +34,21 @@ 
      * @param Mailcode_Commands_Command|null $sourceCommand
      * @return Mailcode_Variables_Collection_Regular
      */
-    public function parseString(string $subject, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Variables_Collection_Regular
+    public function parseString(string $subject, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Variables_Collection_Regular
     {
         $this->collection = new Mailcode_Variables_Collection_Regular();
         
         $matches = array();
         preg_match_all(self::REGEX_VARIABLE_NAME, $subject, $matches, PREG_PATTERN_ORDER);
         
-        if(empty($matches[0]))
+        if (empty($matches[0]))
         {
             return $this->collection;
         }
         
-        foreach($matches[0] as $idx => $matchedText)
+        foreach ($matches[0] as $idx => $matchedText)
         {
-            if(!empty($matches[3][$idx]))
+            if (!empty($matches[3][$idx]))
             {
                 $this->addSingle($matches[3][$idx], $matchedText, $sourceCommand);
             }
@@ -61,10 +61,10 @@ 
         return $this->collection;
     }
     
-    protected function addSingle(string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) : void
+    protected function addSingle(string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) : void
     {
         // ignore US style numbers like $451
-        if(is_numeric($name))
+        if (is_numeric($name))
         {
             return;
         }
@@ -72,10 +72,10 @@ 
         $this->collection->add(new Mailcode_Variables_Variable('', $name, $matchedText, $sourceCommand));
     }
     
-    protected function addPathed(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) : void
+    protected function addPathed(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) : void
     {
         // ignore US style numbers like $45.12
-        if(is_numeric($path.'.'.$name))
+        if (is_numeric($path.'.'.$name))
         {
             return;
         }
@@ -93,9 +93,9 @@ 
         return ltrim($name, '$');
     }
 
-    public function createVariable(string $path, ?string $name='') : Mailcode_Variables_Variable
+    public function createVariable(string $path, ?string $name = '') : Mailcode_Variables_Variable
     {
-        if(empty($name)) {
+        if (empty($name)) {
             $fullName = dollarize($path);
             $name = $path;
             $path = '';
@@ -110,7 +110,7 @@ 
     {
         $parts = explode('.', undollarize($name));
 
-        if(count($parts) === 1) {
+        if (count($parts) === 1) {
             return $this->createVariable($parts[0]);
         }
 

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

Indentation +6 added lines, -6 removed lines

@@ -26,14 +26,14 @@
  */
 trait Mailcode_Traits_Commands_Validation_CaseSensitive
 {
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     protected $caseInsensitive = false;
 
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer_Token_Keyword|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer_Token_Keyword|NULL
+     */
     protected $regexToken;
     
     protected function validateSyntax_case_sensitive() : void

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
         
         $this->caseInsensitive = $val->isValid();
         
-        if($val->isValid())
+        if ($val->isValid())
         {
             $this->regexToken = $val->getToken();
         }
@@ -55,7 +55,7 @@ 
     
     public function getCaseToken() : ?Mailcode_Parser_Statement_Tokenizer_Token_Keyword
     {
-        if($this->regexToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
+        if ($this->regexToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
         {
             return $this->regexToken;
         }

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

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 
         $this->regexEnabled = $val->isValid();
 
-        if($val->isValid())
+        if ($val->isValid())
         {
             $this->regexToken = $val->getToken();
         }
@@ -55,7 +55,7 @@ 
 
     public function getRegexToken() : ?Mailcode_Parser_Statement_Tokenizer_Token_Keyword
     {
-        if($this->regexToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
+        if ($this->regexToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
         {
             return $this->regexToken;
         }

src/Mailcode/Parser/Statement/Validator.php

Indentation +16 added lines, -16 removed lines

@@ -28,9 +28,9 @@ 
  */
 class Mailcode_Parser_Statement_Validator
 {
-   /**
-    * @var Mailcode_Parser_Statement
-    */
+    /**
+     * @var Mailcode_Parser_Statement
+     */
     private $statement;
     
     public function __construct(Mailcode_Parser_Statement $statement)
@@ -38,24 +38,24 @@ 
         $this->statement = $statement;
     }
     
-   /**
-    * Creates a variable validator: checks whether a single
-    * variable token is present in the parameters.
-    * 
-    * @return Mailcode_Parser_Statement_Validator_Type_Variable
-    */
+    /**
+     * Creates a variable validator: checks whether a single
+     * variable token is present in the parameters.
+     * 
+     * @return Mailcode_Parser_Statement_Validator_Type_Variable
+     */
     public function createVariable() : Mailcode_Parser_Statement_Validator_Type_Variable
     {
         return new Mailcode_Parser_Statement_Validator_Type_Variable($this->statement);
     }
     
-   /**
-    * Creates a keyword validator: checks whether a single
-    * keyword token is present in the parameters.
-    * 
-    * @param string $keywordName
-    * @return Mailcode_Parser_Statement_Validator_Type_Keyword
-    */
+    /**
+     * Creates a keyword validator: checks whether a single
+     * keyword token is present in the parameters.
+     * 
+     * @param string $keywordName
+     * @return Mailcode_Parser_Statement_Validator_Type_Keyword
+     */
     public function createKeyword(string $keywordName) : Mailcode_Parser_Statement_Validator_Type_Keyword
     {
         return new Mailcode_Parser_Statement_Validator_Type_Keyword(

Spacing +2 added lines, -2 removed lines

@@ -74,11 +74,11 @@
         return new Mailcode_Parser_Statement_Validator_Type_Value($this->statement);
     }
     
-    public function createOperand(string $sign='') : Mailcode_Parser_Statement_Validator_Type_Operand
+    public function createOperand(string $sign = '') : Mailcode_Parser_Statement_Validator_Type_Operand
     {
         $validate = new Mailcode_Parser_Statement_Validator_Type_Operand($this->statement);
         
-        if(!empty($sign))
+        if (!empty($sign))
         {
             $validate->setOperandSign($sign);
         }