Mistralys / mailcode

src/Mailcode/Factory.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
      *
      * @return Mailcode_Factory_CommandSets_Set_If
      */
-    public static function if() : Mailcode_Factory_CommandSets_Set_If
+    public static function if () : Mailcode_Factory_CommandSets_Set_If
     {
         return self::$commandSets->if();
     }
@@ -63,7 +63,7 @@ 
      *
      * @return Mailcode_Factory_CommandSets_Set_ElseIf
      */
-    public static function elseIf() : Mailcode_Factory_CommandSets_Set_ElseIf
+    public static function elseIf () : Mailcode_Factory_CommandSets_Set_ElseIf
     {
         return self::$commandSets->elseIf();
     }
@@ -113,7 +113,7 @@ 
 
     public static function init() : void
     {
-        if(!isset(self::$commandSets))
+        if (!isset(self::$commandSets))
         {
             self::$commandSets = new Mailcode_Factory_CommandSets();
         }

Indentation +19 added lines, -19 removed lines

@@ -28,8 +28,8 @@ 
     public const URL_ENCODING_DECODE = 'decode';
 
     /**
-    * @var Mailcode_Factory_CommandSets
-    */
+     * @var Mailcode_Factory_CommandSets
+     */
     private static $commandSets;
 
     /**
@@ -83,33 +83,33 @@ 
     }
 
     /**
-    * Creates a renderer instance, which can be used to easily
-    * create and convert commands to strings.
-    * 
-    * @return Mailcode_Renderer
-    */
+     * Creates a renderer instance, which can be used to easily
+     * create and convert commands to strings.
+     * 
+     * @return Mailcode_Renderer
+     */
     public static function createRenderer() : Mailcode_Renderer
     {
         return new Mailcode_Renderer();
     }
     
-   /**
-    * Creates a printer instance, which works like the renderer,
-    * but outputs the generated strings to standard output.
-    * 
-    * @return Mailcode_Printer
-    */
+    /**
+     * Creates a printer instance, which works like the renderer,
+     * but outputs the generated strings to standard output.
+     * 
+     * @return Mailcode_Printer
+     */
     public static function createPrinter() : Mailcode_Printer
     {
         return new Mailcode_Printer();
     }
     
-   /**
-    * Gets/creates the global instance of the date format info
-    * class, used to handle date formatting aspects.
-    * 
-    * @return Mailcode_Date_FormatInfo
-    */
+    /**
+     * Gets/creates the global instance of the date format info
+     * class, used to handle date formatting aspects.
+     * 
+     * @return Mailcode_Date_FormatInfo
+     */
     public static function createDateInfo() : Mailcode_Date_FormatInfo
     {
         return Mailcode_Date_FormatInfo::getInstance();

src/Mailcode/Renderer.php

Indentation +15 added lines, -15 removed lines

@@ -21,17 +21,17 @@ 
  */
 class Mailcode_Renderer
 {
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     protected $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));

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
     {

src/Mailcode/Translator/Syntax/ApacheVelocity/Contains/StatementBuilder.php

Indentation +22 added lines, -22 removed lines

@@ -176,27 +176,27 @@
      * @return array<string,string>
      * @throws Mailcode_Exception
      */
-     private function parseVarName() : array
-     {
-         $tokens = explode('.', ltrim($this->variable->getFullName(), '$'));
-
-         if(count($tokens) === 2)
-         {
-             return array(
-                 'path' => $tokens[0],
-                 'name' => $tokens[1]
-             );
-         }
-
-         throw new Mailcode_Exception(
-             'Invalid variable name for a list property.',
-             sprintf(
-                 'Exactly 2 parts are required, variable [%s] has [%s].',
-                 $this->variable->getFullName(),
-                 count($tokens)
-             ),
-             self::ERROR_INVALID_LIST_VARIABLE_NAME
-         );
-     }
+        private function parseVarName() : array
+        {
+            $tokens = explode('.', ltrim($this->variable->getFullName(), '$'));
+
+            if(count($tokens) === 2)
+            {
+                return array(
+                    'path' => $tokens[0],
+                    'name' => $tokens[1]
+                );
+            }
+
+            throw new Mailcode_Exception(
+                'Invalid variable name for a list property.',
+                sprintf(
+                    'Exactly 2 parts are required, variable [%s] has [%s].',
+                    $this->variable->getFullName(),
+                    count($tokens)
+                ),
+                self::ERROR_INVALID_LIST_VARIABLE_NAME
+            );
+        }
 }
 

Braces +1 added lines, -2 removed lines

@@ -120,8 +120,7 @@
         if($this->isList())
         {
             $command = $this->renderListCommand($searchTerm);
-        }
-        else
+        } else
         {
             $command = $this->renderRegularCommand($searchTerm);
         }

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
      */
     public function getSign() : string
     {
-        if($this->isNotContains())
+        if ($this->isNotContains())
         {
             return '!';
         }
@@ -101,7 +101,7 @@ 
      */
     public function getConnector()
     {
-        if($this->isNotContains())
+        if ($this->isNotContains())
         {
             return '&&';
         }
@@ -117,7 +117,7 @@ 
     {
         $parts = array();
 
-        foreach($this->searchTerms as $token)
+        foreach ($this->searchTerms as $token)
         {
             $parts[] = $this->renderCommand($token);
         }
@@ -132,7 +132,7 @@ 
      */
     private function renderCommand(Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral $searchTerm) : string
     {
-        if($this->isList())
+        if ($this->isList())
         {
             $command = $this->renderListCommand($searchTerm);
         }
@@ -173,14 +173,14 @@ 
     private function renderRegex(Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral $searchTerm) : string
     {
         $opts = 's';
-        if($this->caseSensitive)
+        if ($this->caseSensitive)
         {
             $opts = 'is';
         }
 
         $filtered = trim($searchTerm->getNormalized(), '"');
 
-        if(!$this->regexEnabled)
+        if (!$this->regexEnabled)
         {
             $filtered = $this->translator->filterRegexString($filtered);
             $filtered = $this->addWildcards($filtered);
@@ -203,17 +203,17 @@ 
      */
     private function addWildcards(string $searchTerm) : string
     {
-        if($this->containsType === 'list-begins-with')
+        if ($this->containsType === 'list-begins-with')
         {
             return $searchTerm.'.*';
         }
 
-        if($this->containsType === 'list-ends-with')
+        if ($this->containsType === 'list-ends-with')
         {
             return '.*'.$searchTerm;
         }
 
-        if($this->containsType === 'list-equals')
+        if ($this->containsType === 'list-equals')
         {
             return '\\\A'.$searchTerm.'\\\Z';
         }
@@ -229,7 +229,7 @@ 
      {
          $tokens = explode('.', ltrim($this->variable->getFullName(), '$'));
 
-         if(count($tokens) === 2)
+         if (count($tokens) === 2)
          {
              return array(
                  'path' => $tokens[0],

src/Mailcode.php

Indentation +45 added lines, -45 removed lines

@@ -26,51 +26,51 @@ 
  */
 class Mailcode
 {
-   /**
-    * @var Mailcode_Parser|NULL
-    */
+    /**
+     * @var Mailcode_Parser|NULL
+     */
     protected $parser = null;
     
-   /**
-    * @var Mailcode_Commands|NULL
-    */
+    /**
+     * @var Mailcode_Commands|NULL
+     */
     protected $commands = null;
     
-   /**
-    * @var Mailcode_Variables|NULL
-    */
+    /**
+     * @var Mailcode_Variables|NULL
+     */
     protected $variables = null;
     
-   /**
-    * @var Mailcode_Translator|NULL
-    */
+    /**
+     * @var Mailcode_Translator|NULL
+     */
     protected $translator = null;
     
-   /**
-    * Creates a new mailcode instance.
-    * @return Mailcode
-    */
+    /**
+     * Creates a new mailcode instance.
+     * @return Mailcode
+     */
     public static function create() : Mailcode
     {
         return new Mailcode();
     }
     
-   /**
-    * Parses the string to detect all commands contained within.
-    * 
-    * @param string $string
-    * @return Mailcode_Collection
-    */
+    /**
+     * Parses the string to detect all commands contained within.
+     * 
+     * @param string $string
+     * @return Mailcode_Collection
+     */
     public function parseString(string $string) : Mailcode_Collection
     {
         return $this->getParser()->parseString($string);
     }
     
-   /**
-    * Retrieves the string parser instance used to detect commands.
-    * 
-    * @return Mailcode_Parser
-    */
+    /**
+     * Retrieves the string parser instance used to detect commands.
+     * 
+     * @return Mailcode_Parser
+     */
     public function getParser() : Mailcode_Parser
     {
         if(!isset($this->parser)) 
@@ -81,12 +81,12 @@ 
         return $this->parser;
     }
     
-   /**
-    * Retrieves the commands collection, which is used to
-    * access information on the available commands.
-    * 
-    * @return Mailcode_Commands
-    */
+    /**
+     * Retrieves the commands collection, which is used to
+     * access information on the available commands.
+     * 
+     * @return Mailcode_Commands
+     */
     public function getCommands() : Mailcode_Commands
     {
         if(!isset($this->commands)) 
@@ -129,12 +129,12 @@ 
         return $this->variables;
     }
     
-   /**
-    * Creates the translator, which can be used to convert commands
-    * to another supported syntax.
-    * 
-    * @return Mailcode_Translator
-    */
+    /**
+     * Creates the translator, which can be used to convert commands
+     * to another supported syntax.
+     * 
+     * @return Mailcode_Translator
+     */
     public function createTranslator() : Mailcode_Translator
     {
         if(!isset($this->translator))
@@ -145,12 +145,12 @@ 
         return $this->translator;
     }
     
-   /**
-    * Creates the styler, which can be used to retrieve the 
-    * CSS required to style the highlighted commands in HTML.
-    * 
-    * @return Mailcode_Styler
-    */
+    /**
+     * Creates the styler, which can be used to retrieve the 
+     * CSS required to style the highlighted commands in HTML.
+     * 
+     * @return Mailcode_Styler
+     */
     public function createStyler() : Mailcode_Styler
     {
         return new Mailcode_Styler();

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

Indentation +56 added lines, -56 removed lines

@@ -20,9 +20,9 @@ 
  */
 abstract class Mailcode_Variables_Collection
 {
-   /**
-    * @var Mailcode_Variables_Variable[]
-    */
+    /**
+     * @var Mailcode_Variables_Variable[]
+     */
     protected $variables = array();
     
     public function __construct()
@@ -52,12 +52,12 @@ 
         return count($this->variables);
     }
     
-   /**
-    * Checks whether the collection contains a variable with the specified name.
-    * 
-    * @param string $fullName The variable name, with or without $ sign.
-    * @return bool
-    */
+    /**
+     * Checks whether the collection contains a variable with the specified name.
+     * 
+     * @param string $fullName The variable name, with or without $ sign.
+     * @return bool
+     */
     public function hasVariableName(string $fullName) : bool
     {
         $fullName = $this->fixName($fullName);
@@ -73,14 +73,14 @@ 
         return false;
     }
     
-   /**
-    * Retrieves a collection of all variable instances for
-    * the specified name (there can be several with differing
-    * matched texts because of spacing).
-    * 
-    * @param string $fullName
-    * @return Mailcode_Variables_Collection
-    */
+    /**
+     * Retrieves a collection of all variable instances for
+     * the specified name (there can be several with differing
+     * matched texts because of spacing).
+     * 
+     * @param string $fullName
+     * @return Mailcode_Variables_Collection
+     */
     public function getByFullName(string $fullName) : Mailcode_Variables_Collection
     {
         $fullName = $this->fixName($fullName);
@@ -98,12 +98,12 @@ 
         return $collection;
     }
     
-   /**
-    * Prepends the $ sign to a variable name if it does not have it.
-    * 
-    * @param string $fullName
-    * @return string
-    */
+    /**
+     * Prepends the $ sign to a variable name if it does not have it.
+     * 
+     * @param string $fullName
+     * @return string
+     */
     protected function fixName(string $fullName) : string
     {
         if(substr($fullName, 0, 1) === '$')
@@ -114,12 +114,12 @@ 
         return '$'.$fullName;
     }
     
-   /**
-    * Retrieves all variables, grouped by their hash - meaning
-    * unique matched strings.
-    * 
-    * @return Mailcode_Variables_Variable[]
-    */
+    /**
+     * Retrieves all variables, grouped by their hash - meaning
+     * unique matched strings.
+     * 
+     * @return Mailcode_Variables_Variable[]
+     */
     public function getGroupedByHash() : array
     {
         $entries = array();
@@ -132,11 +132,11 @@ 
         return $this->sortVariables($entries);
     }
     
-   /**
-    * Retrieves all variables, grouped by their name. 
-    * 
-    * @return Mailcode_Variables_Variable[]
-    */
+    /**
+     * Retrieves all variables, grouped by their name. 
+     * 
+     * @return Mailcode_Variables_Variable[]
+     */
     public function getGroupedByName() : array
     {
         $entries = array();
@@ -168,19 +168,19 @@ 
         return $this->sortVariables($entries);
     }
     
-   /**
-    * Retrieves all variables, in the order they were addded.
-    * @return Mailcode_Variables_Variable[]
-    */
+    /**
+     * Retrieves all variables, in the order they were addded.
+     * @return Mailcode_Variables_Variable[]
+     */
     public function getAll()
     {
         return $this->variables;
     }
     
-   /**
-    * Retrieves the full names of the variables that are present in the collection.
-    * @return string[]
-    */
+    /**
+     * Retrieves the full names of the variables that are present in the collection.
+     * @return string[]
+     */
     public function getNames() : array
     {
         $result = array();
@@ -198,13 +198,13 @@ 
         return $result;
     }
     
-   /**
-    * Takes a list of variables and sorts them, throwing away
-    * the source array's keys.
-    * 
-    * @param Mailcode_Variables_Variable[] $entries
-    * @return Mailcode_Variables_Variable[]
-    */
+    /**
+     * Takes a list of variables and sorts them, throwing away
+     * the source array's keys.
+     * 
+     * @param Mailcode_Variables_Variable[] $entries
+     * @return Mailcode_Variables_Variable[]
+     */
     protected function sortVariables(array $entries)
     {
         $result = array_values($entries);
@@ -217,13 +217,13 @@ 
         return $result;
     }
 
-   /**
-    *  Merges the variables collection with the target collection
-    *  by inheriting all that collection's variables.
-    *  
-    * @param Mailcode_Variables_Collection $collection
-    * @return Mailcode_Variables_Collection
-    */
+    /**
+     *  Merges the variables collection with the target collection
+     *  by inheriting all that collection's variables.
+     *  
+     * @param Mailcode_Variables_Collection $collection
+     * @return Mailcode_Variables_Collection
+     */
     public function mergeWith(Mailcode_Variables_Collection $collection) : Mailcode_Variables_Collection
     {
         $variables = $collection->getGroupedByHash();

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

Indentation +18 added lines, -18 removed lines

@@ -32,34 +32,34 @@
     public const VALIDATION_ERROR_PATH_UNDERSCORE = 48203;
     public const VALIDATION_ERROR_NAME_UNDERSCORE = 48204;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $path;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $name;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $matchedText;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $hash = '';
     
-   /**
-    * @var OperationResult
-    */
+    /**
+     * @var OperationResult
+     */
     protected $validationResult = null;
     
-   /**
-    * @var array<string>
-    */
+    /**
+     * @var array<string>
+     */
     protected $validations = array(
         'number_path',
         'number_name',

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

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 $collection;
 
     /**

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

Indentation +13 added lines, -13 removed lines

@@ -26,24 +26,24 @@ 
     public const VALIDATION_EMPTY = 48801;
     public const VALIDATION_UNQUOTED_STRING_LITERALS = 48802;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $statement;
     
-   /**
-    * @var OperationResult
-    */
+    /**
+     * @var OperationResult
+     */
     protected $result;
     
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer
+     */
     protected $tokenizer;
     
-   /**
-    * @var Mailcode_Parser_Statement_Info|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Info|NULL
+     */
     protected $info;
 
     /**
@@ -123,7 +123,7 @@ 
         if($unknown)
         {
             $this->result->makeError(
-               t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')',
+                t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')',
                 self::VALIDATION_UNQUOTED_STRING_LITERALS
             );
         }

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

Indentation +17 added lines, -17 removed lines

@@ -20,19 +20,19 @@ 
  */
 abstract class Mailcode_Parser_Statement_Tokenizer_Token implements Mailcode_Parser_Statement_Tokenizer_TypeInterface
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $tokenID;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $matchedText;
     
-   /**
-    * @var mixed
-    */
+    /**
+     * @var mixed
+     */
     protected $subject;
 
     /**
@@ -62,20 +62,20 @@ 
         return $this->sourceCommand;
     }
     
-   /**
-    * The ID of the type. i.e. the class name ("Keyword", "StringLiteral").
-    * @return string
-    */
+    /**
+     * The ID of the type. i.e. the class name ("Keyword", "StringLiteral").
+     * @return string
+     */
     public function getTypeID() : string
     {
         $parts = explode('_', get_class($this));
         return array_pop($parts);
     }
     
-   /**
-    * Retrieves a unique ID of the token.
-    * @return string  
-    */
+    /**
+     * Retrieves a unique ID of the token.
+     * @return string  
+     */
     public function getID() : string
     {
         return $this->tokenID;

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;