Mistralys / mailcode

src/Mailcode/Factory.php

Braces +3 added lines, -1 removed lines

@@ -94,13 +94,15 @@
         return $cmd;
     }
     
-    public static function else() : Mailcode_Commands_Command_Else
+    public static function else {
+        () : Mailcode_Commands_Command_Else
     {
         $cmd = new Mailcode_Commands_Command_Else(
             '', // type,
             '', // params,
             '{else}'
         );
+    }
         
         self::_checkCommand($cmd);
         

Indentation +46 added lines, -46 removed lines

@@ -24,17 +24,17 @@ 
     
     const ERROR_UNEXPECTED_COMMAND_TYPE = 50002;
     
-   /**
-    * @var Mailcode_Renderer
-    */
+    /**
+     * @var Mailcode_Renderer
+     */
     protected static $renderer;
     
-   /**
-    * Creates a ShowVariable command.
-    * 
-    * @param string $variableName A variable name, with or without the $ sign prepended.
-    * @return Mailcode_Commands_Command_ShowVariable
-    */
+    /**
+     * Creates a ShowVariable command.
+     * 
+     * @param string $variableName A variable name, with or without the $ sign prepended.
+     * @return Mailcode_Commands_Command_ShowVariable
+     */
     public static function showVar(string $variableName) : Mailcode_Commands_Command_ShowVariable
     {
         $variableName = self::_filterVariableName($variableName);
@@ -50,17 +50,17 @@ 
         return $cmd;
     }
     
-   /**
-    * Creates a SetVariable command.
-    * 
-    * @param string $variableName A variable name, with or without the $ sign prepended.
-    * @param string $value
-    * @param bool $quoteValue Whether to treat the value as a string literal, and add quotes to it.
-    * @return Mailcode_Commands_Command_SetVariable
-    * @throws Mailcode_Factory_Exception
-    * 
-    * @see Mailcode_Factory::ERROR_INVALID_COMMAND_CREATED
-    */
+    /**
+     * Creates a SetVariable command.
+     * 
+     * @param string $variableName A variable name, with or without the $ sign prepended.
+     * @param string $value
+     * @param bool $quoteValue Whether to treat the value as a string literal, and add quotes to it.
+     * @return Mailcode_Commands_Command_SetVariable
+     * @throws Mailcode_Factory_Exception
+     * 
+     * @see Mailcode_Factory::ERROR_INVALID_COMMAND_CREATED
+     */
     public static function setVar(string $variableName, string $value, bool $quoteValue=true) : Mailcode_Commands_Command_SetVariable
     {
         $variableName = self::_filterVariableName($variableName);
@@ -83,14 +83,14 @@ 
         return $cmd;
     }
     
-   /**
-    * Like setVar(), but treats the value as a string literal
-    * and automatically adds quotes to it.
-    * 
-    * @param string $variableName
-    * @param string $value
-    * @return Mailcode_Commands_Command_SetVariable
-    */
+    /**
+     * Like setVar(), but treats the value as a string literal
+     * and automatically adds quotes to it.
+     * 
+     * @param string $variableName
+     * @param string $value
+     * @return Mailcode_Commands_Command_SetVariable
+     */
     public static function setVarString(string $variableName, string $value) : Mailcode_Commands_Command_SetVariable
     {
         return self::setVar($variableName, $value, true);
@@ -355,12 +355,12 @@ 
         return '$'.ltrim($name, '$');
     }
     
-   /**
-    * Quotes a string literal: adds the quotes, and escapes any quotes already present in it.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Quotes a string literal: adds the quotes, and escapes any quotes already present in it.
+     * 
+     * @param string $string
+     * @return string
+     */
     protected static function _quoteString(string $string) : string
     {
         return '"'.str_replace('"', '\"', $string).'"';
@@ -393,23 +393,23 @@ 
         );
     }
     
-   /**
-    * 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();

Spacing +29 added lines, -29 removed lines

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

src/Mailcode/Commands/Command/SetVariable.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
     {
         $variable = $this->params->getInfo()->getVariableByIndex(0);
         
-        if($variable)
+        if ($variable)
         {
             return $variable->getVariable();
         }
@@ -86,7 +86,7 @@ 
     
     protected function validateSyntax_assignment() : void
     {
-        if($this->params->getInfo()->isVariableAssignment())
+        if ($this->params->getInfo()->isVariableAssignment())
         {
             return;
         }

src/Mailcode/Commands/Command/Comment.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     protected function init() : void
     {
         // automatically quote the parameters, since comments don't require any.
-        if(!strstr($this->paramsString, '"'))
+        if (!strstr($this->paramsString, '"'))
         {
             $this->paramsString = '"'.$this->paramsString.'"';
         }

src/Mailcode/Commands/Command/ShowVariable.php

Indentation +30 added lines, -30 removed lines

@@ -24,9 +24,9 @@ 
     
     const VALIDATION_VARIABLE_COUNT_MISMATCH = 48401;
     
-   /**
-    * @var Mailcode_Variables_Variable|NULL
-    */
+    /**
+     * @var Mailcode_Variables_Variable|NULL
+     */
     protected $variable;
     
     public function getName() : string
