Mistralys / mailcode

src/Mailcode/Parser/Statement.php

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
      */
     private $sourceCommand;
 
-    public function __construct(string $statement, bool $freeform=false, ?Mailcode_Commands_Command $sourceCommand=null)
+    public function __construct(string $statement, bool $freeform = false, ?Mailcode_Commands_Command $sourceCommand = null)
     {
         $this->sourceCommand = $sourceCommand;
         $this->statement = $this->prepareStatement($statement);
@@ -106,7 +106,7 @@ 
     
     public function getInfo() : Mailcode_Parser_Statement_Info
     {
-        if($this->info instanceof Mailcode_Parser_Statement_Info)
+        if ($this->info instanceof Mailcode_Parser_Statement_Info)
         {
             return $this->info; 
         }
@@ -118,12 +118,12 @@ 
     
     protected function validate() : void
     {
-        if($this->freeform)
+        if ($this->freeform)
         {
             return;
         }
 
-        if(!$this->tokenizer->hasTokens())
+        if (!$this->tokenizer->hasTokens())
         {
             $this->result->makeError(
                 t('Empty statement'),
@@ -135,7 +135,7 @@ 
         
         $unknown = $this->tokenizer->getFirstUnknown();
         
-        if($unknown)
+        if ($unknown)
         {
             $this->result->makeError(
                t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')',

src/Mailcode/Parser.php

Indentation +43 added lines, -43 removed lines

@@ -30,14 +30,14 @@ 
         '{\s*([a-z]+)\s+([a-z-]+)\s*:([^}]*)}'
     );
     
-   /**
-    * @var Mailcode
-    */
+    /**
+     * @var Mailcode
+     */
     protected $mailcode;
     
-   /**
-    * @var Mailcode_Commands
-    */
+    /**
+     * @var Mailcode_Commands
+     */
     protected $commands;
 
     /**
@@ -51,24 +51,24 @@ 
         $this->commands = $this->mailcode->getCommands();
     }
     
-   /**
-    * Gets the regex format string used to detect commands.
-    * 
-    * @return string
-    */
+    /**
+     * Gets the regex format string used to detect commands.
+     * 
+     * @return string
+     */
     protected static function getRegex() : string
     {
         return '/'.implode('|', self::COMMAND_REGEX_PARTS).'/sixU';
     }
     
-   /**
-    * Parses a string to detect all commands within. Returns a
-    * collection instance that contains information on all the 
-    * commands.
-    * 
-    * @param string $string
-    * @return Mailcode_Collection A collection with all unique commands found.
-    */
+    /**
+     * Parses a string to detect all commands within. Returns a
+     * collection instance that contains information on all the 
+     * commands.
+     * 
+     * @param string $string
+     * @return Mailcode_Collection A collection with all unique commands found.
+     */
     public function parseString(string $string) : Mailcode_Collection
     {
         $collection = new Mailcode_Collection();
@@ -135,14 +135,14 @@ 
         return str_replace($needle, $replacement, $subject);
     }
 
-   /**
-    * Processes a single match found in the string: creates the command,
-    * and adds it to the collection if it's a valid command, or to the list
-    * of invalid commands otherwise.
-    * 
-    * @param Mailcode_Parser_Match $match
-    * @param Mailcode_Collection $collection
-    */
+    /**
+     * Processes a single match found in the string: creates the command,
+     * and adds it to the collection if it's a valid command, or to the list
+     * of invalid commands otherwise.
+     * 
+     * @param Mailcode_Parser_Match $match
+     * @param Mailcode_Collection $collection
+     */
     protected function processMatch(Mailcode_Parser_Match $match, Mailcode_Collection $collection) : void
     {
         $name = $match->getName();
@@ -205,14 +205,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[] $matches The regex results array.
-    * @param int $index The matched index.
-    * @return Mailcode_Parser_Match
-    */
+    /**
+     * Parses a single regex match: determines which named group
+     * matches, and retrieves the according information.
+     * 
+     * @param array[] $matches The regex results array.
+     * @param int $index The matched index.
+     * @return Mailcode_Parser_Match
+     */
     protected function parseMatch(array $matches, int $index) : Mailcode_Parser_Match
     {
         $name = ''; // the command name, e.g. "showvar"
@@ -250,14 +250,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 +14 added lines, -14 removed lines

@@ -80,7 +80,7 @@ 
         
         $total = count($matches[0]);
         
-        for($i=0; $i < $total; $i++)
+        for ($i = 0; $i < $total; $i++)
         {
             $match = $this->parseMatch($matches, $i);
             
@@ -101,18 +101,18 @@ 
 
         $matches = array_unique($result[0]);
 
-        if(!empty($matches))
+        if (!empty($matches))
         {
-            foreach($matches as $match)
+            foreach ($matches as $match)
             {
-                if(strpos($match, '{') !== false || strpos($match, '}') !== false)
+                if (strpos($match, '{') !== false || strpos($match, '}') !== false)
                 {
                     $subject = $this->replaceBrackets($subject, $match);
                 }
             }
         }
 
-        if(!ConvertHelper::isStringHTML($subject))
+        if (!ConvertHelper::isStringHTML($subject))
         {
             return $subject;
         }
@@ -123,7 +123,7 @@ 
 
     private function replaceBrackets(string $subject, string $needle) : string
     {
-        $replacement =  str_replace(
+        $replacement = str_replace(
             array('{', '}'),
             array(
                 self::LITERAL_BRACKET_LEFT_REPLACEMENT,
@@ -177,17 +177,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);
         }
@@ -197,7 +197,7 @@ 
     {
         $cmd = $this->stack[array_key_last($this->stack)];
 
-        if($cmd instanceof Mailcode_Commands_Command)
+        if ($cmd instanceof Mailcode_Commands_Command)
         {
             return $cmd;
         }
@@ -226,16 +226,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];
@@ -272,7 +272,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);
     }