Mistralys / mailcode

src/Mailcode/Factory/Instantiator.php

Spacing +15 added lines, -15 removed lines

@@ -20,11 +20,11 @@ 
  */
 class Mailcode_Factory_Instantiator
 {
-    public function buildIf(string $ifType, string $params, string $type='') : Mailcode_Commands_IfBase
+    public function buildIf(string $ifType, string $params, string $type = '') : Mailcode_Commands_IfBase
     {
         $stringType = $type;
         
-        if(!empty($type))
+        if (!empty($type))
         {
             $stringType = ' '.$type;
         }
@@ -43,7 +43,7 @@ 
         
         $this->checkCommand($command);
         
-        if($command instanceof Mailcode_Commands_IfBase)
+        if ($command instanceof Mailcode_Commands_IfBase)
         {
             return $command;
         }
@@ -51,9 +51,9 @@ 
         throw $this->exceptionUnexpectedType('IfBase', $command);
     }
     
-    public function buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_IfBase
+    public function buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_IfBase
     {
-        if($quoteValue)
+        if ($quoteValue)
         {
             $value = $this->quoteString($value);
         }
@@ -86,11 +86,11 @@ 
      * @return Mailcode_Commands_IfBase
      * @throws Mailcode_Factory_Exception
      */
-    public function buildIfContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, string $containsType='contains') : Mailcode_Commands_IfBase
+    public function buildIfContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, string $containsType = 'contains') : Mailcode_Commands_IfBase
     {
         $keyword = ' ';
         
-        if($caseInsensitive)
+        if ($caseInsensitive)
         {
             $keyword = ' '.Mailcode_Commands_Keywords::TYPE_INSENSITIVE;
         }
@@ -113,7 +113,7 @@ 
      * @return Mailcode_Commands_IfBase
      * @throws Mailcode_Factory_Exception
      */
-    public function buildIfNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    public function buildIfNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         return $this->buildIfContains($ifType, $variable, $searchTerms, $caseInsensitive, 'not-contains');
     }
@@ -127,7 +127,7 @@ 
      * @return Mailcode_Commands_IfBase
      * @throws Mailcode_Factory_Exception
      */
-    public function buildIfListContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, string $containsType='list-contains') : Mailcode_Commands_IfBase
+    public function buildIfListContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, string $containsType = 'list-contains') : Mailcode_Commands_IfBase
     {
         return $this->buildIfContains($ifType, $variable, $searchTerms, $caseInsensitive, 'list-contains');
     }
@@ -141,17 +141,17 @@ 
      * @return Mailcode_Commands_IfBase
      * @throws Mailcode_Factory_Exception
      */
-    public function buildIfListNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, string $containsType='list-contains') : Mailcode_Commands_IfBase
+    public function buildIfListNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, string $containsType = 'list-contains') : Mailcode_Commands_IfBase
     {
         return $this->buildIfContains($ifType, $variable, $searchTerms, $caseInsensitive, 'list-not-contains');
     }
 
-    public function buildIfBeginsWith(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    public function buildIfBeginsWith(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         return $this->buildIfSearch($ifType, 'begins-with', $variable, $search, $caseInsensitive);
     }
     
-    public function buildIfEndsWith(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    public function buildIfEndsWith(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         return $this->buildIfSearch($ifType, 'ends-with', $variable, $search, $caseInsensitive);
     }
@@ -201,11 +201,11 @@ 
         );
     }
 
