Mistralys / mailcode

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 @@ 
     public const ERROR_TOO_MANY_REPLACERS = 65902;
     public 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);
@@ -278,26 +278,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();
         }

Indentation +146 added lines, -146 removed lines

@@ -54,40 +54,40 @@ 
     public const ERROR_NO_PLACEHOLDER_FOR_COMMAND = 47805;
     public const ERROR_NO_FIRST_PLACEHOLDER = 47806;
 
-   /**
-    * @var Mailcode_Parser
-    */
+    /**
+     * @var Mailcode_Parser
+     */
     protected Mailcode_Parser $parser;
     
-   /**
-    * @var Mailcode_Collection
-    */
+    /**
+     * @var Mailcode_Collection
+     */
     protected Mailcode_Collection $commands;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected string $originalString;
     
-   /**
-    * @var Mailcode_Collection
-    */
+    /**
+     * @var Mailcode_Collection
+     */
     protected Mailcode_Collection $collection;
     
-   /**
-    * Counter for the placeholders, global for all placeholders.
-    * @var integer
-    */
+    /**
+     * Counter for the placeholders, global for all placeholders.
+     * @var integer
+     */
     private static int $counter = 0;
     
-   /**
-    * @var Mailcode_Parser_Safeguard_PlaceholderCollection|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard_PlaceholderCollection|NULL
+     */
     protected ?Mailcode_Parser_Safeguard_PlaceholderCollection $placeholders = null;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected string $delimiter = '999';
     
     public function __construct(Mailcode_Parser $parser, string $subject)
@@ -106,28 +106,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);
@@ -143,15 +143,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();
@@ -159,16 +159,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->getPlaceholdersCollection()->getAll();
@@ -218,13 +218,13 @@ 
         $analyzer->analyze();
     }
     
-   /**
-    * Creates a formatting handler, which can be used to specify
-    * which formatting 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 formatting 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))
@@ -249,11 +249,11 @@ 
     }
 
     /**
-    * Retrieves all placeholders that have to be added to
-    * the subject text.
-    * 
-    * @return Mailcode_Parser_Safeguard_PlaceholderCollection
-    */
+     * Retrieves all placeholders that have to be added to
+     * the subject text.
+     * 
+     * @return Mailcode_Parser_Safeguard_PlaceholderCollection
+     */
     public function getPlaceholdersCollection() : Mailcode_Parser_Safeguard_PlaceholderCollection
     {
         if(isset($this->placeholders))
@@ -313,16 +313,16 @@ 
         return $formatting->toString();
     }
 
-   /**
-    * 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(
@@ -332,15 +332,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(
@@ -350,19 +350,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(
@@ -372,15 +372,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(
@@ -390,11 +390,11 @@ 
         );
     }
     
-   /**
-    * Retrieves the command collection contained in the string.
-    * 
-    * @return Mailcode_Collection
-    */
+    /**
+     * Retrieves the command collection contained in the string.
+     * 
+     * @return Mailcode_Collection
+     */
     public function getCollection() : Mailcode_Collection
     {
         if(isset($this->collection))
@@ -418,11 +418,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())
@@ -445,13 +445,13 @@ 
         throw $exception;
     }
     
-   /**
-    * Retrieves a list of all placeholder IDs used in the text.
-    * 
-    * @return string[]
-    *
-    * @deprecated Use the placeholder collection instead {@see Mailcode_Parser_Safeguard::getPlaceholdersCollection()}.
-    */
+    /**
+     * Retrieves a list of all placeholder IDs used in the text.
+     * 
+     * @return string[]
+     *
+     * @deprecated Use the placeholder collection instead {@see Mailcode_Parser_Safeguard::getPlaceholdersCollection()}.
+     */
     public function getPlaceholderStrings() : array
     {
         return $this->getPlaceholdersCollection()->getStrings();
@@ -462,29 +462,29 @@ 
         return $this->getPlaceholdersCollection()->isStringPlaceholder($subject);
     }
     
