Mistralys / mailcode

localization/index.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     $autoload = realpath($root.'/../vendor/autoload.php');
     
     // we need the autoloader to be present
-    if($autoload === false) 
+    if ($autoload === false) 
     {
         die('<b>ERROR:</b> Autoloader not present. Run composer update first.');
     }

src/Mailcode/Parser/Safeguard/Placeholder.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
     
     public function getReplacementText() : string
     {
-        if(!empty($this->replacement))
+        if (!empty($this->replacement))
         {
             return $this->replacement;
         }
@@ -82,13 +82,13 @@ 
         // to total amount of zeroes to pad with to obtain the total length
         $padLength = $this->getLength() - $length;
         
-        if($padLength < 0) 
+        if ($padLength < 0) 
         {
             $padLength = 0;
         }
         
         // create the zero-padded ID to fill the format string with 
-        $paddedID  = str_pad((string)$this->id, $padLength, '0');
+        $paddedID = str_pad((string)$this->id, $padLength, '0');
         
         $this->replacement = sprintf($format, $paddedID);
         

Indentation +24 added lines, -24 removed lines

@@ -25,24 +25,24 @@ 
 {
     const ERROR_PLACEHOLDER_TOO_LONG = 47901;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $id;
     
-   /**
-    * @var Mailcode_Parser_Safeguard
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard
+     */
     protected $safeguard;
 
-   /**
-    * @var Mailcode_Commands_Command
-    */
+    /**
+     * @var Mailcode_Commands_Command
+     */
     protected $command;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $replacement = '';
     
     public function __construct(int $id, Mailcode_Commands_Command $command, Mailcode_Parser_Safeguard $safeguard)
@@ -115,18 +115,18 @@ 
         return $this->command;
     }
     
-   /**
-    * Serializes the placeholder's information into 
-    * an array with the following keys:
-    * 
-    *   - originalText
-    *   - replacementText
-    *   - normalizedText
-    *   - length
-    *   - id
-    * 
-    * @return array<string,string|integer>
-    */
+    /**
+     * Serializes the placeholder's information into 
+     * an array with the following keys:
+     * 
+     *   - originalText
+     *   - replacementText
+     *   - normalizedText
+     *   - length
+     *   - id
+     * 
+     * @return array<string,string|integer>
+     */
     public function serialize() : array
     {
         return array(

src/Mailcode/Parser.php

Braces +2 added lines, -4 removed lines

@@ -141,13 +141,11 @@
         if(!empty($matches[1][$index]))
         {
             $name = $matches[1][$index];
-        }
-        else if(!empty($matches[2][$index]))
+        } else if(!empty($matches[2][$index]))
         {
             $name = $matches[2][$index];
             $params = $matches[3][$index];
-        }
-        else if(!empty($matches[4][$index]))
+        } else if(!empty($matches[4][$index]))
         {
             $name = $matches[4][$index];
             $type = $matches[5][$index];

Spacing +7 added lines, -7 removed lines

@@ -73,7 +73,7 @@ 
         
         $total = count($matches[0]);
         
-        for($i=0; $i < $total; $i++)
+        for ($i = 0; $i < $total; $i++)
         {
             $match = $this->parseMatch($matches, $i);
             
@@ -85,7 +85,7 @@ 
     
     protected function prepareString(string $subject) : string
     {
-        if(!ConvertHelper::isStringHTML($subject))
+        if (!ConvertHelper::isStringHTML($subject))
         {
             return $subject;
         }
@@ -106,7 +106,7 @@ 
     {
         $name = $match->getName();
         
-        if(!$this->commands->nameExists($name))
+        if (!$this->commands->nameExists($name))
         {
             $collection->addErrorMessage(
                 $match->getMatchedString(),
@@ -123,7 +123,7 @@ 
             $match->getMatchedString()
         );
         
-        if($cmd->isValid())
+        if ($cmd->isValid())
         {
             $collection->addCommand($cmd);
             return;
@@ -153,16 +153,16 @@ 
         // 5 = parameter type command, type
         // 6 = parameter type command, params
         
-        if(!empty($matches[1][$index]))
+        if (!empty($matches[1][$index]))
         {
             $name = $matches[1][$index];
         }
-        else if(!empty($matches[2][$index]))
+        else if (!empty($matches[2][$index]))
         {
             $name = $matches[2][$index];
             $params = $matches[3][$index];
         }
-        else if(!empty($matches[4][$index]))
+        else if (!empty($matches[4][$index]))
         {
             $name = $matches[4][$index];
             $type = $matches[5][$index];

Indentation +50 added lines, -50 removed lines

@@ -28,14 +28,14 @@ 
         '{\s*([a-z]+)\s+([a-z-]+)\s*:([^}]*)}'
     );
     
-   /**
-    * @var Mailcode
-    */
+    /**
+     * @var Mailcode
+     */
     protected $mailcode;
     
-   /**
-    * @var Mailcode_Commands
-    */
+    /**
+     * @var Mailcode_Commands
+     */
     protected $commands;
     
     public function __construct(Mailcode $mailcode)
@@ -44,24 +44,24 @@ 
         $this->commands = $this->mailcode->getCommands();
     }
     
-   /**
-    * Gets the regex format string used to detect commands.
-    * 
-    * @return string
-    */
+    /**
+     * Gets the regex format string used to detect commands.
+     * 
+     * @return string
+     */
     protected static function getRegex() : string
     {
         return '/'.implode('|', self::COMMAND_REGEX_PARTS).'/sixU';
     }
     
-   /**
-    * Parses a string to detect all commands within. Returns a
-    * collection instance that contains information on all the 
-    * commands.
-    * 
-    * @param string $string
-    * @return Mailcode_Collection A collection with all unique commands found.
-    */
+    /**
+     * Parses a string to detect all commands within. Returns a
+     * collection instance that contains information on all the 
+     * commands.
+     * 
+     * @param string $string
+     * @return Mailcode_Collection A collection with all unique commands found.
+     */
     public function parseString(string $string) : Mailcode_Collection
     {
         $collection = new Mailcode_Collection();
@@ -94,14 +94,14 @@ 
         return preg_replace('%<style\b[^>]*>(.*?)</style>%six', '', $subject);
     }
     
-   /**
-    * Processes a single match found in the string: creates the command,
-    * and adds it to the collection if it's a valid command, or to the list
-    * of invalid commands otherwise.
-    * 
-    * @param Mailcode_Parser_Match $match
-    * @param Mailcode_Collection $collection
-    */
+    /**
+     * Processes a single match found in the string: creates the command,
+     * and adds it to the collection if it's a valid command, or to the list
+     * of invalid commands otherwise.
+     * 
+     * @param Mailcode_Parser_Match $match
+     * @param Mailcode_Collection $collection
+     */
     protected function processMatch(Mailcode_Parser_Match $match, Mailcode_Collection $collection) : void
     {
         $name = $match->getName();
@@ -132,14 +132,14 @@ 
         $collection->addInvalidCommand($cmd);
     }
     
-   /**
-    * Parses a single regex match: determines which named group
-    * matches, and retrieves the according information.
-    * 
-    * @param array[] $matches The regex results array.
-    * @param int $index The matched index.
-    * @return Mailcode_Parser_Match
-    */
+    /**
+     * Parses a single regex match: determines which named group
+     * matches, and retrieves the according information.
+     * 
+     * @param array[] $matches The regex results array.
+     * @param int $index The matched index.
+     * @return Mailcode_Parser_Match
+     */
     protected function parseMatch(array $matches, int $index) : Mailcode_Parser_Match
     {
         $name = ''; // the command name, e.g. "showvar"
@@ -177,26 +177,26 @@ 
         );
     }
     
-   /**
-    * Creates an instance of the safeguard tool, which
-    * is used to safeguard commands in a string with placeholders.
-    * 
-    * @param string $subject The string to use to safeguard commands in.
-    * @return Mailcode_Parser_Safeguard
-    * @see Mailcode_Parser_Safeguard
-    */
+    /**
+     * Creates an instance of the safeguard tool, which
+     * is used to safeguard commands in a string with placeholders.
+     * 
+     * @param string $subject The string to use to safeguard commands in.
+     * @return Mailcode_Parser_Safeguard
+     * @see Mailcode_Parser_Safeguard
+     */
     public function createSafeguard(string $subject) : Mailcode_Parser_Safeguard
     {
         return new Mailcode_Parser_Safeguard($this, $subject);
     }
     
-   /**
-    * Creates a statement parser, which is used to validate arbitrary
-    * command statements.
-    * 
-    * @param string $statement
-    * @return Mailcode_Parser_Statement
-    */
+    /**
+     * Creates a statement parser, which is used to validate arbitrary
+     * command statements.
+     * 
+     * @param string $statement
+     * @return Mailcode_Parser_Statement
+     */
     public function createStatement(string $statement) : Mailcode_Parser_Statement
     {
         return new Mailcode_Parser_Statement($statement);

src/Mailcode/Variables/Collection/Regular.php

Indentation +17 added lines, -17 removed lines

@@ -20,9 +20,9 @@ 
  */
 class Mailcode_Variables_Collection_Regular extends Mailcode_Variables_Collection
 {
-   /**
-    * @var Mailcode_Variables_Collection_Invalid
-    */
+    /**
+     * @var Mailcode_Variables_Collection_Invalid
+     */
     protected $invalid;
 
     protected function init() : void
@@ -47,30 +47,30 @@ 
         return $this;
     }
 
-   /**
-    * Whether any of the variables in the collection are invalid.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether any of the variables in the collection are invalid.
+     * 
+     * @return bool
+     */
     public function hasInvalid() : bool
     {
         return isset($this->invalid) && $this->invalid->hasVariables();
     }
     
-   /**
-    * Retrieves the collection of invalid variables, if any.
-    * Behaves like a variables collection.
-    * 
-    * @return Mailcode_Variables_Collection_Invalid
-    */
+    /**
+     * Retrieves the collection of invalid variables, if any.
+     * Behaves like a variables collection.
+     * 
+     * @return Mailcode_Variables_Collection_Invalid
+     */
     public function getInvalid() : Mailcode_Variables_Collection_Invalid
     {
         return $this->invalid;
     }
     
-   /**
-    * @return Mailcode_Variables_Collection_Regular
-    */
+    /**
+     * @return Mailcode_Variables_Collection_Regular
+     */
     public function mergeWith(Mailcode_Variables_Collection $collection) : Mailcode_Variables_Collection
     {
         parent::mergeWith($collection);

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
     
     public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection
     {
-        if(!$variable->isValid())
+        if (!$variable->isValid())
         {
             return $this->addInvalid($variable);
         }
@@ -76,7 +76,7 @@ 
         parent::mergeWith($collection);
         
         // also inherit any invalid variables
-        if($collection instanceof Mailcode_Variables_Collection_Regular)
+        if ($collection instanceof Mailcode_Variables_Collection_Regular)
         {
             $invalid = $collection->getInvalid();
             

src/Mailcode/Variables/Collection/Invalid.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 {
     public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection
     {
-        if($variable->isValid())
+        if ($variable->isValid())
         {
             return $this;
         }

src/functions.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  */
 function init() : void
 {
-    if(!class_exists('\AppLocalize\Localization')) {
+    if (!class_exists('\AppLocalize\Localization')) {
         return;
     }
     

src/Mailcode/Collection/Error.php

Indentation +9 added lines, -9 removed lines

@@ -20,19 +20,19 @@
  */
 abstract class Mailcode_Collection_Error
 {
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     protected $code = 0;
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $matchedText = '';
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $message = '';
     
     public function getCode() : int

src/Mailcode/Collection/NestingValidator.php

Spacing +10 added lines, -10 removed lines

@@ -60,11 +60,11 @@ 
         
         $commands = $this->collection->getCommands();
         
-        foreach($commands as $command)
+        foreach ($commands as $command)
         {
             $method = 'validate_'.$command->getCommandType();
             
-            if(!method_exists($this, $method))
+            if (!method_exists($this, $method))
             {
                 throw new Mailcode_Exception(
                     'Unknown command type validation method.',
@@ -79,13 +79,13 @@ 
             
             $this->$method($command);
             
-            if(!$this->validationResult->isValid())
+            if (!$this->validationResult->isValid())
             {
                 break;
             }
         }
         
-        if($this->validationResult->isValid())
+        if ($this->validationResult->isValid())
         {
             $this->validate_Unclosed();
         }
@@ -97,7 +97,7 @@ 
     {
         $leftover = $this->getOpenCommand();
         
-        if($leftover === null)
+        if ($leftover === null)
         {
             return;
         }
@@ -113,7 +113,7 @@ 
     
     protected function getOpenCommand() : ?Mailcode_Commands_Command_Type_Opening
     {
-        if(empty($this->stack))
+        if (empty($this->stack))
         {
             return null;
         }
@@ -124,7 +124,7 @@ 
         
         $cmd = $this->stack[$idx];
         
-        if($cmd instanceof Mailcode_Commands_Command_Type_Opening)
+        if ($cmd instanceof Mailcode_Commands_Command_Type_Opening)
         {
             return $cmd;
         }
@@ -148,7 +148,7 @@ 
     {
         $parent = $this->getOpenCommand();
         
-        if($parent === null)
+        if ($parent === null)
         {
             $this->validationResult->makeError(
                 t(
@@ -162,7 +162,7 @@ 
             return;
         }
         
-        if($parent->getName() !== $command->getParentName())
+        if ($parent->getName() !== $command->getParentName())
         {
             $this->validationResult->makeError(
                 t(
@@ -181,7 +181,7 @@ 
     
     protected function validate_Closing(Mailcode_Commands_Command_Type_Closing $command) : void
     {
-        if(empty($this->stack))
+        if (empty($this->stack))
         {
             $this->validationResult->makeError(
                 t('All open commands have already been ended.'),

Indentation +9 added lines, -9 removed lines

@@ -29,19 +29,19 @@
     const VALIDATION_COMMANDS_ALREADY_CLOSED = 49103;
     const VALIDATION_UNCLOSED_COMMAND = 49104;
     
-   /**
-    * @var Mailcode_Collection
-    */
+    /**
+     * @var Mailcode_Collection
+     */
     protected $collection;
     
-   /**
-    * @var OperationResult
-    */
+    /**
+     * @var OperationResult
+     */
     protected $validationResult;
     
-   /**
-    * @var Mailcode_Commands_Command_Type[]
-    */
+    /**
+     * @var Mailcode_Commands_Command_Type[]
+     */
     protected $stack = array();
     
     public function __construct(Mailcode_Collection $collection)

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