@@ -49,15 +49,15 @@ 
         return true;
     }
     
-   /**
-    * Retrieves the variable to show.
-    * 
-    * NOTE: Only available once the command has been
-    * validated. Always use isValid() first.
-    * 
-    * @throws Mailcode_Exception
-    * @return Mailcode_Variables_Variable
-    */
+    /**
+     * Retrieves the variable to show.
+     * 
+     * NOTE: Only available once the command has been
+     * validated. Always use isValid() first.
+     * 
+     * @throws Mailcode_Exception
+     * @return Mailcode_Variables_Variable
+     */
     public function getVariable() : Mailcode_Variables_Variable
     {
         $this->validate();
@@ -74,15 +74,15 @@ 
         );
     }
     
-   /**
-    * Retrieves the full name of the variable to show.
-    * 
-    * NOTE: Only available once the command has been
-    * validated. Always use isValid() first.
-    * 
-    * @throws Mailcode_Exception
-    * @return string
-    */
+    /**
+     * Retrieves the full name of the variable to show.
+     * 
+     * NOTE: Only available once the command has been
+     * validated. Always use isValid() first.
+     * 
+     * @throws Mailcode_Exception
+     * @return string
+     */
     public function getVariableName() : string
     {
         return $this->getVariable()->getFullName();
@@ -90,19 +90,19 @@ 
 
     protected function validateSyntax_require_variable() : void
     {
-         $vars = $this->getVariables()->getGroupedByName();
-         $amount = count($vars);
+            $vars = $this->getVariables()->getGroupedByName();
+            $amount = count($vars);
          
-         if($amount === 1)
-         {
-             $this->variable = array_pop($vars);
-             return;
-         }
+            if($amount === 1)
+            {
+                $this->variable = array_pop($vars);
+                return;
+            }
          
-         $this->validationResult->makeError(
+            $this->validationResult->makeError(
             t('Command has %1$s variables, %2$s expected.', $amount, 1),
             self::VALIDATION_VARIABLE_COUNT_MISMATCH
-         );
+            );
     }
     
     protected function getValidations() : array

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
     {
         $this->validate();
         
-        if(isset($this->variable))
+        if (isset($this->variable))
         {
             return $this->variable;
         }
@@ -93,7 +93,7 @@ 
          $vars = $this->getVariables()->getGroupedByName();
          $amount = count($vars);
          
-         if($amount === 1)
+         if ($amount === 1)
          {
              $this->variable = array_pop($vars);
              return;

src/Mailcode/Commands/Command/If.php

Indentation +8 added lines, -8 removed lines

@@ -22,9 +22,9 @@ 
 {
     const VALIDATION_VARIABLE_COUNT_MISMATCH = 49201;
     
-   /**
-    * @var Mailcode_Variables_Variable
-    */
+    /**
+     * @var Mailcode_Variables_Variable
+     */
     protected $variable;
     
     public function getName() : string
@@ -57,11 +57,11 @@ 
         return $this->type === 'variable';
     }
     
-   /**
-    * Available only if the command is of type "variable".
-    * 
-    * @return Mailcode_Variables_Variable|NULL
-    */
+    /**
+     * Available only if the command is of type "variable".
+     * 
+     * @return Mailcode_Variables_Variable|NULL
+     */
     public function getVariable() : ?Mailcode_Variables_Variable
     {
         if(isset($this->variable))

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
     */
     public function getVariable() : ?Mailcode_Variables_Variable
     {
-        if(isset($this->variable))
+        if (isset($this->variable))
         {
             return $this->variable;
         }
@@ -76,7 +76,7 @@ 
     {
         $amount = $this->getVariables()->countVariables();
         
-        if($amount >= 1)
+        if ($amount >= 1)
         {
             return;
         }
@@ -91,7 +91,7 @@ 
     {
         $validations = array();
         
-        if($this->getType() === 'variable')
+        if ($this->getType() === 'variable')
         {
             $validations[] = 'require_variable';
         }

src/Mailcode/Commands/Command/For.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         $keyword = $info->getKeywordByIndex(1);
         $container = $info->getVariableByIndex(2);
         
-        if($variable && $keyword && $container && $keyword->isForIn())
+        if ($variable && $keyword && $container && $keyword->isForIn())
         {
             return;
         }

src/Mailcode/Commands/Highlighter.php

Indentation +12 added lines, -12 removed lines

@@ -20,19 +20,19 @@ 
  */
 class Mailcode_Commands_Highlighter
 {
-   /**
-    * @var Mailcode_Commands_Command
-    */
+    /**
+     * @var Mailcode_Commands_Command
+     */
     protected $command;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $parts = array();
     
     public function __construct(Mailcode_Commands_Command $command)
     {
-       $this->command = $command;
+        $this->command = $command;
     }
     
     public function highlight() : string
@@ -68,11 +68,11 @@ 
         }
     }
     
-   /**
-    * @param string[] $classes
-    * @param string $content
-    * @return string
-    */
+    /**
+     * @param string[] $classes
+     * @param string $content
+     * @return string
+     */
     protected function renderTag(array $classes, string $content) : string
     {
         $parts = array();

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
     {
         $this->parts[] = $this->renderTag(array('command-name'), $this->command->getName());
         
-        if($this->command->hasType())
+        if ($this->command->hasType())
         {
             $this->parts[] = ' '.$this->renderTag(array('command-type'), $this->command->getType());
         }
@@ -62,7 +62,7 @@ 
     
     protected function appendParams() : void
     {
-        if($this->command->hasParameters())
+        if ($this->command->hasParameters())
         {
             $this->parts[] = ' '.$this->renderTag(array('params'), $this->command->getParamsString());
         }
@@ -77,7 +77,7 @@ 
     {
         $parts = array();
         
-        foreach($classes as $class)
+        foreach ($classes as $class)
         {
             $parts[] = 'mailcode-'.$class;
         }

src/Mailcode/Variables/Variable.php

Indentation +18 added lines, -18 removed lines

@@ -32,34 +32,34 @@
     const VALIDATION_ERROR_PATH_UNDERSCORE = 48203;
     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',

Spacing +9 added lines, -9 removed lines

@@ -76,7 +76,7 @@ 
     
     public function getFullName() : string
     {
-        if(empty($this->path))
+        if (empty($this->path))
         {
             return '$'.$this->name;
         }
@@ -101,7 +101,7 @@ 
     
     public function getHash() : string
     {
-        if(empty($this->hash))
+        if (empty($this->hash))
         {
             $this->hash = md5($this->matchedText);
         }
@@ -116,7 +116,7 @@ 
     
     public function getValidationResult() : OperationResult
     {
-        if(isset($this->validationResult))
+        if (isset($this->validationResult))
         {
             return $this->validationResult;
         }
@@ -130,11 +130,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',
@@ -149,7 +149,7 @@ 
             
             $this->$method();
             
-            if(!$this->validationResult->isValid())
+            if (!$this->validationResult->isValid())
             {
                 return;
             }
@@ -178,7 +178,7 @@ 
     
     protected function validateNumber(string $value, int $errorCode) : void
     {
-        if(!is_numeric(substr($value, 0, 1)))
+        if (!is_numeric(substr($value, 0, 1)))
         {
             return;
         }
@@ -196,7 +196,7 @@ 
     protected function validateUnderscore(string $value, int $errorCode) : void
     {
         // allow empty paths
-        if(empty($value))
+        if (empty($value))
         {
             return;
         }
@@ -204,7 +204,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/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()
     {
         $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()
     {
         $entries = array();
@@ -149,19 +149,19 @@ 
         return $this->sortVariables($entries);
     }
     
-   /**
-    * Retrieves all variables, in the order they were addded.
-    * @return \Mailcode\Mailcode_Variables_Variable[]
-    */
+    /**
+     * Retrieves all variables, in the order they were addded.
+     * @return \Mailcode\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();
@@ -179,13 +179,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);
@@ -198,13 +198,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 +11 added lines, -11 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;
         }
@@ -166,11 +166,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;
             }
@@ -209,7 +209,7 @@ 
     {
         $variables = $collection->getGroupedByHash();
         
-        foreach($variables as $variable)
+        foreach ($variables as $variable)
         {
             $this->add($variable);
         }
@@ -221,7 +221,7 @@ 
     {
         $variables = $this->getAll();
         
-        if(!empty($variables))
+        if (!empty($variables))
         {
             return array_shift($variables);
         }