Mistralys / mailcode

src/Mailcode/Parser/Safeguard/Formatter/Type/SingleLines.php

Indentation +6 added lines, -6 removed lines

@@ -23,14 +23,14 @@
  */
 class Mailcode_Parser_Safeguard_Formatter_Type_SingleLines extends Mailcode_Parser_Safeguard_Formatter_FormatType
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $eol;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     private $eolLength;
     
     protected function initFormatting() : void

src/Mailcode/Parser/Safeguard/Formatter/Type/SingleLines/Location.php

Indentation +6 added lines, -6 removed lines

@@ -25,14 +25,14 @@
  */
 class Mailcode_Parser_Safeguard_Formatter_Type_SingleLines_Location extends Mailcode_Parser_Safeguard_Formatter_Location
 {
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $eolLength;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $eol;
     
     protected function init() : void

Spacing +8 added lines, -8 removed lines

@@ -55,7 +55,7 @@ 
         $position = $this->getStartPosition();
         
         // we're at the beginning of the string
-        if($position === false || $position === 0)
+        if ($position === false || $position === 0)
         {
             $this->log(sprintf(
                 'Prepend: NO | Position: [%s] | Not found, or at beginning of string.', 
@@ -67,7 +67,7 @@ 
         
         $prevPos = $position - $this->eolLength;
         
-        if($prevPos < 0)
+        if ($prevPos < 0)
         {
             $prevPos = 0;
         }
@@ -77,7 +77,7 @@ 
     
     protected function checkPreviousPosition(int $prevPos) : void
     {
-        if($this->isWithinCommand($prevPos))
+        if ($this->isWithinCommand($prevPos))
         {
             $this->log(sprintf(
                 'Prepend: NO | Position: [%s] | Is within a mailcode command.', 
@@ -89,7 +89,7 @@ 
         
         $match = $this->subject->getSubstr($prevPos, $this->eolLength);
         
-        if($match !== $this->formatter->getEOLChar())
+        if ($match !== $this->formatter->getEOLChar())
         {
             $this->log(sprintf(
                 'Prepend: YES | Position: [%s] | Characters: [%s] | Do not match the EOL character.',
@@ -108,7 +108,7 @@ 
         $position = $this->getEndPosition();
         
         // we're at the end of the string
-        if($position === false || $position >= $subjectLength)
+        if ($position === false || $position >= $subjectLength)
         {
             $this->log(sprintf(
                 'Append: NO | Position: [%s] | End of string, or too long | Subject length: [%s]',
@@ -121,7 +121,7 @@ 
         
         $nextPos = $position + $this->eolLength;
         
-        if($nextPos > $subjectLength)
+        if ($nextPos > $subjectLength)
         {
             $nextPos = $subjectLength - $this->eolLength;
         }
@@ -131,7 +131,7 @@ 
     
     protected function checkNextPosition(int $nextPos) : void
     {
-        if($this->isWithinCommand($nextPos))
+        if ($this->isWithinCommand($nextPos))
         {
             $this->log(sprintf(
                 'Append: YES | Position: [%s] | Is within a mailcode command.',
@@ -145,7 +145,7 @@ 
         
         $next = $this->subject->getSubstr($nextPos, $this->eolLength);
         
-        if($next !== $this->formatter->getEOLChar())
+        if ($next !== $this->formatter->getEOLChar())
         {
             $this->log(sprintf(
                 'Append: YES | Position: [%s] | Next characters: [%s] | Do not match the EOL character.',

src/Mailcode/Parser/Safeguard/Formatter/Type/MarkVariables/Location.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     
     public function requiresAdjustment(): bool
     {
-        if(!parent::requiresAdjustment())
+        if (!parent::requiresAdjustment())
         {
             return false;
         }

src/Mailcode/Parser/Safeguard/Formatter/Type/HTMLHighlighting/Location.php

Braces +1 added lines, -2 removed lines

@@ -119,8 +119,7 @@
             if($closing)
             {
                 array_pop($stack);
-            }
-            else
+            } else
             {
                 $stack[] = $tagName;
             }

Indentation +36 added lines, -36 removed lines

@@ -24,14 +24,14 @@ 
 {
     const COMMAND_MARKER = '__MAILCODE_COMMAND__';
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     private $ancestryChecked = false;
     
-   /**
-    * @var array<int,array<int,string>>
-    */
+    /**
+     * @var array<int,array<int,string>>
+     */
     private $tagAncestry = array();
     
     protected function init() : void
@@ -43,12 +43,12 @@ 
         return !$this->isInTagAttributes() && !$this->isInExcludedTag();
     }
     
-   /**
-    * Retrieves the part of the subject string that comes
-    * before the command.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the part of the subject string that comes
+     * before the command.
+     * 
+     * @return string
+     */
     private function getHaystackBefore() : string
     {
         $pos = $this->getStartPosition();
@@ -65,12 +65,12 @@ 
         return $this->subject->getSubstr(0, $pos).self::COMMAND_MARKER.'>';
     }
     
-   /**
-    * Whether the command is nested in one of the tags
-    * that have been added to the list of excluded tags.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the command is nested in one of the tags
+     * that have been added to the list of excluded tags.
+     * 
+     * @return bool
+     */
     protected function isInExcludedTag() : bool
     {
         $tagNames = $this->getParentTags();
@@ -86,12 +86,12 @@ 
         return false;
     }
     
-   /**
-    * Retrieves a list of the command's parent HTML tags, from
-    * highest to lowest.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of the command's parent HTML tags, from
+     * highest to lowest.
+     * 
+     * @return string[]
+     */
     private function getParentTags() : array
     {
         $tags = $this->getTagAncestry();
@@ -116,12 +116,12 @@ 
         return $stack;
     }
     
-   /**
-    * Checks whether the command is located within the attributes
-    * of an HTML tag.
-    * 
-    * @return bool
-    */
+    /**
+     * Checks whether the command is located within the attributes
+     * of an HTML tag.
+     * 
+     * @return bool
+     */
     protected function isInTagAttributes() : bool
     {
         $tags = $this->getTagAncestry();
@@ -139,12 +139,12 @@ 
         return false;
     }
     
-   /**
-    * Retrieves a list of tag names that come as parents 
-    * above the command.
-    * 
-    * @return array<int,array<int,string>>
-    */
+    /**
+     * Retrieves a list of tag names that come as parents 
+     * above the command.
+     * 
+     * @return array<int,array<int,string>>
+     */
     private function getTagAncestry() : array
     {
         if($this->ancestryChecked)

Spacing +8 added lines, -8 removed lines

@@ -53,7 +53,7 @@ 
     {
         $pos = $this->getStartPosition();
         
-        if(is_bool($pos))
+        if (is_bool($pos))
         {
             return '';
         }
@@ -75,9 +75,9 @@ 
     {
         $tagNames = $this->getParentTags();
         
-        foreach($tagNames as $tagName)
+        foreach ($tagNames as $tagName)
         {
-            if($this->formatter->isTagExcluded($tagName))
+            if ($this->formatter->isTagExcluded($tagName))
             {
                 return true;
             }
@@ -99,11 +99,11 @@ 
         // Create a stack of all direct parent tags of the command.
         // Handles closing tags as well.
         $stack = array();
-        foreach($tags[2] as $idx => $tagName)
+        foreach ($tags[2] as $idx => $tagName)
         {
             $closing = $tags[1][$idx] === '/';
             
-            if($closing)
+            if ($closing)
             {
                 array_pop($stack);
             }
@@ -128,9 +128,9 @@ 
         
         // This check is easy: if the command is in the attribute
         // of any of the tags, we will find the command marker in there.
-        foreach($tags[3] as $attributes)
+        foreach ($tags[3] as $attributes)
         {
-            if(strstr($attributes, self::COMMAND_MARKER))
+            if (strstr($attributes, self::COMMAND_MARKER))
             {
                 return true;
             }
@@ -147,7 +147,7 @@ 
     */
     private function getTagAncestry() : array
     {
-        if($this->ancestryChecked)
+        if ($this->ancestryChecked)
         {
             return $this->tagAncestry;
         }

src/Mailcode/Parser/Safeguard/Formatter/FormatType.php

Indentation +5 added lines, -5 removed lines

@@ -25,11 +25,11 @@
         return PHP_INT_MAX;
     }
 
-   /**
-    * Formats the specified string according to the formatter.
-    * Retrieve the updated string from the string container used
-    * to create the formatter, or use `getSubjectString()`.
-    */
+    /**
+     * Formats the specified string according to the formatter.
+     * Retrieve the updated string from the string container used
+     * to create the formatter, or use `getSubjectString()`.
+     */
     public function format() : void
     {
         $locations = $this->resolveLocations();

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     {
         $locations = $this->resolveLocations();
         
-        foreach($locations as $location)
+        foreach ($locations as $location)
         {
             $location->format();
             

src/Mailcode/Parser/Safeguard/Formatting.php

Spacing +10 added lines, -10 removed lines

@@ -131,7 +131,7 @@ 
     
     public function applyFormatting() : void
     {
-        if($this->applied)
+        if ($this->applied)
         {
             return;
         }
@@ -146,9 +146,9 @@ 
 
     private function applyFormatTypes() : void
     {
-        foreach($this->formatters as $formatter)
+        foreach ($this->formatters as $formatter)
         {
-            if($formatter instanceof Mailcode_Parser_Safeguard_Formatter_FormatType)
+            if ($formatter instanceof Mailcode_Parser_Safeguard_Formatter_FormatType)
             {
                 $formatter->format();
             }
@@ -157,9 +157,9 @@ 
     
     private function applyReplaceTypes() : void
     {
-        foreach($this->formatters as $formatter)
+        foreach ($this->formatters as $formatter)
         {
-            if($formatter instanceof Mailcode_Parser_Safeguard_Formatter_ReplacerType)
+            if ($formatter instanceof Mailcode_Parser_Safeguard_Formatter_ReplacerType)
             {
                 $formatter->replace();
             }
@@ -168,7 +168,7 @@ 
     
     private function validateFormatters() : void
     {
-        if(empty($this->formatters))
+        if (empty($this->formatters))
         {
             throw new Mailcode_Exception(
                 'No formatters selected',
@@ -179,7 +179,7 @@ 
         
         $amount = $this->countReplacers();
         
-        if($amount > 1) 
+        if ($amount > 1) 
         {
             throw new Mailcode_Exception(
                 'More than one replacer formatter selected',
@@ -189,7 +189,7 @@ 
         }
         
         // by default, at minimum the normalized formatter must be selected.
-        if($amount === 0)
+        if ($amount === 0)
         {
             $this->replaceWithNormalized();
         }
@@ -204,9 +204,9 @@ 
     {
         $count = 0;
         
-        foreach($this->formatters as $formatter)
+        foreach ($this->formatters as $formatter)
         {
-            if($formatter instanceof Mailcode_Parser_Safeguard_Formatter_ReplacerType)
+            if ($formatter instanceof Mailcode_Parser_Safeguard_Formatter_ReplacerType)
             {
                 $count++;
             }

Indentation +67 added lines, -67 removed lines

@@ -32,29 +32,29 @@ 
     const ERROR_TOO_MANY_REPLACERS = 65902;
     const ERROR_NO_FORMATTERS_ADDED = 65903;
     
-   /**
-    * @var Mailcode_Parser_Safeguard
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard
+     */
     private $safeguard;
     
-   /**
-    * @var Mailcode_Parser_Safeguard_Formatter[]
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard_Formatter[]
+     */
     private $formatters = array();
     
-   /**
-    * @var Mailcode_StringContainer
-    */
+    /**
+     * @var Mailcode_StringContainer
+     */
     private $subject;
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     private $applied = false;
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     private $partial = false;
     
     public function __construct(Mailcode_Parser_Safeguard $safeguard, Mailcode_StringContainer $subject)
@@ -96,17 +96,17 @@ 
         return $formatter;
     }
     
-   /**
-    * Adds a formatter that will surround all variables with
-    * markup to highlight them independently of command syntax
-    * highlighting.
-    * 
-    * This is used to mark variables visually even after commands
-    * have been replaced by the target system's post processing.
-    * Can be combined with a replacer and other formats.
-    * 
-    * @return Mailcode_Parser_Safeguard_Formatter_Type_MarkVariables
-    */
+    /**
+     * Adds a formatter that will surround all variables with
+     * markup to highlight them independently of command syntax
+     * highlighting.
+     * 
+     * This is used to mark variables visually even after commands
+     * have been replaced by the target system's post processing.
+     * Can be combined with a replacer and other formats.
+     * 
+     * @return Mailcode_Parser_Safeguard_Formatter_Type_MarkVariables
+     */
     public function formatWithMarkedVariables() : Mailcode_Parser_Safeguard_Formatter_Type_MarkVariables
     {
         $formatter = $this->createMarkVariables();
@@ -200,11 +200,11 @@ 
         }
     }
     
-   /**
-    * Counts the amount of replacer formatters that have been added.
-    * 
-    * @return int
-    */
+    /**
+     * Counts the amount of replacer formatters that have been added.
+     * 
+     * @return int
+     */
     private function countReplacers() : int
     {
         $count = 0;
@@ -220,37 +220,37 @@ 
         return $count;
     }
 
-   /**
-    * Creates a formatter that adds HTML syntax highlighting
-    * for all commands in the specified string, intelligently
-    * checking the location of the commands to ensure that they
-    * can be syntax highlighted.
-    * 
-    * For example, commands in HTML attributes will not be
-    * highlighted, as this would break the HTML.
-    *  
-    * @return Mailcode_Parser_Safeguard_Formatter_Type_HTMLHighlighting
-    */
+    /**
+     * Creates a formatter that adds HTML syntax highlighting
+     * for all commands in the specified string, intelligently
+     * checking the location of the commands to ensure that they
+     * can be syntax highlighted.
+     * 
+     * For example, commands in HTML attributes will not be
+     * highlighted, as this would break the HTML.
+     *  
+     * @return Mailcode_Parser_Safeguard_Formatter_Type_HTMLHighlighting
+     */
     public function createHTMLHighlighting() : Mailcode_Parser_Safeguard_Formatter_Type_HTMLHighlighting
     {
         return new Mailcode_Parser_Safeguard_Formatter_Type_HTMLHighlighting($this);
     }
 
-   /**
-    * Creates the formatter that ensures that all commands
-    * are placed on a separate line in the subject string.
-    */
+    /**
+     * Creates the formatter that ensures that all commands
+     * are placed on a separate line in the subject string.
+     */
     public function createSingleLines() : Mailcode_Parser_Safeguard_Formatter_Type_SingleLines
     {
         return new Mailcode_Parser_Safeguard_Formatter_Type_SingleLines($this);
     }
     
-   /**
-    * Creates the formatter that replaces all commands by
-    * their normalized variants.
-    * 
-    * @return Mailcode_Parser_Safeguard_Formatter_Type_Normalized
-    */
+    /**
+     * Creates the formatter that replaces all commands by
+     * their normalized variants.
+     * 
+     * @return Mailcode_Parser_Safeguard_Formatter_Type_Normalized
+     */
     public function createNormalized() : Mailcode_Parser_Safeguard_Formatter_Type_Normalized
     {
         return new Mailcode_Parser_Safeguard_Formatter_Type_Normalized($this);
@@ -273,26 +273,26 @@ 
         return $this->subject->getString();
     }
 
-   /**
-    * Whether the formatting is done partially: missing placeholders
-    * will simply be ignored.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the formatting is done partially: missing placeholders
+     * will simply be ignored.
+     * 
+     * @return bool
+     */
     public function isPartial() : bool
     {
         return $this->partial;
     }
     
-   /**
-    * The formatting will ignore missing placeholders. Use this if the
-    * formatting will be done on a text that may not contain all of the
-    * initial placeholders anymore.
-    * 
-    * This is like the safeguard's makeWholePartial() method.
-    * 
-    * @return Mailcode_Parser_Safeguard_Formatting
-    */
+    /**
+     * The formatting will ignore missing placeholders. Use this if the
+     * formatting will be done on a text that may not contain all of the
+     * initial placeholders anymore.
+     * 
+     * This is like the safeguard's makeWholePartial() method.
+     * 
+     * @return Mailcode_Parser_Safeguard_Formatting
+     */
     public function makePartial() : Mailcode_Parser_Safeguard_Formatting
     {
         $this->partial = true;

src/Mailcode/Parser/Safeguard.php

Braces +1 added lines, -2 removed lines

@@ -260,8 +260,7 @@
         if($highlighted)
         {
             $formatting->replaceWithHTMLHighlighting();
-        }
-        else 
+        } else 
         {
             $formatting->replaceWithNormalized();
         }

Spacing +21 added lines, -21 removed lines

@@ -180,7 +180,7 @@ 
         $placeholders = $this->getPlaceholders();
         $string = $this->originalString;
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $string = $this->makePlaceholderSafe($string, $placeholder);
         }
@@ -210,14 +210,14 @@ 
         $placeholders = $this->getPlaceholders();
         $total = count($placeholders);
 
-        for($i=0; $i < $total; $i++)
+        for ($i = 0; $i < $total; $i++)
         {
             $placeholder = $placeholders[$i];
             $command = $placeholder->getCommand();
 
-            if($command instanceof Mailcode_Interfaces_Commands_ProtectedContent)
+            if ($command instanceof Mailcode_Interfaces_Commands_ProtectedContent)
             {
-                $string = $command->protectContent($string, $placeholder, $placeholders[$i+1]);
+                $string = $command->protectContent($string, $placeholder, $placeholders[$i + 1]);
             }
         }
 
@@ -228,7 +228,7 @@ 
     {
         $pos = mb_strpos($string, $placeholder->getOriginalText());
 
-        if($pos === false)
+        if ($pos === false)
         {
             throw new Mailcode_Exception(
                 'Placeholder original text not found',
@@ -267,7 +267,7 @@ 
     */
     public function createFormatting($subject) : Mailcode_Parser_Safeguard_Formatting
     {
-        if(is_string($subject))
+        if (is_string($subject))
         {
             $subject = Mailcode::create()->createString($subject);
         }
@@ -283,7 +283,7 @@ 
     */
     public function getPlaceholders()
     {
-        if(isset($this->placeholders))
+        if (isset($this->placeholders))
         {
             return $this->placeholders;
         }
@@ -292,7 +292,7 @@ 
         
         $cmds = $this->getCollection()->getCommands();
         
-        foreach($cmds as $command)
+        foreach ($cmds as $command)
         {
             self::$counter++;
             
@@ -313,21 +313,21 @@ 
      * @return string
      * @throws Mailcode_Exception
      */
-    protected function restore(string $string, bool $partial=false, bool $highlighted=false) : string
+    protected function restore(string $string, bool $partial = false, bool $highlighted = false) : string
     {
-        if(!$partial)
+        if (!$partial)
         {
             $this->requireValidCollection();
         }
         
         $formatting = $this->createFormatting($string);
 
-        if($partial)
+        if ($partial)
         {
             $formatting->makePartial();
         }
         
-        if($highlighted)
+        if ($highlighted)
         {
             $formatting->replaceWithHTMLHighlighting();
         }
@@ -347,7 +347,7 @@ 
         {
             $command = $placeholder->getCommand();
 
-            if($command instanceof Mailcode_Interfaces_Commands_ProtectedContent)
+            if ($command instanceof Mailcode_Interfaces_Commands_ProtectedContent)
             {
                 $string = $command->restoreContent($string);
             }
@@ -440,7 +440,7 @@ 
     */
     public function getCollection() : Mailcode_Collection
     {
-        if(isset($this->collection))
+        if (isset($this->collection))
         {
             return $this->collection;
         }
@@ -462,7 +462,7 @@ 
     */
     protected function requireValidCollection() : void
     {
-        if($this->getCollection()->isValid())
+        if ($this->getCollection()->isValid())
         {
             return;
         }
@@ -485,7 +485,7 @@ 
     */
     public function getPlaceholderStrings() : array
     {
-        if(is_array($this->placeholderStrings))
+        if (is_array($this->placeholderStrings))
         {
             return $this->placeholderStrings;
         }
@@ -494,7 +494,7 @@ 
         
         $this->placeholderStrings = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $this->placeholderStrings[] = $placeholder->getReplacementText();
         }
@@ -520,9 +520,9 @@ 
     {
         $placeholders = $this->getPlaceholders();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
-            if($placeholder->getID() === $id)
+            if ($placeholder->getID() === $id)
             {
                 return $placeholder;
             }
@@ -549,9 +549,9 @@ 
     {
         $placeholders = $this->getPlaceholders();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
-            if($placeholder->getReplacementText() === $string)
+            if ($placeholder->getReplacementText() === $string)
             {
                 return $placeholder;
             }

Indentation +144 added lines, -144 removed lines

@@ -54,45 +54,45 @@ 
     const ERROR_INVALID_COMMANDS = 47801;
     const ERROR_PLACEHOLDER_NOT_FOUND = 47804;
 
-   /**
-    * @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 = '999';
     
-   /**
-    * @var string[]|NULL
-    */
+    /**
+     * @var string[]|NULL
+     */
     protected $placeholderStrings;
 
     public function __construct(Mailcode_Parser $parser, string $subject)
@@ -111,28 +111,28 @@ 
         self::$counter = 0;
     }
     
-   /**
-    * Retrieves the string the safeguard was created for.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the string the safeguard was created for.
+     * 
+     * @return string
+     */
     public function getOriginalString() : string
     {
         return $this->originalString;
     }
     
-   /**
-    * Sets the delimiter character sequence used to prepend
-    * and append to the placeholders.
-    * 
-    * The delimiter's default is "999".
-    *
-    * Minimum characters: 2
-    * Invalid characters: Any characters that get URL encoded
-    *
-    * @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 "999".
+     *
+     * Minimum characters: 2
+     * Invalid characters: Any characters that get URL encoded
+     *
+     * @param string $delimiter
+     * @return Mailcode_Parser_Safeguard
+     */
     public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard
     {
         $validator = new Mailcode_Parser_Safeguard_DelimiterValidator($delimiter);
@@ -148,15 +148,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();
@@ -164,16 +164,16 @@ 
         return $this->makeSafePartial();
     }
     
-   /**
-    * Like makeSafe(), but allows partial (invalid) commands: use this
-    * if the subject string may contain only part of the whole set of
-    * commands. 
-    * 
-    * Example: parsing a text with an opening if statement, without the 
-    * matching end statement.
-    * 
-    * @return string
-    */
+    /**
+     * Like makeSafe(), but allows partial (invalid) commands: use this
+     * if the subject string may contain only part of the whole set of
+     * commands. 
+     * 
+     * Example: parsing a text with an opening if statement, without the 
+     * matching end statement.
+     * 
+     * @return string
+     */
     public function makeSafePartial() : string
     {
         $placeholders = $this->getPlaceholders();
@@ -257,13 +257,13 @@ 
         $analyzer->analyze();
     }
     
-   /**
-    * Creates a formatting handler, which can be used to specify
-    * which formattings to use for the commands in the subject string.
-    * 
-    * @param Mailcode_StringContainer|string $subject
-    * @return Mailcode_Parser_Safeguard_Formatting
-    */
+    /**
+     * Creates a formatting handler, which can be used to specify
+     * which formattings to use for the commands in the subject string.
+     * 
+     * @param Mailcode_StringContainer|string $subject
+     * @return Mailcode_Parser_Safeguard_Formatting
+     */
     public function createFormatting($subject) : Mailcode_Parser_Safeguard_Formatting
     {
         if(is_string($subject))
@@ -274,12 +274,12 @@ 
         return new Mailcode_Parser_Safeguard_Formatting($this, $subject);
     }
     
-   /**
-    * 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))
@@ -355,16 +355,16 @@ 
         return $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
-    */
+    /**
+     * 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
+     */
     public function makeWhole(string $string) : string
     {
         return $this->restore(
@@ -374,15 +374,15 @@ 
         );
     }
     
-   /**
-    * Like `makeWhole()`, but ignores missing command placeholders.
-    *
-    * @param string $string
-    * @return string
-    * @throws Mailcode_Exception
-    *
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    */
+    /**
+     * Like `makeWhole()`, but ignores missing command placeholders.
+     *
+     * @param string $string
+     * @return string
+     * @throws Mailcode_Exception
+     *
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     */
     public function makeWholePartial(string $string) : string
     {
         return $this->restore(
@@ -392,19 +392,19 @@ 
         );
     }
 
-   /**
-    * 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
-    */
+    /**
+     * 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
+     */
     public function makeHighlighted(string $string) : string
     {
         return $this->restore(
@@ -414,15 +414,15 @@ 
         );
     }
     
-   /**
-    * Like `makeHighlighted()`, but ignores missing command placeholders.
-    * 
-    * @param string $string
-    * @return string
-    * @throws Mailcode_Exception
-    *
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
-    */
+    /**
+     * Like `makeHighlighted()`, but ignores missing command placeholders.
+     * 
+     * @param string $string
+     * @return string
+     * @throws Mailcode_Exception
+     *
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
+     */
     public function makeHighlightedPartial(string $string) : string
     {
         return $this->restore(
@@ -432,11 +432,11 @@ 
         );
     }
     
-   /**
-    * 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))
@@ -454,11 +454,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())
@@ -481,11 +481,11 @@ 
         throw $exception;
     }
     
-   /**
-    * Retrieves a list of all placeholder IDs used in the text.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all placeholder IDs used in the text.
+     * 
+     * @return string[]
+     */
     public function getPlaceholderStrings() : array
     {
         if(is_array($this->placeholderStrings))
@@ -512,13 +512,13 @@ 
         return in_array($subject, $ids, true);
     }
     
-   /**
-    * Retrieves a placeholder instance by its ID.
-    * 
-    * @param int $id
-    * @throws Mailcode_Exception If the placeholder was not found.
-    * @return Mailcode_Parser_Safeguard_Placeholder
-    */
+    /**
+     * Retrieves a placeholder instance by its ID.
+     * 
+     * @param int $id
+     * @throws Mailcode_Exception If the placeholder was not found.
+     * @return Mailcode_Parser_Safeguard_Placeholder
+     */
     public function getPlaceholderByID(int $id) : Mailcode_Parser_Safeguard_Placeholder
     {
         $placeholders = $this->getPlaceholders();
@@ -541,13 +541,13 @@ 
         );
     }
     
-   /**
-    * Retrieves a placeholder instance by its replacement text.
-    * 
-    * @param string $string
-    * @throws Mailcode_Exception
-    * @return Mailcode_Parser_Safeguard_Placeholder
-    */
+    /**
+     * Retrieves a placeholder instance by its replacement text.
+     * 
+     * @param string $string
+     * @throws Mailcode_Exception
+     * @return Mailcode_Parser_Safeguard_Placeholder
+     */
     public function getPlaceholderByString(string $string) : Mailcode_Parser_Safeguard_Placeholder
     {
         $placeholders = $this->getPlaceholders();

src/Mailcode/StringContainer.php

Indentation +66 added lines, -66 removed lines

@@ -26,39 +26,39 @@ 
     const ERROR_INVALID_CALLABLE = 65701;
     const ERROR_UPDATE_CALLED_DURING_UPDATE_OPERATION = 65702;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $subject;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     private static $listenerCounter = 0;
     
-   /**
-    * @var callable[]
-    */
+    /**
+     * @var callable[]
+     */
     private $listeners = array();
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     private $updating = false;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     private static $idCounter = 0;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     private $id;
     
-   /**
-    * @var integer
-    */
+    /**
+     * @var integer
+     */
     private $length;
     
     public function __construct(string $subject)
@@ -75,16 +75,16 @@ 
         return $this->id;
     }
     
-   /**
-    * Updates the string with the specified string.
-    * Notifies all listeners of the change.
-    * 
-    * @param string $subject
-    * @throws Mailcode_Exception
-    * @return bool Whether the string had modifications.
-    * 
-    * @see Mailcode_StringContainer::ERROR_UPDATE_CALLED_DURING_UPDATE_OPERATION
-    */
+    /**
+     * Updates the string with the specified string.
+     * Notifies all listeners of the change.
+     * 
+     * @param string $subject
+     * @throws Mailcode_Exception
+     * @return bool Whether the string had modifications.
+     * 
+     * @see Mailcode_StringContainer::ERROR_UPDATE_CALLED_DURING_UPDATE_OPERATION
+     */
     public function updateString(string $subject) : bool
     {
         // avoid triggering an update if there are no changes in the string
@@ -117,27 +117,27 @@ 
         return true;
     }
     
-   /**
-    * Retrieves the stored string.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the stored string.
+     * 
+     * @return string
+     */
     public function getString() : string
     {
         return $this->subject;
     }
     
-   /**
-    * Adds a listener that will be informed every time the string is modified.
-    * The callback gets the string container instance as parameter.
-    * 
-    * @param callable $callback
-    * @throws Mailcode_Exception If it is not a valid callable.
-    * @return int The listener number, to be able to remove it using `removeListener()`.
-    * 
-    * @see Mailcode_StringContainer::removeListener()
-    * @see Mailcode_StringContainer::ERROR_INVALID_CALLABLE
-    */
+    /**
+     * Adds a listener that will be informed every time the string is modified.
+     * The callback gets the string container instance as parameter.
+     * 
+     * @param callable $callback
+     * @throws Mailcode_Exception If it is not a valid callable.
+     * @return int The listener number, to be able to remove it using `removeListener()`.
+     * 
+     * @see Mailcode_StringContainer::removeListener()
+     * @see Mailcode_StringContainer::ERROR_INVALID_CALLABLE
+     */
     public function addListener($callback) : int
     {
         self::$listenerCounter++;
@@ -164,12 +164,12 @@ 
         return $this->length;
     }
     
-   /**
-    * Removes an existing listener by its ID.
-    * Has no effect if it does not exist, or has already been removed.
-    * 
-    * @param int $listenerID
-    */
+    /**
+     * Removes an existing listener by its ID.
+     * Has no effect if it does not exist, or has already been removed.
+     * 
+     * @param int $listenerID
+     */
     public function removeListener(int $listenerID) : void
     {
         if(isset($this->listeners[$listenerID]))
@@ -178,13 +178,13 @@ 
         }
     }
     
-   /**
-    * Replaces all substrings matching needle with the replacement text.
-    *  
-    * @param string $needle
-    * @param string $replacement
-    * @return bool
-    */
+    /**
+     * Replaces all substrings matching needle with the replacement text.
+     *  
+     * @param string $needle
+     * @param string $replacement
+     * @return bool
+     */
     public function replaceSubstrings(string $needle, string $replacement) : bool
     {
         $string = str_replace($needle, $replacement, $this->subject);
@@ -192,12 +192,12 @@ 
         return $this->updateString($string);
     }
 
-   /**
-    * Get the position of a substring in the string.
-    * 
-    * @param string $needle
-    * @return int|bool The zero-based position, or false if not found.
-    */
+    /**
+     * Get the position of a substring in the string.
+     * 
+     * @param string $needle
+     * @return int|bool The zero-based position, or false if not found.
+     */
     public function getSubstrPosition(string $needle)
     {
         return mb_strpos($this->subject, $needle);

Spacing +6 added lines, -6 removed lines

@@ -88,12 +88,12 @@ 
     public function updateString(string $subject) : bool
     {
         // avoid triggering an update if there are no changes in the string
-        if($subject === $this->subject)
+        if ($subject === $this->subject)
         {
             return false;
         }
         
-        if($this->updating)
+        if ($this->updating)
         {
             throw new Mailcode_Exception(
                 'Cannot modify subject string during update',
@@ -107,7 +107,7 @@ 
         $this->subject = $subject;
         $this->length = mb_strlen($this->subject);
         
-        foreach($this->listeners as $listener)
+        foreach ($this->listeners as $listener)
         {
             $listener($this);
         }
@@ -142,7 +142,7 @@ 
     {
         self::$listenerCounter++;
         
-        if(!is_callable($callback))
+        if (!is_callable($callback))
         {
             throw new Mailcode_Exception(
                 'Not a valid callable',
@@ -172,7 +172,7 @@ 
     */
     public function removeListener(int $listenerID) : void
     {
-        if(isset($this->listeners[$listenerID]))
+        if (isset($this->listeners[$listenerID]))
         {
             unset($this->listeners[$listenerID]);
         }
@@ -203,7 +203,7 @@ 
         return mb_strpos($this->subject, $needle);
     }
     
-    public function getSubstr(int $start, ?int $length=null) : string
+    public function getSubstr(int $start, ?int $length = null) : string
     {
         return mb_substr($this->subject, $start, $length);
     }

src/Mailcode/Parser/Safeguard/Formatter/Location.php

Indentation +44 added lines, -44 removed lines

@@ -24,34 +24,34 @@ 
 {
     const ERROR_PLACEHOLDER_NOT_FOUND = 66001;
     
-   /**
-    * @var Mailcode_Parser_Safeguard_Formatter
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard_Formatter
+     */
     protected $formatter;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $append = '';
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $prepend = '';
     
-   /**
-    * @var Mailcode_Parser_Safeguard_Placeholder
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard_Placeholder
+     */
     protected $placeholder;
     
-   /**
-    * @var Mailcode_StringContainer
-    */
+    /**
+     * @var Mailcode_StringContainer
+     */
     protected $subject;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $log = array();
     
     public function __construct(Mailcode_Parser_Safeguard_Formatter $formatter, Mailcode_Parser_Safeguard_Placeholder $placeholder)
@@ -67,22 +67,22 @@ 
     
     abstract public function requiresAdjustment() : bool;
     
-   /**
-    * @return int|boolean
-    */
+    /**
+     * @return int|boolean
+     */
     public function getStartPosition()
     {
         return $this->subject->getSubstrPosition($this->placeholder->getReplacementText());
     }
     
-   /**
-    * Checks whether the specified position within the string
-    * is within another command's placeholder (excluding this
-    * location's placeholder).
-    * 
-    * @param int $position
-    * @return bool
-    */
+    /**
+     * Checks whether the specified position within the string
+     * is within another command's placeholder (excluding this
+     * location's placeholder).
+     * 
+     * @param int $position
+     * @return bool
+     */
     public function isWithinCommand(int $position) : bool
     {
         $placeholders = $this->formatter->getSafeguard()->getPlaceholders();
@@ -114,9 +114,9 @@ 
         return false;
     }
     
-   /**
-    * @return int|boolean
-    */
+    /**
+     * @return int|boolean
+     */
     public function getEndPosition()
     {
         $start = $this->getStartPosition();
@@ -139,14 +139,14 @@ 
         return $this->placeholder;
     }
     
-   /**
-    * Replaces the placeholder with the specified replacement text.
-    * 
-    * @param string $replacementText
-    * @throws Mailcode_Exception
-    * 
-    * @see Mailcode_Parser_Safeguard_Formatter_Location::ERROR_PLACEHOLDER_NOT_FOUND
-    */
+    /**
+     * Replaces the placeholder with the specified replacement text.
+     * 
+     * @param string $replacementText
+     * @throws Mailcode_Exception
+     * 
+     * @see Mailcode_Parser_Safeguard_Formatter_Location::ERROR_PLACEHOLDER_NOT_FOUND
+     */
     public function replaceWith(string $replacementText) : void
     {
         $needle = $this->placeholder->getReplacementText();
@@ -189,10 +189,10 @@ 
         );
     }
     
-   /**
-    * Retrieves the location's log messages, if any.
-    * @return string[]
-    */
+    /**
+     * Retrieves the location's log messages, if any.
+     * @return string[]
+     */
     public function getLog() : array
     {
         return $this->log;

Spacing +8 added lines, -8 removed lines

@@ -89,23 +89,23 @@ 
         
         $placeholderID = $this->placeholder->getID();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
-            if($placeholder->getID() === $placeholderID)
+            if ($placeholder->getID() === $placeholderID)
             {
                 continue;
             }
             
             $start = $this->subject->getSubstrPosition($placeholder->getReplacementText());
             
-            if($start === false)
+            if ($start === false)
             {
                 continue;
             }
             
             $end = $start + $placeholder->getReplacementLength();
             
-            if($position >= $start && $position <= $end)
+            if ($position >= $start && $position <= $end)
             {
                 return true;
             }
@@ -121,7 +121,7 @@ 
     {
         $start = $this->getStartPosition();
         
-        if($start !== false)
+        if ($start !== false)
         {
             return $start + $this->placeholder->getReplacementLength();
         }
@@ -151,14 +151,14 @@ 
     {
         $needle = $this->placeholder->getReplacementText();
         
-        if($this->subject->replaceSubstrings($needle, $replacementText))
+        if ($this->subject->replaceSubstrings($needle, $replacementText))
         {
             return;
         }
         
         // Complain about missing placeholders only if we
         // are not in partial mode.
-        if(!$this->formatter->getFormatting()->isPartial())
+        if (!$this->formatter->getFormatting()->isPartial())
         {
             throw new Mailcode_Exception(
                 'Could not find the placeholder to replace',
@@ -173,7 +173,7 @@ 
     
     public function format() : void
     {
-        if($this->requiresAdjustment() && (!empty($this->prepend) || !empty($this->append)))
+        if ($this->requiresAdjustment() && (!empty($this->prepend) || !empty($this->append)))
         {
             $this->replaceWith(sprintf(
                 '%s%s%s',