Mistralys / mailcode

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

css/index.php

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
     $autoload = realpath($root.'/../vendor/autoload.php');
     
     // we need the autoloader to be present
-    if($autoload === false) 
+    if ($autoload === false) 
     {
         die('<b>ERROR:</b> Autoloader not present. Run composer update first.');
     }
@@ -65,19 +65,19 @@ 
                     Mailcode_Factory::misc()->comment('Some comments here'),
                     Mailcode_Factory::show()->snippet('snippet_name'),
                     Mailcode_Factory::show()->date('DATE.VARIABLE'),
-                    Mailcode_Factory::if()->if('1 + 1 == 2'),
-                    Mailcode_Factory::if()->contains('CUSTOMER.NAME', array('John')),
-                    Mailcode_Factory::if()->varEquals('NUMBER', '124'),
+                    Mailcode_Factory::if ()->if('1 + 1 == 2'),
+                    Mailcode_Factory::if ()->contains('CUSTOMER.NAME', array('John')),
+                    Mailcode_Factory::if ()->varEquals('NUMBER', '124'),
                 );
                 
-                $and = Mailcode_Factory::elseIf()->varEqualsString('STRINGVAR', 'John');
+                $and = Mailcode_Factory::elseIf ()->varEqualsString('STRINGVAR', 'John');
                 $and->getLogicKeywords()->appendOR('$STRINGVAR == "Steve"', "variable");
                 
                 $commands[] = $and;
                 
                 $commands[] = Mailcode_Factory::misc()->end();
                 