-   /**
-    * Retrieves a placeholder instance by its ID.
-    * 
-    * @param int $id
-    * @throws Mailcode_Exception If the placeholder was not found.
-    * @return Mailcode_Parser_Safeguard_Placeholder
-    *
-    * @deprecated Use the placeholder collection instead {@see Mailcode_Parser_Safeguard::getPlaceholdersCollection()}.
-    */
+    /**
+     * Retrieves a placeholder instance by its ID.
+     * 
+     * @param int $id
+     * @throws Mailcode_Exception If the placeholder was not found.
+     * @return Mailcode_Parser_Safeguard_Placeholder
+     *
+     * @deprecated Use the placeholder collection instead {@see Mailcode_Parser_Safeguard::getPlaceholdersCollection()}.
+     */
     public function getPlaceholderByID(int $id) : Mailcode_Parser_Safeguard_Placeholder
     {
         return $this->getPlaceholdersCollection()->getByID($id);
     }
     
-   /**
-    * Retrieves a placeholder instance by its replacement text.
-    * 
-    * @param string $string
-    * @throws Mailcode_Exception
-    * @return Mailcode_Parser_Safeguard_Placeholder
-    *
-    * @deprecated Use the placeholder collection instead {@see Mailcode_Parser_Safeguard::getPlaceholdersCollection()}.
-    */
+    /**
+     * Retrieves a placeholder instance by its replacement text.
+     * 
+     * @param string $string
+     * @throws Mailcode_Exception
+     * @return Mailcode_Parser_Safeguard_Placeholder
+     *
+     * @deprecated Use the placeholder collection instead {@see Mailcode_Parser_Safeguard::getPlaceholdersCollection()}.
+     */
     public function getPlaceholderByString(string $string) : Mailcode_Parser_Safeguard_Placeholder
     {
         return $this->getPlaceholdersCollection()->getByString($string);

Spacing +11 added lines, -11 removed lines

@@ -174,7 +174,7 @@ 
         $placeholders = $this->getPlaceholdersCollection()->getAll();
         $string = $this->originalString;
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $string = $this->makePlaceholderSafe($string, $placeholder);
         }
