Mistralys / mailcode

src/Mailcode/Collection/NestingValidator.php

Spacing +11 added lines, -11 removed lines

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

Indentation +9 added lines, -9 removed lines

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

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

Spacing +3 added lines, -3 removed lines

@@ -25,16 +25,16 @@
     {
         $command = $location->getPlaceholder()->getCommand();
 
-        if($command instanceof Mailcode_Interfaces_Commands_PreProcessing)
+        if ($command instanceof Mailcode_Interfaces_Commands_PreProcessing)
         {
             return $command->preProcessOpening();
         }
 
-        if($command instanceof Mailcode_Commands_Command_Type_Closing)
+        if ($command instanceof Mailcode_Commands_Command_Type_Closing)
         {
             $opening = $command->getOpeningCommand();
 
-            if($opening instanceof Mailcode_Interfaces_Commands_PreProcessing) {
+            if ($opening instanceof Mailcode_Interfaces_Commands_PreProcessing) {
                 return $opening->preProcessClosing();
             }
         }

tools/prepend.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-if(!file_exists('../vendor/autoload.php')) {
+if (!file_exists('../vendor/autoload.php')) {
     die('Autoloader not present.');
 }
 

tools/translator.php

Braces +3 added lines, -6 removed lines

@@ -40,8 +40,7 @@ 
     try
     {
         $translated = translateMailcode($commandsText, $activeSyntax);
-    }
-    catch (Mailcode_Exception $e)
+    } catch (Mailcode_Exception $e)
     {
         $translated = '';
         $error = $e->getMessage();
@@ -146,8 +145,7 @@ 
                         <?php pt('No commands specified.') ?>
                     </div>
                 <?php
-            }
-            else if($error)
+            } else if($error)
             {
                 ?>
                     <div class="alert alert-danger">
@@ -155,8 +153,7 @@ 
                         <?php echo $error ?>
                     </div>
                 <?php
-            }
-            else
+            } else
             {
                 ?>
                     <textarea class="form-control" rows="10"><?php echo htmlspecialchars($translated) ?></textarea>

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
 $error = null;
 $activeSyntax = $syntaxes[0]->getTypeID();
 
-if($request->getBool('translate'))
+if ($request->getBool('translate'))
 {
     $commandsText = $request->registerParam('mailcode')->getString();
     $activeSyntax = $request->registerParam('syntax')
@@ -48,12 +48,12 @@ 
         $error = $e->getMessage();
 
         $collection = $e->getCollection();
-        if($collection)
+        if ($collection)
         {
             $first = $collection->getFirstError();
             $error = $first->getMessage();
             $matched = $first->getMatchedText();
-            if(!empty($matched)) {
+            if (!empty($matched)) {
                 $error .= '<br>'.t('In command:').' <code>'.$matched.'</code>';
             }
         }
@@ -117,7 +117,7 @@ 
                             $selected = '';
                             $typeID = $syntax->getTypeID();
 
-                            if($typeID === $activeSyntax) {
+                            if ($typeID === $activeSyntax) {
                                 $selected = ' selected';
                             }
 
@@ -137,7 +137,7 @@ 
         <p></p><br>
         <h2><?php pt('Translated commands') ?></h2>
         <?php
-            if(empty($commandsText))
+            if (empty($commandsText))
             {
                 ?>
                     <div class="alert alert-info">
@@ -145,7 +145,7 @@ 
                     </div>
                 <?php
             }
-            else if($error)
+            else if ($error)
             {
                 ?>
                     <div class="alert alert-danger">

src/Mailcode/Commands/LogicKeywords.php

Indentation +45 added lines, -45 removed lines

@@ -31,27 +31,27 @@ 
     public const VALIDATION_CANNOT_MIX_LOGIC_KEYWORDS = 60701;
     public const VALIDATION_INVALID_SUB_COMMAND = 60702;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $paramsString;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     private $names = array(
         'and', 
         'or'
     );
     
-   /**
-    * @var Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * @var Mailcode_Commands_LogicKeywords_Keyword[]
+     */
     private $keywords = array();
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $mainParams = '';
     
     public function __construct(Mailcode_Commands_Command $command, string $paramsString)
@@ -137,9 +137,9 @@ 
         }
     }
     
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     private function detectParameters() : array
     {
         $params = $this->paramsString;
@@ -157,13 +157,13 @@ 
         return $stack;
     }
 
-   /**
-    * @param string $params
-    * @param Mailcode_Commands_LogicKeywords_Keyword $keyword
-    * @param string[] $stack
-    * @throws Mailcode_Exception
-    * @return string
-    */
+    /**
+     * @param string $params
+     * @param Mailcode_Commands_LogicKeywords_Keyword $keyword
+     * @param string[] $stack
+     * @throws Mailcode_Exception
+     * @return string
+     */
     private function detectParamsKeyword(string $params, Mailcode_Commands_LogicKeywords_Keyword $keyword, array &$stack) : string
     {
         $search = $keyword->getMatchedString();
@@ -188,22 +188,22 @@ 
         return $params;
     }
     
-   /**
-    * Extracts the parameters string to use for the 
-    * original command itself, omitting all the logic
-    * keywords for the sub-commands.
-    * 
-    * @return string
-    */
+    /**
+     * Extracts the parameters string to use for the 
+     * original command itself, omitting all the logic
+     * keywords for the sub-commands.
+     * 
+     * @return string
+     */
     public function getMainParamsString() : string
     {
         return $this->mainParams;
     }
     
-   /**
-    * Retrieves the detected keyword names.
-    * @return string[]
-    */
+    /**
+     * Retrieves the detected keyword names.
+     * @return string[]
+     */
     public function getDetectedNames() : array
     {
         $names = array();
@@ -221,23 +221,23 @@ 
         return $names;
     }
     
-   /**
-    * Retrieves all keywords that were detected in the
-    * command's parameters string, if any.
-    * 
-    * @return Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * Retrieves all keywords that were detected in the
+     * command's parameters string, if any.
+     * 
+     * @return Mailcode_Commands_LogicKeywords_Keyword[]
+     */
     public function getKeywords() : array
     {
         return $this->keywords;
     }
     
-   /**
-    * Detects any keyword statements in the parameters by keyword name.
-    * 
-    * @param string $name
-    * @return Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * Detects any keyword statements in the parameters by keyword name.
+     * 
+     * @param string $name
+     * @return Mailcode_Commands_LogicKeywords_Keyword[]
+     */
     private function detectKeywords(string $name) : array
     {
         $regex = sprintf('/%1$s\s+([a-z\-0-9]+):|%1$s:/x', $name);

Spacing +20 added lines, -20 removed lines

@@ -71,9 +71,9 @@ 
     
     private function parse() : void
     {
-        foreach($this->names as $name)
+        foreach ($this->names as $name)
         {
-            if(!stristr($this->paramsString, $name))
+            if (!stristr($this->paramsString, $name))
             {
                 continue;
             }
@@ -90,7 +90,7 @@ 
         $names = $this->getDetectedNames();
         $amount = count($names);
         
-        if($amount > 1)
+        if ($amount > 1)
         {
             $this->makeError(
                 t(
@@ -110,7 +110,7 @@ 
     
     private function splitParams() : void
     {
-        if(empty($this->keywords))
+        if (empty($this->keywords))
         {
             $this->mainParams = $this->paramsString;
             
@@ -119,13 +119,13 @@ 
         
         $params = $this->detectParameters();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $kParams = (string)array_shift($params);
             
             $keyword->setParamsString($kParams);
             
-            if(!$keyword->isValid())
+            if (!$keyword->isValid())
             {
                 $this->makeError(
                     t('Error #%1$s:', $keyword->getCode()).' '.$keyword->getErrorMessage(),
@@ -145,7 +145,7 @@ 
         $params = $this->paramsString;
         $stack = array();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $params = $this->detectParamsKeyword($params, $keyword, $stack);
         }
@@ -169,7 +169,7 @@ 
         $search = $keyword->getMatchedString();
         $pos = strpos($params, $search, 0);
         
-        if($pos === false)
+        if ($pos === false)
         {
             throw new Mailcode_Exception(
                 'Keyword matched string not found',
@@ -181,7 +181,7 @@ 
         $length = strlen($search);
         
         $store = substr($params, 0, $pos);
-        $params = trim(substr($params, $pos+$length));
+        $params = trim(substr($params, $pos + $length));
         
         $stack[] = $store;
         
@@ -208,11 +208,11 @@ 
     {
         $names = array();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $name = $keyword->getName();
             
-            if(!in_array($name, $names))
+            if (!in_array($name, $names))
             {
                 $names[] = $name;
             }
@@ -245,7 +245,7 @@ 
         $matches = array();
         preg_match_all($regex, $this->paramsString, $matches, PREG_PATTERN_ORDER);
         
-        if(!isset($matches[0][0]) || empty($matches[0][0]))
+        if (!isset($matches[0][0]) || empty($matches[0][0]))
         {
             return array();
         }
@@ -253,7 +253,7 @@ 
         $amount = count($matches[0]);
         $result = array();
         
-        for($i=0; $i < $amount; $i++)
+        for ($i = 0; $i < $amount; $i++)
         {
             $result[] = $this->createKeyword(
                 $name, 
@@ -270,22 +270,22 @@ 
         return !empty($this->keywords);
     }
     
-    public function appendAND(string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword
+    public function appendAND(string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
         return $this->appendKeyword('and', $paramsString, $type);
     }
     
-    public function appendOR(string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword
+    public function appendOR(string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
         return $this->appendKeyword('or', $paramsString, $type);
     }
     
-    public function appendKeyword(string $name, string $paramsString, string $type='') : Mailcode_Commands_LogicKeywords_Keyword
+    public function appendKeyword(string $name, string $paramsString, string $type = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
         $keyword = $this->createKeyword($name, $type);
         $keyword->setParamsString($paramsString);
         
-        if(!$keyword->isValid())
+        if (!$keyword->isValid())
         {
             throw new Mailcode_Exception(
                 'Cannot append invalid logic keyword',
@@ -306,13 +306,13 @@ 
         return $keyword;
     }
     
-    private function createKeyword(string $name, string $type='', string $matchedString='') : Mailcode_Commands_LogicKeywords_Keyword
+    private function createKeyword(string $name, string $type = '', string $matchedString = '') : Mailcode_Commands_LogicKeywords_Keyword
     {
-        if(empty($matchedString))
+        if (empty($matchedString))
         {
             $matchedString = $name;
             
-            if(!empty($type))
+            if (!empty($type))
             {
                 $matchedString .= ' '.$type;
             }

src/Mailcode/Variables/Collection/Invalid.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 
     public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection
     {
-        if($variable->isValid())
+        if ($variable->isValid())
         {
             return $this;
         }
@@ -38,7 +38,7 @@ 
     {
         $first = $this->getFirst();
 
-        if($first)
+        if ($first)
         {
             return $first->getValidationResult();
         }

src/Mailcode/Parser/Statement.php

Indentation +13 added lines, -13 removed lines

@@ -26,24 +26,24 @@ 
     public const VALIDATION_EMPTY = 48801;
     public const VALIDATION_UNQUOTED_STRING_LITERALS = 48802;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected string $statement;
     
-   /**
-    * @var OperationResult
-    */
+    /**
+     * @var OperationResult
+     */
     protected OperationResult $result;
     
-   /**
-    * @var Mailcode_Parser_Statement_Tokenizer
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Tokenizer
+     */
     protected Mailcode_Parser_Statement_Tokenizer $tokenizer;
     
-   /**
-    * @var Mailcode_Parser_Statement_Info|NULL
-    */
+    /**
+     * @var Mailcode_Parser_Statement_Info|NULL
+     */
     protected ?Mailcode_Parser_Statement_Info $info = null;
 
     /**
@@ -138,7 +138,7 @@ 
         if($unknown)
         {
             $this->result->makeError(
-               t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')',
+                t('Unquoted string literal found:').' ('.htmlspecialchars($unknown->getMatchedText()).')',
                 self::VALIDATION_UNQUOTED_STRING_LITERALS
             );
         }

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
      */
     private ?Mailcode_Commands_Command $sourceCommand = null;
 
-    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/PreParser/CommandDef.php

Spacing +2 added lines, -2 removed lines

@@ -139,11 +139,11 @@
         $commands = $parser->getCommands();
         $content = $this->getContent();
 
-        foreach($commands as $command)
+        foreach ($commands as $command)
         {
             $string = $command->getOpeningText();
 
-            if(strpos($content, $string) !== false)
+            if (strpos($content, $string) !== false)
             {
                 $this->addEscapeError($command, $collection);
                 return false;

src/Mailcode/Parser/Safeguard/PlaceholderCollection.php

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,7 @@ 
      */
     public function getByIndex(int $index) : Mailcode_Parser_Safeguard_Placeholder
     {
-        if(isset($this->placeholders[$index]))
+        if (isset($this->placeholders[$index]))
         {
             return $this->placeholders[$index];
         }
@@ -53,9 +53,9 @@ 
 
     public function getByCommand(Mailcode_Commands_Command $command) : Mailcode_Parser_Safeguard_Placeholder
     {
-        foreach($this->placeholders as $placeholder)
+        foreach ($this->placeholders as $placeholder)
         {
-            if($placeholder->getCommand() === $command)
+            if ($placeholder->getCommand() === $command)
             {
                 return $placeholder;
             }
@@ -77,9 +77,9 @@ 
      */
     public function getByID(int $id) : Mailcode_Parser_Safeguard_Placeholder
     {
-        foreach($this->placeholders as $placeholder)
+        foreach ($this->placeholders as $placeholder)
         {
-            if($placeholder->getID() === $id)
+            if ($placeholder->getID() === $id)
             {
                 return $placeholder;
             }
@@ -104,9 +104,9 @@ 
      */
     public function getByString(string $string) : Mailcode_Parser_Safeguard_Placeholder
     {
-        foreach($this->placeholders as $placeholder)
+        foreach ($this->placeholders as $placeholder)
         {
-            if($placeholder->getReplacementText() === $string)
+            if ($placeholder->getReplacementText() === $string)
             {
                 return $placeholder;
             }
@@ -129,14 +129,14 @@ 
      */
     public function getStrings() : array
     {
-        if(is_array($this->placeholderStrings))
+        if (is_array($this->placeholderStrings))
         {
             return $this->placeholderStrings;
         }
 
         $this->placeholderStrings = array();
 
-        foreach($this->placeholders as $placeholder)
+        foreach ($this->placeholders as $placeholder)
         {
             $this->placeholderStrings[] = $placeholder->getReplacementText();
         }