Mistralys / mailcode

src/Mailcode/Translator/Syntax/ApacheVelocity/Base/AbstractIf.php

Spacing +6 added lines, -6 removed lines

@@ -33,11 +33,11 @@ 
         
         $keywords = $command->getLogicKeywords()->getKeywords();
         
-        foreach($keywords as $keyword)
+        foreach ($keywords as $keyword)
         {
             $keyCommand = $keyword->getCommand();
             
-            if($keyCommand instanceof Mailcode_Commands_IfBase)
+            if ($keyCommand instanceof Mailcode_Commands_IfBase)
             {
                 $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand);
             }
@@ -60,7 +60,7 @@ 
     
     protected function getSign(Mailcode_Commands_LogicKeywords_Keyword $keyword) : string
     {
-        switch($keyword->getName())
+        switch ($keyword->getName())
         {
             case 'and':
                 return '&&';
@@ -83,7 +83,7 @@ 
     {
         $sign = '';
         
-        if($notEmpty)
+        if ($notEmpty)
         {
             $sign = '!';
         }
@@ -99,7 +99,7 @@ 
     {
         $params = $command->getParams();
         
-        if(!$params)
+        if (!$params)
         {
             return '';
         }
@@ -120,7 +120,7 @@ 
     protected function _translateContains(Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string
     {
         $opts = 's';
-        if($caseSensitive)
+        if ($caseSensitive)
         {
             $opts = 'is';
         }

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
             if($keyCommand instanceof Mailcode_Commands_IfBase)
             {
                 $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand);
-            }
-            else
+            } else
             {
                 throw new Mailcode_Exception(
                     'Keyword command type does not match expected base class.',

src/Mailcode/Commands/LogicKeywords.php

Indentation +45 added lines, -45 removed lines

@@ -31,27 +31,27 @@ 
     const VALIDATION_CANNOT_MIX_LOGIC_KEYWORDS = 60701;
     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)
@@ -136,9 +136,9 @@ 
         }
     }
     
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     private function detectParameters() : array
     {
         $params = $this->paramsString;
@@ -156,13 +156,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();
@@ -187,22 +187,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();
@@ -220,23 +220,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(
@@ -109,7 +109,7 @@ 
     
     private function splitParams() : void
     {
-        if(empty($this->keywords))
+        if (empty($this->keywords))
         {
             $this->mainParams = $this->paramsString;
             
@@ -118,13 +118,13 @@ 
         
         $params = $this->detectParameters();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $kParams = array_shift($params);
             
             $keyword->setParamsString($kParams);
             
-            if(!$keyword->isValid())
+            if (!$keyword->isValid())
             {
                 $this->makeError(
                     t('Error #%1$s:', $keyword->getCode()).' '.$keyword->getErrorMessage(),
@@ -144,7 +144,7 @@ 
         $params = $this->paramsString;
         $stack = array();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $params = $this->detectParamsKeyword($params, $keyword, $stack);
         }
@@ -168,7 +168,7 @@ 
         $search = $keyword->getMatchedString();
         $pos = strpos($params, $search, 0);
         
-        if($pos === false)
+        if ($pos === false)
         {
             throw new Mailcode_Exception(
                 'Keyword matched string not found',
@@ -180,7 +180,7 @@ 
         $length = strlen($search);
         
         $store = substr($params, 0, $pos);
-        $params = trim(substr($params, $pos+$length));
+        $params = trim(substr($params, $pos + $length));
         
         $stack[] = $store;
         
@@ -207,11 +207,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;
             }
@@ -244,7 +244,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();
         }
@@ -252,7 +252,7 @@ 
         $amount = count($matches[0]);
         $result = array();
         
-        for($i=0; $i < $amount; $i++)
+        for ($i = 0; $i < $amount; $i++)
         {
             $result[] = $this->createKeyword(
                 $name, 
@@ -269,22 +269,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',
@@ -305,13 +305,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/Commands/LogicKeywords/Keyword.php

Indentation +51 added lines, -51 removed lines

@@ -26,39 +26,39 @@ 
     const ERROR_CANNOT_GET_INVALID_COMMAND = 60601;
     const ERROR_CANNOT_OVERWRITE_PARAMETERS = 60602;
     
-   /**
-    * @var Mailcode_Commands_LogicKeywords
-    */
+    /**
+     * @var Mailcode_Commands_LogicKeywords
+     */
     private $keywords;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $name;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $keywordType;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $matchedString;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $params = '';
     
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     private $paramsSet = false;
     
-   /**
-    * @var Mailcode_Collection
-    */
+    /**
+     * @var Mailcode_Collection
+     */
     private $collection;
     
     public function __construct(Mailcode_Commands_LogicKeywords $keywords, string $name, string $matchedString, string $type)
@@ -69,10 +69,10 @@ 
         $this->matchedString = $matchedString;
     }
     
-   /**
-    * The keyword name, e.g. "and". Always lowercase.
-    * @return string
-    */
+    /**
+     * The keyword name, e.g. "and". Always lowercase.
+     * @return string
+     */
     public function getName() : string
     {
         return $this->name;
@@ -95,24 +95,24 @@ 
         return $string;
     }
     
-   /**
-    * The full string that was matched in the command's parameters
-    * string. Examples: "and:", "and variable:"...
-    * 
-    * @return string
-    */
+    /**
+     * The full string that was matched in the command's parameters
+     * string. Examples: "and:", "and variable:"...
+     * 
+     * @return string
+     */
     public function getMatchedString() : string
     {
         return $this->matchedString;
     }
     
-   /**
-    * Sets the parameters string matching this logic keyword,
-    * which is used to build the actual sub-command. Set by
-    * the LogicKeywords class instance.
-    * 
-    * @param string $params
-    */
+    /**
+     * Sets the parameters string matching this logic keyword,
+     * which is used to build the actual sub-command. Set by
+     * the LogicKeywords class instance.
+     * 
+     * @param string $params
+     */
     public function setParamsString(string $params) : void
     {
         if($this->paramsSet)
@@ -130,13 +130,13 @@ 
         $this->createCommand();
     }
     
-   /**
-    * Retrieves the full command string used to create 
-    * the actual command. For opening commands like IF,
-    * this includes the closing {end} command.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the full command string used to create 
+     * the actual command. For opening commands like IF,
+     * this includes the closing {end} command.
+     * 
+     * @return string
+     */
     public function getCommandString() : string
     {
         $command = $this->keywords->getCommand();
@@ -169,12 +169,12 @@ 
         }
     }
     
-   /**
-    * Retrieves the command for the keyword.
-    * 
-    * @throws Mailcode_Exception
-    * @return Mailcode_Commands_Command
-    */
+    /**
+     * Retrieves the command for the keyword.
+     * 
+     * @throws Mailcode_Exception
+     * @return Mailcode_Commands_Command
+     */
     public function getCommand() : Mailcode_Commands_Command
     {
         $command = $this->collection->getFirstCommand();

Spacing +5 added lines, -5 removed lines

@@ -87,7 +87,7 @@ 
     {
         $string = $this->name;
         
-        if(!empty($this->keywordType))
+        if (!empty($this->keywordType))
         {
             $string .= ' '.$this->keywordType;
         }
@@ -115,7 +115,7 @@ 
     */
     public function setParamsString(string $params) : void
     {
-        if($this->paramsSet)
+        if ($this->paramsSet)
         {
             throw new Mailcode_Exception(
                 'Cannot set parameters twice',
@@ -149,7 +149,7 @@ 
         );
         
         // automatically close opening commands to be able to parse valid strings.
-        if($command instanceof Mailcode_Commands_Command_Type_Opening)
+        if ($command instanceof Mailcode_Commands_Command_Type_Opening)
         {
             $string .= '{end}';
         }
@@ -161,7 +161,7 @@ 
     {
         $this->collection = Mailcode::create()->parseString($this->getCommandString());
         
-        if(!$this->collection->isValid())
+        if (!$this->collection->isValid())
         {
             $error = $this->collection->getFirstError();
             
@@ -179,7 +179,7 @@ 
     {
         $command = $this->collection->getFirstCommand();
         
-        if($this->collection->isValid() && $command !== null)
+        if ($this->collection->isValid() && $command !== null)
         {
             return $command;
         }