@@ -188,7 +188,7 @@ 
     {
         $pos = mb_strpos($string, $placeholder->getOriginalText());
 
-        if($pos === false)
+        if ($pos === false)
         {
             throw new Mailcode_Exception(
                 'Placeholder original text not found',
@@ -227,7 +227,7 @@ 
     */
     public function createFormatting($subject) : Mailcode_Parser_Safeguard_Formatting
     {
-        if(is_string($subject))
+        if (is_string($subject))
         {
             $subject = Mailcode::create()->createString($subject);
         }
@@ -256,7 +256,7 @@ 
     */
     public function getPlaceholdersCollection() : Mailcode_Parser_Safeguard_PlaceholderCollection
     {
-        if(isset($this->placeholders))
+        if (isset($this->placeholders))
         {
             return $this->placeholders;
         }
@@ -264,7 +264,7 @@ 
         $placeholders = array();
         $commands = $this->getCollection()->getCommands();
         
-        foreach($commands as $command)
+        foreach ($commands as $command)
         {
             self::$counter++;
             
@@ -287,21 +287,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();
         }
@@ -397,7 +397,7 @@ 
     */
     public function getCollection() : Mailcode_Collection
     {
-        if(isset($this->collection))
+        if (isset($this->collection))
         {
             return $this->collection;
         }
@@ -425,7 +425,7 @@ 
     */
     protected function requireValidCollection() : void
     {
-        if($this->getCollection()->isValid())
+        if ($this->getCollection()->isValid())
         {
             return;
         }

src/Mailcode/StringContainer.php

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

Indentation +66 added lines, -66 removed lines

@@ -26,39 +26,39 @@ 
     public const ERROR_INVALID_CALLABLE = 65701;
     public 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);

src/Mailcode/Parser/Safeguard/Formatter.php

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
         
         $instance = new $class($this, $placeholder);
         
-        if($instance instanceof Mailcode_Parser_Safeguard_Formatter_Location)
+        if ($instance instanceof Mailcode_Parser_Safeguard_Formatter_Location)
         {
             return $instance;
         }
@@ -105,7 +105,7 @@ 
         
         $result = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $result[] = $this->createLocation($placeholder);
         }
@@ -123,7 +123,7 @@ 
     {
         $eol = ConvertHelper::detectEOLCharacter($subject);
         
-        if($eol)
+        if ($eol)
         {
             $this->log(sprintf(
                 'Detected EOL character: %s.', 

Indentation +24 added lines, -24 removed lines

@@ -27,19 +27,19 @@ 
 {
     public const ERROR_INVALID_LOCATION_INSTANCE = 65601;
     
-   /**
-    * @var Mailcode_Parser_Safeguard_Formatting
-    */
+    /**
+     * @var Mailcode_Parser_Safeguard_Formatting
+     */
     protected $formatting;
     
-   /**
-    * @var Mailcode_StringContainer
-    */
+    /**
+     * @var Mailcode_StringContainer
+     */
     protected $subject;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $log = array();
     
     public function __construct(Mailcode_Parser_Safeguard_Formatting $formatting)
@@ -98,12 +98,12 @@ 
         );
     }
     
-   /**
-    * Retrieves all formatter-specific placeholder locations 
-    * in the subject string.
-    * 
-    * @return Mailcode_Parser_Safeguard_Formatter_Location[]
-    */
+    /**
+     * Retrieves all formatter-specific placeholder locations 
+     * in the subject string.
+     * 
+     * @return Mailcode_Parser_Safeguard_Formatter_Location[]
+     */
     protected function resolveLocations() : array
     {
         $placeholders = $this->formatting->getSafeguard()->getPlaceholdersCollection()->getAll();
@@ -118,12 +118,12 @@ 
         return $result;
     }
     
-   /**
-    * Resolves the newline character used in the string.
-    * 
-    * @param string $subject
-    * @return string
-    */
+    /**
+     * Resolves the newline character used in the string.
+     * 
+     * @param string $subject
+     * @return string
+     */
     protected function resolveNewlineChar(string $subject) : string
     {
         $eol = ConvertHelper::detectEOLCharacter($subject);
@@ -155,9 +155,9 @@ 
         );
     }
  
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     public function getLog() : array
     {
         return $this->log;

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

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',

Indentation +44 added lines, -44 removed lines

@@ -24,34 +24,34 @@ 
 {
     public 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()->getPlaceholdersCollection()->getAll();
@@ -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();
@@ -196,10 +196,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;

src/Mailcode/Parser.php

Braces +3 added lines, -6 removed lines

@@ -146,8 +146,7 @@ 
         if($cmd instanceof Mailcode_Commands_Command_Type_Opening)
         {
             $this->stack[] = $cmd;
-        }
-        else if($cmd instanceof Mailcode_Commands_Command_Type_Closing)
+        } else if($cmd instanceof Mailcode_Commands_Command_Type_Closing)
         {
             array_pop($this->stack);
         }
@@ -177,13 +176,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];

Indentation +21 added lines, -21 removed lines

@@ -42,11 +42,11 @@ 
         $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';
@@ -183,14 +183,14 @@ 
         throw new Mailcode_Exception('Not a command', '', self::ERROR_NOT_A_COMMAND);
     }
     
-   /**
-    * Parses a single regex match: determines which named group
-    * matches, and retrieves the according information.
-    * 
-    * @param array<int,array<int,string>>$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<int,array<int,string>>$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"
@@ -228,14 +228,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 +10 added lines, -10 removed lines

@@ -72,7 +72,7 @@ 
 
         $result = new ParseResult($collection, $preParser);
 
-        if(!$collection->isValid())
+        if (!$collection->isValid())
         {
             return $result;
         }
@@ -84,7 +84,7 @@ 
         
         $total = count($matches[0]);
 
-        for($i=0; $i < $total; $i++)
+        for ($i = 0; $i < $total; $i++)
         {
             $match = $this->parseMatch($matches, $i);
             
@@ -154,17 +154,17 @@ 
     private function handleNesting(Mailcode_Commands_Command $cmd) : void
     {
         // Set the command's parent from the stack, if any is present.
-        if(!empty($this->stack))
+        if (!empty($this->stack))
         {
             $cmd->setParent($this->getStackLast());
         }
 
         // Handle opening and closing commands, adding and removing from the stack.
-        if($cmd instanceof Mailcode_Commands_Command_Type_Opening)
+        if ($cmd instanceof Mailcode_Commands_Command_Type_Opening)
         {
             $this->stack[] = $cmd;
         }
-        else if($cmd instanceof Mailcode_Commands_Command_Type_Closing)
+        else if ($cmd instanceof Mailcode_Commands_Command_Type_Closing)
         {
             array_pop($this->stack);
         }
@@ -178,7 +178,7 @@ 
     {
         $cmd = $this->stack[array_key_last($this->stack)];
 
-        if($cmd instanceof Mailcode_Commands_Command)
+        if ($cmd instanceof Mailcode_Commands_Command)
         {
             return $cmd;
         }
@@ -207,16 +207,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];
@@ -253,7 +253,7 @@ 
      * @param Mailcode_Commands_Command|null $sourceCommand
      * @return Mailcode_Parser_Statement
      */
-    public function createStatement(string $statement, bool $freeform=false, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Parser_Statement
+    public function createStatement(string $statement, bool $freeform = false, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Parser_Statement
     {
         return new Mailcode_Parser_Statement($statement, $freeform, $sourceCommand);
     }

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

Spacing +5 added lines, -5 removed lines

@@ -60,7 +60,7 @@ 
     
     public function setTemplate(string $template) : Mailcode_Parser_Safeguard_Formatter_Type_MarkVariables
     {
-        if(substr_count($template, '%s') !== 1)
+        if (substr_count($template, '%s') !== 1)
         {
             throw new Mailcode_Exception(
                 'Invalid tag template',
@@ -101,7 +101,7 @@ 
         $parts = explode('%s', $this->getTemplate());
         $tag = array_shift($parts);
 
-        if($this->templateMode === self::TEMPLATE_MODE_INLINE)
+        if ($this->templateMode === self::TEMPLATE_MODE_INLINE)
         {
             $tag = str_replace('__STYLES__', $this->getInlineStyles(), $tag);
         }
@@ -129,12 +129,12 @@ 
         $styles = '';
         $regex = '/\.'.self::DEFAULT_CLASS_NAME.'{([^}]+)}/';
 
-        if(preg_match($regex, $this->getCSS(), $matches))
+        if (preg_match($regex, $this->getCSS(), $matches))
         {
             $styles = $matches[1];
         }
 
-        if(empty($styles))
+        if (empty($styles))
         {
             throw new Mailcode_Exception(
                 'Cannot extract styles.',
@@ -191,7 +191,7 @@ 
         $file = MAILCODE_INSTALL_FOLDER.'/css/marked-variables.css';
         $path = realpath($file);
 
-        if($path !== false)
+        if ($path !== false)
         {
             return $path;
         }

src/Mailcode/Number/Info.php

Spacing +18 added lines, -18 removed lines

@@ -42,7 +42,7 @@ 
     {
         $format = trim($format);
 
-        if(empty($format))
+        if (empty($format))
         {
             $format = self::DEFAULT_FORMAT;
         }
@@ -108,15 +108,15 @@ 
     {
         $format = $this->format;
 
-        foreach($this->validations as $validation)
+        foreach ($this->validations as $validation)
         {
             $method = 'parse_'.$validation;
 
-            if(method_exists($this, $method))
+            if (method_exists($this, $method))
             {
                 $format = $this->$method($format);
 
-                if(!$this->isValid())
+                if (!$this->isValid())
                 {
                     return;
                 }
@@ -138,13 +138,13 @@ 
 
     private function parse_padding(string $format) : string
     {
-        if(strstr($format, ':') === false) {
+        if (strstr($format, ':') === false) {
             return $format;
         }
 
         $parts = ConvertHelper::explodeTrim(':', $this->format);
 
-        if(count($parts) !== 2)
+        if (count($parts) !== 2)
         {
             $this->makeError(
                 t(
@@ -159,7 +159,7 @@ 
 
         $padding = $parts[1];
 
-        if(!preg_match('/\A[#]+\z/x', $padding))
+        if (!preg_match('/\A[#]+\z/x', $padding))
         {
             $this->makeError(
                 t('The padding may only contain hashes (%1$s given).', '<code>'.$padding.'</code>'),
@@ -176,7 +176,7 @@ 
 
     private function parse_number(string $format) : string
     {
-        if($format[0] !== '1')
+        if ($format[0] !== '1')
         {
             $this->makeError(
                 t('The first character of the format must be a %1$s.', '<code>1</code>'),
@@ -190,7 +190,7 @@ 
         $base = str_replace(array('.', ',', ' '), '', $format);
         $number = intval(substr($base, 0, 4));
 
-        if($number === 1000) {
+        if ($number === 1000) {
             return $format;
         }
 
@@ -210,7 +210,7 @@ 
         $separator = $format[1];
 
         // No thousands separator
-        if($separator === '0')
+        if ($separator === '0')
         {
             return $format;
         }
@@ -218,7 +218,7 @@ 
         // Valid thousands separator
         $validSeparators = array(' ', ',', '.');
 
-        if(in_array($separator, $validSeparators))
+        if (in_array($separator, $validSeparators))
         {
             $this->thousandsSeparator = $separator;
             $format = str_replace('1'.$separator, '1', $format);
@@ -254,7 +254,7 @@ 
 
     private function parse_separators(string $format) : string
     {
-        if(!empty($this->thousandsSeparator) && !empty($this->decimalsSeparator) && $this->thousandsSeparator === $this->decimalsSeparator)
+        if (!empty($this->thousandsSeparator) && !empty($this->decimalsSeparator) && $this->thousandsSeparator === $this->decimalsSeparator)
         {
             $this->makeError(
                 t(
@@ -270,14 +270,14 @@ 
 
     private function parse_decimals(string $format) : string
     {
-        if(empty($this->decimalsSeparator))
+        if (empty($this->decimalsSeparator))
         {
             return $format;
         }
 
         $parts = ConvertHelper::explodeTrim($this->decimalsSeparator, $format);
 
-        if(!isset($parts[1]))
+        if (!isset($parts[1]))
         {
             $this->makeError(
                 t('Cannot determine the amount of decimals.').' '.
@@ -293,7 +293,7 @@ 
             return $format;
         }
 
-        if($this->validateDecimals($parts[1]))
+        if ($this->validateDecimals($parts[1]))
         {
             $this->decimals = strlen($parts[1]);
         }
@@ -303,7 +303,7 @@ 
 
     private function validateDecimals(string $decimals) : bool
     {
-        if(preg_match('/\A[0]+\z/x', $decimals)) {
+        if (preg_match('/\A[0]+\z/x', $decimals)) {
             return true;
         }
 
@@ -322,7 +322,7 @@ 
     {
         $validSeparators = array('.', ',');
 
-        if(in_array($separator, $validSeparators)) {
+        if (in_array($separator, $validSeparators)) {
             return true;
         }
 
@@ -344,7 +344,7 @@ 
      */
     private function parse_regex(string $format) : string
     {
-        if(preg_match('/1[ ,.]?000|1[ ,.]?000[.,][0]+/x', $format))
+        if (preg_match('/1[ ,.]?000|1[ ,.]?000[.,][0]+/x', $format))
         {
             return $format;
         }