-                foreach($commands as $command)
+                foreach ($commands as $command)
                 {
                     ?>
                     	<p>

src/Mailcode.php

Spacing +5 added lines, -5 removed lines

@@ -73,7 +73,7 @@ 
     */
     public function getParser() : Mailcode_Parser
     {
-        if(!isset($this->parser)) 
+        if (!isset($this->parser)) 
         {
             $this->parser = new Mailcode_Parser($this);
         }
@@ -89,7 +89,7 @@ 
     */
     public function getCommands() : Mailcode_Commands
     {
-        if(!isset($this->commands)) 
+        if (!isset($this->commands)) 
         {
             $this->commands = new Mailcode_Commands();
         }
@@ -114,14 +114,14 @@ 
      * @param Mailcode_Commands_Command|null $sourceCommand
      * @return Mailcode_Variables_Collection_Regular
      */
-    public function findVariables(string $subject, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Variables_Collection_Regular
+    public function findVariables(string $subject, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Variables_Collection_Regular
     {
         return $this->createVariables()->parseString($subject, $sourceCommand);
     }
     
     public function createVariables() : Mailcode_Variables
     {
-        if(!isset($this->variables))
+        if (!isset($this->variables))
         {
             $this->variables = new Mailcode_Variables();
         }
@@ -137,7 +137,7 @@ 
     */
     public function createTranslator() : Mailcode_Translator
     {
-        if(!isset($this->translator))
+        if (!isset($this->translator))
         {
             $this->translator = new Mailcode_Translator(); 
         }

src/Mailcode/Variables/Collection.php

Spacing +12 added lines, -12 removed lines

@@ -62,9 +62,9 @@ 
     {
         $fullName = $this->fixName($fullName);
         
-        foreach($this->variables as $variable)
+        foreach ($this->variables as $variable)
         {
-            if($variable->getFullName() === $fullName)
+            if ($variable->getFullName() === $fullName)
             {
                 return true;
             }
@@ -87,9 +87,9 @@ 
         
         $collection = new Mailcode_Variables_Collection_Regular();
         
-        foreach($this->variables as $variable)
+        foreach ($this->variables as $variable)
         {
-            if($variable->getFullName() === $fullName)
+            if ($variable->getFullName() === $fullName)
             {
                 $collection->add($variable);
             }
@@ -106,7 +106,7 @@ 
     */
     protected function fixName(string $fullName) : string
     {
-        if(substr($fullName, 0, 1) === '$')
+        if (substr($fullName, 0, 1) === '$')
         {
             return $fullName;
         }
@@ -124,7 +124,7 @@ 
     {
         $entries = array();
         
-        foreach($this->variables as $variable)
+        foreach ($this->variables as $variable)
         {
             $entries[$variable->getHash()] = $variable;
         }
@@ -141,7 +141,7 @@ 
     {
         $entries = array();
         
-        foreach($this->variables as $variable)
+        foreach ($this->variables as $variable)
         {
             $entries[$variable->getFullName()] = $variable;
         }
@@ -160,7 +160,7 @@ 
     {
         $entries = array();
 
-        foreach($this->variables as $variable)
+        foreach ($this->variables as $variable)
         {
             $entries[$variable->getUniqueName()] = $variable;
         }
@@ -185,11 +185,11 @@ 
     {
         $result = array();
         
-        foreach($this->variables as $variable)
+        foreach ($this->variables as $variable)
         {
             $name = $variable->getFullName();
             
-            if(!in_array($name, $result))
+            if (!in_array($name, $result))
             {
                 $result[] = $name;
             }
@@ -228,7 +228,7 @@ 
     {
         $variables = $collection->getGroupedByHash();
         
-        foreach($variables as $variable)
+        foreach ($variables as $variable)
         {
             $this->add($variable);
         }
@@ -240,7 +240,7 @@ 
     {
         $variables = $this->getAll();
         
-        if(!empty($variables))
+        if (!empty($variables))
         {
             return array_shift($variables);
         }

src/Mailcode/Variables/Variable.php

Spacing +11 added lines, -11 removed lines

@@ -72,7 +72,7 @@ 
      */
     private $command;
 
-    public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null)
+    public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null)
     {
         $this->path = $path;
         $this->name = $name;
@@ -95,7 +95,7 @@ 
     
     public function getFullName() : string
     {
-        if(empty($this->path))
+        if (empty($this->path))
         {
             return '$'.$this->name;
         }
@@ -113,7 +113,7 @@ 
      */
     public function getUniqueName() : string
     {
-        if(isset($this->command))
+        if (isset($this->command))
         {
             return $this->getFullName().'/'.$this->command->getHash();
         }
@@ -138,7 +138,7 @@ 
     
     public function getHash() : string
     {
-        if(empty($this->hash))
+        if (empty($this->hash))
         {
             $this->hash = md5($this->matchedText);
         }
@@ -153,7 +153,7 @@ 
     
     public function getValidationResult() : OperationResult
     {
-        if(isset($this->validationResult))
+        if (isset($this->validationResult))
         {
             return $this->validationResult;
         }
@@ -167,11 +167,11 @@ 
 
     protected function validate() : void
     {
-        foreach($this->validations as $validation)
+        foreach ($this->validations as $validation)
         {
             $method = 'validate_'.$validation;
             
-            if(!method_exists($this, $method))
+            if (!method_exists($this, $method))
             {
                 throw new Mailcode_Exception(
                     'Unknown validation method',
@@ -186,7 +186,7 @@ 
             
             $this->$method();
             
-            if(!$this->validationResult->isValid())
+            if (!$this->validationResult->isValid())
             {
                 return;
             }
@@ -215,7 +215,7 @@ 
     
     protected function validateNumber(string $value, int $errorCode) : void
     {
-        if(!is_numeric(substr($value, 0, 1)))
+        if (!is_numeric(substr($value, 0, 1)))
         {
             return;
         }
@@ -233,7 +233,7 @@ 
     protected function validateUnderscore(string $value, int $errorCode) : void
     {
         // allow empty paths
-        if(empty($value))
+        if (empty($value))
         {
             return;
         }
@@ -241,7 +241,7 @@ 
         $length = strlen($value);
         
         // trimming underscores does not change the length: no underscores at start or end of string.
-        if(strlen(trim($value, '_')) == $length)
+        if (strlen(trim($value, '_')) == $length)
         {
             return;
         }

src/Mailcode/Variables.php

Spacing +8 added lines, -8 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(!isset($matches[0]) || empty($matches[0]))
+        if (!isset($matches[0]) || 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;
         }

src/Mailcode/Parser/Statement.php

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
      */
     private $sourceCommand;
 
-    public function __construct(string $statement, bool $freeform=false, ?Mailcode_Commands_Command $sourceCommand=null)
+    public function __construct(string $statement, bool $freeform = false, ?Mailcode_Commands_Command $sourceCommand = null)
     {
         $this->sourceCommand = $sourceCommand;
         $this->statement = $statement;
@@ -91,7 +91,7 @@ 
     
     public function getInfo() : Mailcode_Parser_Statement_Info
     {
-        if($this->info instanceof Mailcode_Parser_Statement_Info)
+        if ($this->info instanceof Mailcode_Parser_Statement_Info)
         {
             return $this->info; 
         }
@@ -103,12 +103,12 @@ 
     
     protected function validate() : void
     {
-        if($this->freeform)
+        if ($this->freeform)
         {
             return;
         }
 
-        if(!$this->tokenizer->hasTokens())
+        if (!$this->tokenizer->hasTokens())
         {
             $this->result->makeError(
                 t('Empty statement'),
@@ -120,7 +120,7 @@ 
         
         $unknown = $this->tokenizer->getFirstUnknown();
         
-        if($unknown)
+        if ($unknown)
         {
             $this->result->makeError(
                t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')',

src/Mailcode/Parser/Statement/Tokenizer/Token.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
      * @param mixed $subject
      * @param Mailcode_Commands_Command|null $sourceCommand
      */
-    public function __construct(string $tokenID, string $matchedText, $subject=null, ?Mailcode_Commands_Command $sourceCommand=null)
+    public function __construct(string $tokenID, string $matchedText, $subject = null, ?Mailcode_Commands_Command $sourceCommand = null)
     {
         $this->tokenID = $tokenID;
         $this->matchedText = $matchedText;

src/Mailcode/Parser/Statement/Tokenizer/Process/Variables.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     {
         $vars = Mailcode::create()->findVariables($this->tokenized, $this->tokenizer->getSourceCommand())->getGroupedByHash();
 
-        foreach($vars as $var)
+        foreach ($vars as $var)
         {
             $this->registerToken('Variable', $var->getMatchedText(), $var);
         }