-    private function buildIfSearch(string $ifType, string $subType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    private function buildIfSearch(string $ifType, string $subType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         $keyword = ' ';
         
-        if($caseInsensitive)
+        if ($caseInsensitive)
         {
             $keyword = ' '.Mailcode_Commands_Keywords::TYPE_INSENSITIVE;
         }
@@ -234,7 +234,7 @@ 
     
     public function checkCommand(Mailcode_Commands_Command $command) : void
     {
-        if($command->isValid())
+        if ($command->isValid())
         {
             return;
         }

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

Spacing +6 added lines, -6 removed lines

@@ -69,7 +69,7 @@ 
      */
     public function getSign() : string
     {
-        if($this->isNotContains())
+        if ($this->isNotContains())
         {
             return '!';
         }
@@ -86,7 +86,7 @@ 
      */
     public function getConnector()
     {
-        if($this->isNotContains())
+        if ($this->isNotContains())
         {
             return '&&';
         }
@@ -102,7 +102,7 @@ 
     {
         $parts = array();
 
-        foreach($this->searchTerms as $token)
+        foreach ($this->searchTerms as $token)
         {
             $parts[] = $this->renderCommand($token);
         }
@@ -117,7 +117,7 @@ 
      */
     private function renderCommand(Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral $searchTerm) : string
     {
-        if($this->isList())
+        if ($this->isList())
         {
             $command = $this->renderListCommand($searchTerm);
         }
@@ -158,7 +158,7 @@ 
     private function renderRegex(Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral $searchTerm) : string
     {
         $opts = 's';
-        if($this->caseSensitive)
+        if ($this->caseSensitive)
         {
             $opts = 'is';
         }
@@ -180,7 +180,7 @@ 
      {
          $tokens = explode('.', ltrim($this->variable->getFullName(), '$'));
 
-         if(count($tokens) === 2)
+         if (count($tokens) === 2)
          {
              return array(
                  'path' => $tokens[0],

Braces +1 added lines, -2 removed lines

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

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/Factory/CommandSets/Set/ElseIf.php

Spacing +28 added lines, -28 removed lines

@@ -20,11 +20,11 @@ 
  */
 class Mailcode_Factory_CommandSets_Set_ElseIf extends Mailcode_Factory_CommandSets_IfBase
 {
-    public function elseIf(string $condition, string $type='') : Mailcode_Commands_Command_ElseIf
+    public function elseIf (string $condition, string $type = '') : Mailcode_Commands_Command_ElseIf
     {
         $command = $this->instantiator->buildIf('ElseIf', $condition, $type);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $command;
         }
@@ -32,11 +32,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIf', $command);
     }
     
-    public function var(string $variable, string $operand, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function var(string $variable, string $operand, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, $operand, $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -48,7 +48,7 @@ 
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, $operand, $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -56,11 +56,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfVarString', $command);
     }
     
-    public function varEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function varEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '==', $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -72,7 +72,7 @@ 
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '==', $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -80,11 +80,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfVarEqualsString', $command);
     }
     
-    public function varNotEquals(string $variable, string $value, bool $quoteValue=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function varNotEquals(string $variable, string $value, bool $quoteValue = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '!=', $value, $quoteValue);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -96,7 +96,7 @@ 
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '!=', $value, true);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -111,11 +111,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_Contains
      * @throws Mailcode_Factory_Exception
      */
-    public function contains(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_Contains
+    public function contains(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_Contains
     {
         $command = $this->instantiator->buildIfContains('ElseIf', $variable, $searchTerms, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Contains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Contains)
         {
             return $command;
         }
@@ -130,11 +130,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_NotContains
      * @throws Mailcode_Factory_Exception
      */
-    public function notContains(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_NotContains
+    public function notContains(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_NotContains
     {
         $command = $this->instantiator->buildIfNotContains('ElseIf', $variable, $searchTerms, $caseInsensitive);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_NotContains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_NotContains)
         {
             return $command;
         }
@@ -149,11 +149,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_ListContains
      * @throws Mailcode_Factory_Exception
      */
-    public function listContains(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_ListContains
+    public function listContains(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_ListContains
     {
         $command = $this->instantiator->buildIfListContains('ElseIf', $variable, $searchTerms, $caseInsensitive);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_ListContains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_ListContains)
         {
             return $command;
         }
@@ -168,11 +168,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_ListNotContains
      * @throws Mailcode_Factory_Exception
      */
-    public function listNotContains(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_ListNotContains
+    public function listNotContains(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_ListNotContains
     {
         $command = $this->instantiator->buildIfListNotContains('ElseIf', $variable, $searchTerms, $caseInsensitive);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_ListNotContains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_ListNotContains)
         {
             return $command;
         }
@@ -180,11 +180,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfListNotContains', $command);
     }
 
-    public function beginsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_BeginsWith
+    public function beginsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_BeginsWith
     {
         $command = $this->instantiator->buildIfBeginsWith('ElseIf', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_BeginsWith)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_BeginsWith)
         {
             return $command;
         }
@@ -192,11 +192,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfBeginsWith', $command);
     }
     
-    public function endsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_EndsWith
+    public function endsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_EndsWith
     {
         $command = $this->instantiator->buildIfEndsWith('ElseIf', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_EndsWith)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_EndsWith)
         {
             return $command;
         }
@@ -208,7 +208,7 @@ 
     {
         $command = $this->instantiator->buildIfEmpty('ElseIf', $variable);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Empty)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Empty)
         {
             return $command;
         }
@@ -220,7 +220,7 @@ 
     {
         $command = $this->instantiator->buildIfNotEmpty('ElseIf', $variable);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_NotEmpty)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_NotEmpty)
         {
             return $command;
         }
@@ -232,7 +232,7 @@ 
     {
         $command = $this->instantiator->buildIfBiggerThan('ElseIf', $variable, $value);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_BiggerThan)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_BiggerThan)
         {
             return $command;
         }
@@ -244,7 +244,7 @@ 
     {
         $command = $this->instantiator->buildIfSmallerThan('ElseIf', $variable, $value);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_SmallerThan)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_SmallerThan)
         {
             return $command;
         }
@@ -256,7 +256,7 @@ 
     {
         $command = $this->instantiator->buildIfEquals('ElseIf', $variable, $value);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_EqualsNumber)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_EqualsNumber)
         {
             return $command;
         }

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.php

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 {
     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;
 
     /**

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

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

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 
     protected function validateSyntax_params_parse() : void
     {
-        if(!$this->requiresParameters())
+        if (!$this->requiresParameters())
         {
             return;
         }
@@ -46,7 +46,7 @@ 
             $this
         );
 
-        if(!$this->params->isValid())
+        if (!$this->params->isValid())
         {
             $error = $this->params->getValidationResult();
 

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;

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