Mistralys / mailcode

src/Mailcode/Factory.php

Spacing +29 added lines, -29 removed lines

@@ -61,11 +61,11 @@ 
     * 
     * @see Mailcode_Factory::ERROR_INVALID_COMMAND_CREATED
     */
-    public static function setVar(string $variableName, string $value, bool $quoteValue=true) : Mailcode_Commands_Command_SetVariable
+    public static function setVar(string $variableName, string $value, bool $quoteValue = true) : Mailcode_Commands_Command_SetVariable
     {
         $variableName = self::_filterVariableName($variableName);
         
-        if($quoteValue)
+        if ($quoteValue)
         {
             $value = self::_quoteString($value);
         }
@@ -138,11 +138,11 @@ 
         return $cmd;
     }
     
-    protected static function _buildIf(string $cmd, string $condition, string $type='') : Mailcode_Commands_Command
+    protected static function _buildIf(string $cmd, string $condition, string $type = '') : Mailcode_Commands_Command
     {
         $stringType = $type;
         
-        if(!empty($type))
+        if (!empty($type))
         {
             $stringType = ' '.$type;
         }
@@ -165,9 +165,9 @@ 
         return $cmd;
     }
   
-    protected static function _buildIfVar(string $cmd, string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_Command
+    protected static function _buildIfVar(string $cmd, string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_Command
     {
-        if($quoteValue)
+        if ($quoteValue)
         {
             $value = self::_quoteString($value);
         }
@@ -182,11 +182,11 @@ 
         return self::_buildIf($cmd, $condition, 'variable');
     }
     
-    public static function if(string $condition, string $type='') : Mailcode_Commands_Command_If
+    public static function if (string $condition, string $type = '') : Mailcode_Commands_Command_If
     {
         $cmd = self::_buildIf('If', $condition, $type);
         
-        if($cmd instanceof Mailcode_Commands_Command_If)
+        if ($cmd instanceof Mailcode_Commands_Command_If)
         {
             return $cmd;
         }
@@ -194,11 +194,11 @@ 
         throw self::_exceptionUnexpectedType($cmd);
     }
     
-    public static function ifVar(string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If
+    public static function ifVar(string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If
     {
         $cmd = self::_buildIfVar('If', $variable, $operand, $value, $quoteValue);
         
-        if($cmd instanceof Mailcode_Commands_Command_If)
+        if ($cmd instanceof Mailcode_Commands_Command_If)
         {
             return $cmd;
         }
@@ -210,7 +210,7 @@ 
     {
         $cmd = self::_buildIfVar('If', $variable, $operand, $value, true);
         
-        if($cmd instanceof Mailcode_Commands_Command_If)
+        if ($cmd instanceof Mailcode_Commands_Command_If)
         {
             return $cmd;
         }
@@ -218,11 +218,11 @@ 
         throw self::_exceptionUnexpectedType($cmd);
     }
     
-    public static function ifVarEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If
+    public static function ifVarEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If
     {
         $cmd = self::_buildIfVar('If', $variable, '==', $value, $quoteValue);
         
-        if($cmd instanceof Mailcode_Commands_Command_If)
+        if ($cmd instanceof Mailcode_Commands_Command_If)
         {
             return $cmd;
         }
@@ -234,7 +234,7 @@ 
     {
         $cmd = self::_buildIfVar('If', $variable, '==', $value, true);
         
-        if($cmd instanceof Mailcode_Commands_Command_If)
+        if ($cmd instanceof Mailcode_Commands_Command_If)
         {
             return $cmd;
         }
@@ -242,11 +242,11 @@ 
         throw self::_exceptionUnexpectedType($cmd);
     }
     
-    public static function ifVarNotEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_If
+    public static function ifVarNotEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_If
     {
         $cmd = self::_buildIfVar('If', $variable, '!=', $value, $quoteValue);
         
-        if($cmd instanceof Mailcode_Commands_Command_If)
+        if ($cmd instanceof Mailcode_Commands_Command_If)
         {
             return $cmd;
         }
@@ -258,7 +258,7 @@ 
     {
         $cmd = self::_buildIfVar('If', $variable, '!=', $value, true);
         
-        if($cmd instanceof Mailcode_Commands_Command_If)
+        if ($cmd instanceof Mailcode_Commands_Command_If)
         {
             return $cmd;
         }
@@ -266,11 +266,11 @@ 
         throw self::_exceptionUnexpectedType($cmd);
     }
     
-    public static function elseIf(string $condition, string $type='') : Mailcode_Commands_Command_ElseIf
+    public static function elseIf (string $condition, string $type = '') : Mailcode_Commands_Command_ElseIf
     {
         $cmd = self::_buildIf('ElseIf', $condition, $type);
         
-        if($cmd instanceof Mailcode_Commands_Command_ElseIf)
+        if ($cmd instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $cmd;
         }
@@ -278,11 +278,11 @@ 
         throw self::_exceptionUnexpectedType($cmd);
     }
     
-    public static function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf
+    public static function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf
     {
         $cmd = self::_buildIfVar('ElseIf', $variable, $operand, $value, $quoteValue);
         
-        if($cmd instanceof Mailcode_Commands_Command_ElseIf)
+        if ($cmd instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $cmd;
         }
@@ -294,7 +294,7 @@ 
     {
         $cmd = self::_buildIfVar('ElseIf', $variable, $operand, $value, true);
         
-        if($cmd instanceof Mailcode_Commands_Command_ElseIf)
+        if ($cmd instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $cmd;
         }
@@ -302,11 +302,11 @@ 
         throw self::_exceptionUnexpectedType($cmd);
     }
     
-    public static function elseIfVarEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf
+    public static function elseIfVarEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf
     {
         $cmd = self::_buildIfVar('ElseIf', $variable, '==', $value, $quoteValue);
         
-        if($cmd instanceof Mailcode_Commands_Command_ElseIf)
+        if ($cmd instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $cmd;
         }
@@ -318,7 +318,7 @@ 
     {
         $cmd = self::_buildIfVar('ElseIf', $variable, '==', $value, true);
         
-        if($cmd instanceof Mailcode_Commands_Command_ElseIf)
+        if ($cmd instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $cmd;
         }
@@ -326,11 +326,11 @@ 
         throw self::_exceptionUnexpectedType($cmd);
     }
     
-    public static function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf
+    public static function elseIfVarNotEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf
     {
         $cmd = self::_buildIfVar('ElseIf', $variable, '!=', $value, $quoteValue);
         
-        if($cmd instanceof Mailcode_Commands_Command_ElseIf)
+        if ($cmd instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $cmd;
         }
@@ -342,7 +342,7 @@ 
     {
         $cmd = self::_buildIfVar('ElseIf', $variable, '!=', $value, true);
         
-        if($cmd instanceof Mailcode_Commands_Command_ElseIf)
+        if ($cmd instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $cmd;
         }
@@ -368,7 +368,7 @@ 
     
     protected static function _checkCommand(Mailcode_Commands_Command $command) : void
     {
-        if($command->isValid())
+        if ($command->isValid())
         {
             return;
         }

src/Mailcode/Commands/Command.php

Spacing +20 added lines, -20 removed lines

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

src/Mailcode/Parser/Safeguard.php

Spacing +17 added lines, -17 removed lines

@@ -115,7 +115,7 @@ 
     */
     public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard
     {
-        if(empty($delimiter))
+        if (empty($delimiter))
         {
             throw new Mailcode_Exception(
                 'Empty delimiter',
@@ -156,17 +156,17 @@ 
     * @param bool $highlighted
     * @return string[]string
     */
-    protected function getReplaces(bool $highlighted=false) : array
+    protected function getReplaces(bool $highlighted = false) : array
     {
         $placeholders = $this->getPlaceholders();
         
         $replaces = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $replace = '';
             
-            if($highlighted)
+            if ($highlighted)
             {
                 $replace = $placeholder->getHighlightedText();
             }
@@ -190,7 +190,7 @@ 
     */
     public function getPlaceholders()
     {
-        if(isset($this->placeholders))
+        if (isset($this->placeholders))
         {
             return $this->placeholders;
         }
@@ -199,7 +199,7 @@ 
         
         $cmds = $this->getCollection()->getGroupedByHash();
         
-        foreach($cmds as $command)
+        foreach ($cmds as $command)
         {
             self::$counter++;
             
@@ -213,7 +213,7 @@ 
         return $this->placeholders;
     }
     
-    protected function restore(string $string, bool $highlighted=false) : string
+    protected function restore(string $string, bool $highlighted = false) : string
     {
         $this->requireValidCollection();
         
@@ -221,9 +221,9 @@ 
         
         $placeholderStrings = array_keys($replaces);
         
-        foreach($placeholderStrings as $search)
+        foreach ($placeholderStrings as $search)
         {
-            if(!strstr($string, $search))
+            if (!strstr($string, $search))
             {
                 throw new Mailcode_Exception(
                     'Command placeholder not found',
@@ -281,7 +281,7 @@ 
     */
     public function getCollection() : Mailcode_Collection
     {
-        if(isset($this->collection))
+        if (isset($this->collection))
         {
             return $this->collection;
         }
@@ -303,7 +303,7 @@ 
     */
     protected function requireValidCollection() : void
     {
-        if($this->getCollection()->isValid())
+        if ($this->getCollection()->isValid())
         {
             return;
         }
@@ -325,7 +325,7 @@ 
     */
     public function getPlaceholderStrings() : array
     {
-        if(isset($this->placeholderStrings))
+        if (isset($this->placeholderStrings))
         {
             return $this->placeholderStrings;
         }
@@ -334,7 +334,7 @@ 
         
         $this->placeholderStrings = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $this->placeholderStrings[] = $placeholder->getReplacementText();
         }
@@ -360,9 +360,9 @@ 
     {
         $placeholders = $this->getPlaceholders();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
-            if($placeholder->getID() === $id)
+            if ($placeholder->getID() === $id)
             {
                 return $placeholder;
             }
@@ -389,9 +389,9 @@ 
     {
         $placeholders = $this->getPlaceholders();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
-            if($placeholder->getReplacementText() === $string)
+            if ($placeholder->getReplacementText() === $string)
             {
                 return $placeholder;
             }

src/Mailcode/Collection.php

Spacing +10 added lines, -10 removed lines

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

src/Mailcode/Renderer.php

Spacing +6 added lines, -6 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;
         
@@ -60,9 +60,9 @@ 
         return $this->command2string(Mailcode_Factory::setVarString($variableName, $value));
     }
     
-    public function if(string $condition, string $type='') : string
+    public function if (string $condition, string $type = '') : string
     {
-        return $this->command2string(Mailcode_Factory::if($condition, $type));
+        return $this->command2string(Mailcode_Factory::if ($condition, $type));
     }
     
     public function ifVar(string $variable, string $operand, string $value, bool $quoteValue) : string
@@ -95,9 +95,9 @@ 
         return $this->command2string(Mailcode_Factory::ifVarNotEqualsString($variable, $value));
     }
     
-    public function elseIf(string $condition, string $type='') : string
+    public function elseIf (string $condition, string $type = '') : string
     {
-        return $this->command2string(Mailcode_Factory::elseIf($condition, $type));
+        return $this->command2string(Mailcode_Factory::elseIf ($condition, $type));
     }
     
     public function elseIfVar(string $variable, string $operand, string $value, bool $quoteValue) : string
@@ -147,7 +147,7 @@ 
     
     protected function command2string(Mailcode_Commands_Command $command) : string
     {
-        if($this->highlighted)
+        if ($this->highlighted)
         {
             return $command->getHighlighted();
         }