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

Spacing +1 added lines, -1 removed lines

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

src/Mailcode.php

Indentation +27 added lines, -27 removed lines

@@ -26,41 +26,41 @@ 
  */
 class Mailcode
 {
-   /**
-    * @var Mailcode_Parser|NULL
-    */
+    /**
+     * @var Mailcode_Parser|NULL
+     */
     protected $parser = null;
     
-   /**
-    * @var Mailcode_Commands|NULL
-    */
+    /**
+     * @var Mailcode_Commands|NULL
+     */
     protected $commands = 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)) 
@@ -71,12 +71,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)) 

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
     */
     public function getParser() : Mailcode_Parser
     {
-        if(!isset($this->parser)) 
+        if (!isset($this->parser)) 
         {
             $this->parser = new Mailcode_Parser($this);
         }
@@ -79,7 +79,7 @@ 
     */
     public function getCommands() : Mailcode_Commands
     {
-        if(!isset($this->commands)) 
+        if (!isset($this->commands)) 
         {
             $this->commands = new Mailcode_Commands();
         }

src/Mailcode/Commands.php

Indentation +36 added lines, -36 removed lines

@@ -23,16 +23,16 @@ 
 {
     const ERROR_COMMAND_NAME_DOES_NOT_EXIST = 45901;
     
-   /**
-    * @var Mailcode_Commands_Command[]
-    */
+    /**
+     * @var Mailcode_Commands_Command[]
+     */
     private $commands = array();
     
-   /**
-    * Retrieves a list of all available command IDs.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all available command IDs.
+     * 
+     * @return string[]
+     */
     public function getIDs() : array
     {
         static $ids = array();
@@ -45,13 +45,13 @@ 
         return $ids;
     }
     
-   /**
-    * Retrieves a list of all available commands, sorted by label.
-    * 
-    * NOTE: These instances are only used for information purposes.
-    * 
-    * @return Mailcode_Commands_Command[]
-    */
+    /**
+     * Retrieves a list of all available commands, sorted by label.
+     * 
+     * NOTE: These instances are only used for information purposes.
+     * 
+     * @return Mailcode_Commands_Command[]
+     */
     public function getAll()
     {
         if(!empty($this->commands)) {
@@ -77,12 +77,12 @@ 
         return $result;
     }
     
-   /**
-    * Gets an available command by its ID.
-    * 
-    * @param string $id
-    * @return Mailcode_Commands_Command
-    */
+    /**
+     * Gets an available command by its ID.
+     * 
+     * @param string $id
+     * @return Mailcode_Commands_Command
+     */
     public function getByID(string $id) : Mailcode_Commands_Command
     {
         static $instances = array();
@@ -95,15 +95,15 @@ 
         return $instances[$id];
     }
     
-   /**
-    * Retrieves the ID of a command by its name.
-    * 
-    * @param string $name
-    * @throws Mailcode_Exception
-    * @return string
-    * 
-    * @see Mailcode_Commands::ERROR_COMMAND_NAME_DOES_NOT_EXIST
-    */
+    /**
+     * Retrieves the ID of a command by its name.
+     * 
+     * @param string $name
+     * @throws Mailcode_Exception
+     * @return string
+     * 
+     * @see Mailcode_Commands::ERROR_COMMAND_NAME_DOES_NOT_EXIST
+     */
     public function getIDByName(string $name) : string
     {
         $items = $this->getAll();
@@ -132,12 +132,12 @@ 
         return in_array($id, $ids);
     }
     
-   /**
-    * Checks wether the specified name exists.
-    * 
-    * @param string $name For example: "showvar".
-    * @return bool
-    */
+    /**
+     * Checks wether the specified name exists.
+     * 
+     * @param string $name For example: "showvar".
+     * @return bool
+     */
     public function nameExists(string $name) : bool
     {
         $items = $this->getAll();

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
     {
         static $ids = array();
         
-        if(empty($ids)) {
+        if (empty($ids)) {
             $ids = \AppUtils\FileHelper::createFileFinder(__DIR__.'/Commands/Command')
             ->getPHPClassNames();
         }
@@ -54,7 +54,7 @@ 
     */
     public function getAll()
     {
-        if(!empty($this->commands)) {
+        if (!empty($this->commands)) {
             return $this->commands;
         }
         
@@ -62,7 +62,7 @@ 
         
         $result = array();
         
-        foreach($ids as $id) 
+        foreach ($ids as $id) 
         {
             $result[] = $this->getByID($id);
         }
@@ -87,7 +87,7 @@ 
     {
         static $instances = array();
         
-        if(!isset($instances[$id])) 
+        if (!isset($instances[$id])) 
         {
             $instances[$id] = $this->createCommand($id, '__dummy', '', '');
         }
@@ -108,9 +108,9 @@ 
     {
         $items = $this->getAll();
         
-        foreach($items as $item) 
+        foreach ($items as $item) 
         {
-            if($item->getName() === $name) {
+            if ($item->getName() === $name) {
                 return $item->getID();
             }
         }
@@ -142,9 +142,9 @@ 
     {
         $items = $this->getAll();
         
-        foreach($items as $item)
+        foreach ($items as $item)
         {
-            if($item->getName() === $name) {
+            if ($item->getName() === $name) {
                 return true;
             }
         }

src/Mailcode/Collection.php

Indentation +28 added lines, -28 removed lines

@@ -20,9 +20,9 @@ 
  */
 class Mailcode_Collection
 {
-   /**
-    * @var Mailcode_Commands_Command[]
-    */
+    /**
+     * @var Mailcode_Commands_Command[]
+     */
     protected $commands = array();
     
     /**
@@ -30,12 +30,12 @@ 
      */
     protected $errors = array();
     
-   /**
-    * Adds a command to the collection.
-    * 
-    * @param Mailcode_Commands_Command $command
-    * @return Mailcode_Collection
-    */
+    /**
+     * Adds a command to the collection.
+     * 
+     * @param Mailcode_Commands_Command $command
+     * @return Mailcode_Collection
+     */
     public function addCommand(Mailcode_Commands_Command $command) : Mailcode_Collection
     {
         $hash = $command->getHash();
@@ -47,21 +47,21 @@ 
         return $this;
     }
     
-   /**
-    * Whether there are any commands in the collection.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether there are any commands in the collection.
+     * 
+     * @return bool
+     */
     public function hasCommands() : bool
     {
         return !empty($this->commands);
     }
     
-   /**
-    * Counts the amount of commands in the collection.
-    * 
-    * @return int
-    */
+    /**
+     * Counts the amount of commands in the collection.
+     * 
+     * @return int
+     */
     public function countCommands() : int
     {
         return count($this->commands);
@@ -81,9 +81,9 @@ 
         $this->errors[] = new Mailcode_Collection_Error_Command($command);
     }
     
-   /**
-    * @return Mailcode_Collection_Error[]
-    */
+    /**
+     * @return Mailcode_Collection_Error[]
+     */
     public function getErrors()
     {
         return $this->errors;
@@ -94,13 +94,13 @@ 
         return empty($this->errors);
     }
     
-   /**
-    * Retrieves all commands that were detected.
-    * 
-    * @return \Mailcode\Mailcode_Commands_Command[]
-    */
+    /**
+     * Retrieves all commands that were detected.
+     * 
+     * @return \Mailcode\Mailcode_Commands_Command[]
+     */
     public function getCommands()
     {
-       return $this->commands;
+        return $this->commands;
     }
 }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     {
         $hash = $command->getHash();
         
-        if(!isset($this->commands[$hash])) {
+        if (!isset($this->commands[$hash])) {
             $this->commands[$hash] = $command;
         }
         

src/Mailcode/Parser/Safeguard/Placeholder.php

Indentation +12 added lines, -12 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)

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

src/Mailcode/Commands/Command.php

Indentation +31 added lines, -31 removed lines

@@ -32,29 +32,29 @@ 
     
     const VALIDATION_UNKNOWN_COMMAND_NAME = 4;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type = '';
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $paramsString = '';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $matchedText = '';
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $hash = '';
     
-   /**
-    * @var \AppUtils\OperationResult
-    */
+    /**
+     * @var \AppUtils\OperationResult
+     */
     protected $validationResult = null;
     
     public function __construct(string $type='', string $paramsString='', string $matchedText='')
@@ -64,33 +64,33 @@ 
         $this->matchedText = $matchedText;
     }
     
-   /**
-    * @return string The ID of the command = the name of the command class file.
-    */
+    /**
+     * @return string The ID of the command = the name of the command class file.
+     */
     public function getID() : string
     {
         $tokens = explode('_', get_class($this));
         return array_pop($tokens);
     }
     
-   /**
-    * Checks whether this is a dummy command, which is only
-    * used to access information on the command type. It cannot
-    * be used as an actual live command.
-    * 
-    * @return bool
-    */
+    /**
+     * Checks whether this is a dummy command, which is only
+     * used to access information on the command type. It cannot
+     * be used as an actual live command.
+     * 
+     * @return bool
+     */
     public function isDummy() : bool
     {
         return $this->type === '__dummy';
     }
     
-   /**
-    * Retrieves a hash of the actual matched command string,
-    * which is used in collections to detect duplicate commands.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves a hash of the actual matched command string,
+     * which is used in collections to detect duplicate commands.
+     * 
+     * @return string
+     */
     public function getHash() : string
     {
         $this->requireNonDummy();

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
     */
     protected $validationResult = null;
     
-    public function __construct(string $type='', string $paramsString='', string $matchedText='')
+    public function __construct(string $type = '', string $paramsString = '', string $matchedText = '')
     {
         $this->type = $type;
         $this->paramsString = $paramsString;
@@ -95,7 +95,7 @@ 
     {
         $this->requireNonDummy();
         
-        if($this->hash === '') {
+        if ($this->hash === '') {
             $this->hash = md5($this->matchedText);
         }
         
@@ -104,7 +104,7 @@ 
     
     protected function requireNonDummy() : void
     {
-        if(!$this->isDummy())
+        if (!$this->isDummy())
         {
             return;
         }
@@ -125,7 +125,7 @@ 
     {
         $this->requireNonDummy();
         
-        if(isset($this->validationResult)) 
+        if (isset($this->validationResult)) 
         {
             return $this->validationResult;
         }
@@ -141,7 +141,7 @@ 
     
     public function getValidationResult() :  \AppUtils\OperationResult
     {
-        if(isset($this->validationResult)) 
+        if (isset($this->validationResult)) 
         {
             return $this->validationResult;
         }
@@ -155,7 +155,7 @@ 
     
     protected function validateSyntax()
     {
-        if($this->requiresParameters() && empty($this->paramsString))
+        if ($this->requiresParameters() && empty($this->paramsString))
         {
             $this->validationResult->makeError(
                 t('Parameters have to be specified.'),
@@ -164,11 +164,11 @@ 
             return;
         }
         
-        if($this->supportsType() && !empty($this->type))
+        if ($this->supportsType() && !empty($this->type))
         {
             $types = $this->getSupportedTypes();
 
-            if(!in_array($this->type, $types))
+            if (!in_array($this->type, $types))
             {
                 $this->validationResult->makeError(
                     t('The command addon %1$s is not supported.', $this->type).' '.
@@ -180,7 +180,7 @@ 
             }
         }
         
-        if(!$this->supportsType() && !empty($this->type))
+        if (!$this->supportsType() && !empty($this->type))
         {
             $this->validationResult->makeError(
                 t('Command addons are not supported (the %1$s part).', $this->type),

src/Mailcode/Parser.php

Indentation +43 added lines, -43 removed lines

@@ -26,14 +26,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)
@@ -42,24 +42,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();
@@ -79,14 +79,14 @@ 
         return $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
-    */
+    /**
+     * 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();
@@ -117,14 +117,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"
@@ -162,14 +162,14 @@ 
         );
     }
     
-   /**
-    * 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);

Spacing +6 added lines, -6 removed lines

@@ -69,7 +69,7 @@ 
         
         $total = count($matches[0]);
         
-        for($i=0; $i < $total; $i++)
+        for ($i = 0; $i < $total; $i++)
         {
             $match = $this->parseMatch($matches, $i);
             
@@ -91,7 +91,7 @@ 
     {
         $name = $match->getName();
         
-        if(!$this->commands->nameExists($name))
+        if (!$this->commands->nameExists($name))
         {
             $collection->addErrorMessage(
                 $match->getMatchedString(),
@@ -108,7 +108,7 @@ 
             $match->getMatchedString()
         );
         
-        if($cmd->isValid())
+        if ($cmd->isValid())
         {
             $collection->addCommand($cmd);
             return;
@@ -138,16 +138,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];

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

src/Mailcode/Parser/Safeguard.php

Indentation +81 added lines, -81 removed lines

@@ -55,40 +55,40 @@ 
     
     const ERROR_EMPTY_DELIMITER = 47803;
     
-   /**
-    * @var Mailcode_Parser
-    */
+    /**
+     * @var Mailcode_Parser
+     */
     protected $parser;
     
-   /**
-    * @var Mailcode_Collection
-    */
+    /**
+     * @var Mailcode_Collection
+     */
     protected $commands;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $originalString;
     
-   /**
-    * @var Mailcode_Collection
-    */
+    /**
+     * @var Mailcode_Collection
+     */
     protected $collection;
     
-   /**
-    * Counter for the placeholders, global for all placeholders.
-    * @var integer
-    */
+    /**
+     * Counter for the placeholders, global for all placeholders.
+     * @var integer
+     */
     private static $counter = 0;
     
-   /**
-    * @var Mailcode_Parser_Safeguard_Placeholder[]
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard_Placeholder[]
+     */
     protected $placeholders;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $delimiter = '__';
     
     public function __construct(Mailcode_Parser $parser, string $subject)
@@ -97,15 +97,15 @@ 
         $this->originalString = $subject;
     }
     
-   /**
-    * Sets the delimiter character sequence used to prepend
-    * and append to the placeholders.
-    * 
-    * The delimiter's default is "__" (two underscores).
-    * 
-    * @param string $delimiter
-    * @return Mailcode_Parser_Safeguard
-    */
+    /**
+     * Sets the delimiter character sequence used to prepend
+     * and append to the placeholders.
+     * 
+     * The delimiter's default is "__" (two underscores).
+     * 
+     * @param string $delimiter
+     * @return Mailcode_Parser_Safeguard
+     */
     public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard
     {
         if(empty($delimiter))
@@ -127,15 +127,15 @@ 
         return $this->delimiter;
     }
     
-   /**
-    * Retrieves the safe string in which all commands have been replaced
-    * by placeholder strings.
-    * 
-    * @return string
-    * @throws Mailcode_Exception 
-    *
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    */
+    /**
+     * Retrieves the safe string in which all commands have been replaced
+     * by placeholder strings.
+     * 
+     * @return string
+     * @throws Mailcode_Exception 
+     *
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     */
     public function makeSafe() : string
     {
         $this->requireValidCollection();
@@ -171,12 +171,12 @@ 
     }
     
     
-   /**
-    * Retrieves all placeholders that have to be added to
-    * the subject text.
-    * 
-    * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[]
-    */
+    /**
+     * Retrieves all placeholders that have to be added to
+     * the subject text.
+     * 
+     * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[]
+     */
     public function getPlaceholders()
     {
         if(isset($this->placeholders))
@@ -228,46 +228,46 @@ 
         return str_replace($placeholderStrings, array_values($replaces), $string);
     }
     
-   /**
-    * Makes the string whole again after transforming or filtering it,
-    * by replacing the command placeholders with the original commands.
-    *
-    * @param string $string
-    * @return string
-    * @throws Mailcode_Exception
-    *
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING
-    */
+    /**
+     * Makes the string whole again after transforming or filtering it,
+     * by replacing the command placeholders with the original commands.
+     *
+     * @param string $string
+     * @return string
+     * @throws Mailcode_Exception
+     *
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING
+     */
     public function makeWhole(string $string) : string
     {
         return $this->restore($string, false);
     }
 
-   /**
-    * Like makeWhole(), but replaces the commands with a syntax
-    * highlighted version, meant for human readable texts only.
-    * 
-    * Note: the commands lose their functionality (They cannot be 
-    * parsed from that string again).
-    *
-    * @param string $string
-    * @return string
-    * @throws Mailcode_Exception
-    *
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING
-    */
+    /**
+     * Like makeWhole(), but replaces the commands with a syntax
+     * highlighted version, meant for human readable texts only.
+     * 
+     * Note: the commands lose their functionality (They cannot be 
+     * parsed from that string again).
+     *
+     * @param string $string
+     * @return string
+     * @throws Mailcode_Exception
+     *
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     * @see Mailcode_Parser_Safeguard::ERROR_COMMAND_PLACEHOLDER_MISSING
+     */
     public function makeHighlighted(string $string) : string
     {
         return $this->restore($string, true);
     }
     
-   /**
-    * Retrieves the commands collection contained in the string.
-    * 
-    * @return Mailcode_Collection
-    */
+    /**
+     * Retrieves the commands collection contained in the string.
+     * 
+     * @return Mailcode_Collection
+     */
     public function getCollection() : Mailcode_Collection
     {
         if(isset($this->collection))
@@ -285,11 +285,11 @@ 
         return $this->getCollection()->isValid();
     }
     
-   /**
-    * @throws Mailcode_Exception
-    * 
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    */
+    /**
+     * @throws Mailcode_Exception
+     * 
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     */
     protected function requireValidCollection() : void
     {
         if($this->getCollection()->isValid())

Spacing +11 added lines, -11 removed lines

@@ -108,7 +108,7 @@ 
     */
     public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard
     {
-        if(empty($delimiter))
+        if (empty($delimiter))
         {
             throw new Mailcode_Exception(
                 'Empty delimiter',
@@ -145,17 +145,17 @@ 
         return str_replace(array_values($replaces), array_keys($replaces), $this->originalString);
     }
     
-    protected function getReplaces(bool $highlighted=false) : array
+    protected function getReplaces(bool $highlighted = false) : array
     {
         $placeholders = $this->getPlaceholders();
         
         $replaces = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $replace = '';
             
-            if($highlighted)
+            if ($highlighted)
             {
                 $replace = $placeholder->getHighlightedText();
             }
@@ -179,7 +179,7 @@ 
     */
     public function getPlaceholders()
     {
-        if(isset($this->placeholders))
+        if (isset($this->placeholders))
         {
             return $this->placeholders;
         }
@@ -188,7 +188,7 @@ 
         
         $cmds = $this->getCollection()->getCommands();
         
-        foreach($cmds as $command)
+        foreach ($cmds as $command)
         {
             self::$counter++;
             
@@ -202,7 +202,7 @@ 
         return $this->placeholders;
     }
     
-    protected function restore(string $string, bool $highlighted=false) : string
+    protected function restore(string $string, bool $highlighted = false) : string
     {
         $this->requireValidCollection();
         
@@ -210,9 +210,9 @@ 
         
         $placeholderStrings = array_keys($replaces);
         
-        foreach($placeholderStrings as $search)
+        foreach ($placeholderStrings as $search)
         {
-            if(!strstr($string, $search))
+            if (!strstr($string, $search))
             {
                 throw new Mailcode_Exception(
                     'Command placeholder not found',
@@ -270,7 +270,7 @@ 
     */
     public function getCollection() : Mailcode_Collection
     {
-        if(isset($this->collection))
+        if (isset($this->collection))
         {
             return $this->collection;
         }
@@ -292,7 +292,7 @@ 
     */
     protected function requireValidCollection() : void
     {
-        if($this->getCollection()->isValid())
+        if ($this->getCollection()->isValid())
         {
             return;
         }

Braces +1 added lines, -2 removed lines

@@ -158,8 +158,7 @@
             if($highlighted)
             {
                 $replace = $placeholder->getHighlightedText();
-            }
-            else 
+            } else 
             {
                 $replace = $placeholder->getOriginalText();
             }