Mistralys / mailcode

src/Mailcode/Translator/Syntax/ApacheVelocity.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
         
         // All other special characters have to be escaped
         // with two backslashes. 
-        foreach($this->regexSpecialChars as $char)
+        foreach ($this->regexSpecialChars as $char)
         {
             $string = str_replace($char, '\\'.$char, $string);
         }
@@ -83,7 +83,7 @@ 
 
     protected function addURLEncoding(Mailcode_Commands_Command $command, string $statement) : string
     {
-        if($command->isURLEncoded())
+        if ($command->isURLEncoded())
         {
             return sprintf(
                 '${esc.url($%s)}',
@@ -91,7 +91,7 @@ 
             );
         }
 
-        if($command->isURLDecoded())
+        if ($command->isURLDecoded())
         {
             return sprintf(
                 '${esc.unurl($%s)}',

Indentation +11 added lines, -11 removed lines

@@ -21,8 +21,8 @@ 
 abstract class Mailcode_Translator_Syntax_ApacheVelocity extends Mailcode_Translator_Command
 {
     /**
-    * @var string[]
-    */
+     * @var string[]
+     */
     private $regexSpecialChars = array(
         '?',
         '.',
@@ -47,15 +47,15 @@ 
     }
 
     /**
-    * Filters the string for use in an Apache Velocity (Java)
-    * regex string: escapes all special characters.
-    *
-    * Velocity does its own escaping, so no need to escape special
-    * characters as if they were a javascript string.
-    * 
-    * @param string $string
-    * @return string
-    */
+     * Filters the string for use in an Apache Velocity (Java)
+     * regex string: escapes all special characters.
+     *
+     * Velocity does its own escaping, so no need to escape special
+     * characters as if they were a javascript string.
+     * 
+     * @param string $string
+     * @return string
+     */
     public function filterRegexString(string $string) : string
     {
         // Special case: previously escaped quotes. 

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

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
 $error = null;
 $activeSyntax = $syntaxes[0]->getTypeID();
 
-if($request->getBool('translate'))
+if ($request->getBool('translate'))
 {
     $commandsText = $request->getParam('mailcode');
     $activeSyntax = (string)$request->registerParam('syntax')
@@ -47,12 +47,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>';
             }
         }
@@ -119,7 +119,7 @@ 
                             $selected = '';
                             $typeID = $syntax->getTypeID();
 
-                            if($typeID === $activeSyntax) {
+                            if ($typeID === $activeSyntax) {
                                 $selected = ' selected';
                             }
 
@@ -139,7 +139,7 @@ 
         <p></p><br>
         <h2><?php pt('Translated commands') ?></h2>
         <?php
-            if(empty($commandsText))
+            if (empty($commandsText))
             {
                 ?>
                     <div class="alert alert-info">
@@ -147,7 +147,7 @@ 
                     </div>
                 <?php
             }
-            else if($error)
+            else if ($error)
             {
                 ?>
                     <div class="alert alert-danger">

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>

src/Mailcode/Commands.php

Indentation +40 added lines, -40 removed lines

@@ -27,21 +27,21 @@ 
     const ERROR_COMMAND_DOES_NOT_EXIST = 45902;
     const ERROR_INVALID_DUMMY_COMMAND_TYPE = 45903;
     
-   /**
-    * @var Mailcode_Commands_Command[]
-    */
+    /**
+     * @var Mailcode_Commands_Command[]
+     */
     private $commands = array();
     
-   /**
-    * @var array<string,Mailcode_Commands_Command>
-    */
+    /**
+     * @var array<string,Mailcode_Commands_Command>
+     */
     private static $dummyCommands = array();
     
-   /**
-    * Retrieves a list of all available command IDs.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all available command IDs.
+     * 
+     * @return string[]
+     */
     public function getIDs() : array
     {
         static $ids = array();
@@ -87,12 +87,12 @@ 
         return $result;
     }
     
-   /**
-    * Gets an available command by its ID.
-    * 
-    * @param string $id
-    * @return Mailcode_Commands_Command
-    */
+    /**
+     * Gets an available command by its ID.
+     * 
+     * @param string $id
+     * @return Mailcode_Commands_Command
+     */
     public function getByID(string $id) : Mailcode_Commands_Command
     {
         static $instances = array();
@@ -105,15 +105,15 @@ 
         return $instances[$id];
     }
     
-   /**
-    * Retrieves the ID of a command by its name.
-    * 
-    * @param string $name
-    * @throws Mailcode_Exception
-    * @return string
-    * 
-    * @see Mailcode_Commands::ERROR_COMMAND_NAME_DOES_NOT_EXIST
-    */
+    /**
+     * Retrieves the ID of a command by its name.
+     * 
+     * @param string $name
+     * @throws Mailcode_Exception
+     * @return string
+     * 
+     * @see Mailcode_Commands::ERROR_COMMAND_NAME_DOES_NOT_EXIST
+     */
     public function getIDByName(string $name) : string
     {
         $items = $this->getAll();
@@ -142,12 +142,12 @@ 
         return in_array($id, $ids);
     }
     
-   /**
-    * Checks wether the specified name exists.
-    * 
-    * @param string $name For example: "showvar".
-    * @return bool
-    */
+    /**
+     * Checks wether the specified name exists.
+     * 
+     * @param string $name For example: "showvar".
+     * @return bool
+     */
     public function nameExists(string $name) : bool
     {
         $items = $this->getAll();
@@ -201,14 +201,14 @@ 
         return $class;
     }
     
-   /**
-    * Translates the command type to the expected class naming scheme.
-    * 
-    * Example: not-empty => NotEmpty
-    * 
-    * @param string $type
-    * @return string
-    */
+    /**
+     * Translates the command type to the expected class naming scheme.
+     * 
+     * Example: not-empty => NotEmpty
+     * 
+     * @param string $type
+     * @return string
+     */
     private function adjustTypeName(string $type) : string
     {
         $type = str_replace('-', ' ', $type);

Spacing +13 added lines, -13 removed lines

@@ -46,7 +46,7 @@ 
     {
         static $ids = array();
         
-        if(empty($ids)) {
+        if (empty($ids)) {
             $ids = FileHelper::createFileFinder(__DIR__.'/Commands/Command')
             ->getPHPClassNames();
         }
@@ -64,7 +64,7 @@ 
      */
     public function getAll()
     {
-        if(!empty($this->commands)) {
+        if (!empty($this->commands)) {
             return $this->commands;
         }
         
@@ -72,7 +72,7 @@ 
         
         $result = array();
         
-        foreach($ids as $id) 
+        foreach ($ids as $id) 
         {
             $result[] = $this->getDummyCommand($id);
         }
@@ -97,7 +97,7 @@ 
     {
         static $instances = array();
         
-        if(!isset($instances[$id])) 
+        if (!isset($instances[$id])) 
         {
             $instances[$id] = $this->createCommand($id, '__dummy', '', '');
         }
@@ -118,9 +118,9 @@ 
     {
         $items = $this->getAll();
         
-        foreach($items as $item) 
+        foreach ($items as $item) 
         {
-            if($item->getName() === $name) {
+            if ($item->getName() === $name) {
                 return $item->getID();
             }
         }
@@ -152,9 +152,9 @@ 
     {
         $items = $this->getAll();
         
-        foreach($items as $item)
+        foreach ($items as $item)
         {
-            if($item->getName() === $name) {
+            if ($item->getName() === $name) {
                 return true;
             }
         }
@@ -166,7 +166,7 @@ 
     {
         $class = $this->resolveClassName($id, $type);
         
-        if(!class_exists($class))
+        if (!class_exists($class))
         {
             throw new Mailcode_Exception(
                 'No such command',
@@ -188,9 +188,9 @@ 
         
         $dummy = $this->getDummyCommand($id);
         
-        if($dummy->supportsType())
+        if ($dummy->supportsType())
         {
-            if(empty($type))
+            if (empty($type))
             {
                 $type = $dummy->getDefaultType();
             }
@@ -228,14 +228,14 @@ 
      */
     private function getDummyCommand(string $id) : Mailcode_Commands_Command
     {
-        if(isset(self::$dummyCommands[$id])) {
+        if (isset(self::$dummyCommands[$id])) {
             return self::$dummyCommands[$id];
         }
 
         $class = 'Mailcode\Mailcode_Commands_Command_'.$id;
         $cmd = new $class('__dummy');
 
-        if($cmd instanceof Mailcode_Commands_Command)
+        if ($cmd instanceof Mailcode_Commands_Command)
         {
             self::$dummyCommands[$id] = $cmd;
             return $cmd;

tools/extractPhoneCountries.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
     {
         $meta = $phoneNumberUtil->getMetadataForRegion($code);
         if (!$meta) {
-            die('No metadata for ' . $code);
+            die('No metadata for '.$code);
         }
 
         $exampleNumber = $phoneNumberUtil->getExampleNumber($code);

src/Mailcode/Commands/Command/ShowPhone.php

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
     {
         $val = $this->validator->createStringLiteral();
 
-        if($val->isValid())
+        if ($val->isValid())
         {
             $this->sourceFormat = strtoupper($val->getToken()->getText());
             return;
@@ -93,7 +93,7 @@ 
     {
         $countries = self::getSupportedCountries();
 
-        if(isset($countries[$this->sourceFormat])) {
+        if (isset($countries[$this->sourceFormat])) {
             return;
         }
 
@@ -112,7 +112,7 @@ 
      */
     public static function getSupportedCountries() : array
     {
-        if(self::$countriesLoaded) {
+        if (self::$countriesLoaded) {
             return self::$supportedCountries;
         }
 
@@ -120,7 +120,7 @@ 
 
         $data = FileHelper::parseJSONFile(__DIR__.'/ShowPhone/numbers.json');
 
-        foreach($data as $code => $def)
+        foreach ($data as $code => $def)
         {
             $code = strval($code);
 

src/Mailcode/Factory/CommandSets/Set/If.php

Spacing +39 added lines, -39 removed lines

@@ -20,11 +20,11 @@ 
  */
 class Mailcode_Factory_CommandSets_Set_If extends Mailcode_Factory_CommandSets_IfBase
 {
-    public function if(string $condition, string $type='') : Mailcode_Commands_Command_If
+    public function if (string $condition, string $type = '') : Mailcode_Commands_Command_If
     {
         $command = $this->instantiator->buildIf('If', $condition, $type);
         
-        if($command instanceof Mailcode_Commands_Command_If)
+        if ($command instanceof Mailcode_Commands_Command_If)
         {
             return $command;
         }
@@ -32,11 +32,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('If', $command);
     }
     
-    public function var(string $variable, string $operand, string $value, bool $quoteValue=false, bool $insensitive=false) : Mailcode_Commands_Command_If_Variable
+    public function var(string $variable, string $operand, string $value, bool $quoteValue = false, bool $insensitive = false) : Mailcode_Commands_Command_If_Variable
     {
         $command = $this->instantiator->buildIfVar('If', $variable, $operand, $value, $quoteValue, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -44,11 +44,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfVar', $command);
     }
     
-    public function varString(string $variable, string $operand, string $value, bool $insensitive=false) : Mailcode_Commands_Command_If_Variable
+    public function varString(string $variable, string $operand, string $value, bool $insensitive = false) : Mailcode_Commands_Command_If_Variable
     {
         $command = $this->instantiator->buildIfVar('If', $variable, $operand, $value, true, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -56,11 +56,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfVarString', $command);
     }
     
-    public function varEquals(string $variable, string $value, bool $quoteValue=false, bool $insensitive=false) : Mailcode_Commands_Command_If_Variable
+    public function varEquals(string $variable, string $value, bool $quoteValue = false, bool $insensitive = false) : Mailcode_Commands_Command_If_Variable
     {
         $command = $this->instantiator->buildIfVar('If', $variable, '==', $value, $quoteValue, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -68,11 +68,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfVarEquals', $command);
     }
     
-    public function varEqualsString(string $variable, string $value, bool $insensitive=false) : Mailcode_Commands_Command_If
+    public function varEqualsString(string $variable, string $value, bool $insensitive = false) : Mailcode_Commands_Command_If
     {
         $command = $this->instantiator->buildIfVar('If', $variable, '==', $value, true, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -80,11 +80,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfarEqualsString', $command);
     }
     
-    public function varNotEquals(string $variable, string $value, bool $quoteValue=false, bool $insensitive=false) : Mailcode_Commands_Command_If_Variable
+    public function varNotEquals(string $variable, string $value, bool $quoteValue = false, bool $insensitive = false) : Mailcode_Commands_Command_If_Variable
     {
         $command = $this->instantiator->buildIfVar('If', $variable, '!=', $value, $quoteValue, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -92,11 +92,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfVarNotEquals', $command);
     }
     
-    public function varNotEqualsString(string $variable, string $value, bool $insensitive=false) : Mailcode_Commands_Command_If_Variable
+    public function varNotEqualsString(string $variable, string $value, bool $insensitive = false) : Mailcode_Commands_Command_If_Variable
     {
         $command = $this->instantiator->buildIfVar('If', $variable, '!=', $value, true, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_Variable)
+        if ($command instanceof Mailcode_Commands_Command_If_Variable)
         {
             return $command;
         }
@@ -108,7 +108,7 @@ 
     {
         $command = $this->instantiator->buildIfEmpty('If', $variable);
         
-        if($command instanceof Mailcode_Commands_Command_If_Empty)
+        if ($command instanceof Mailcode_Commands_Command_If_Empty)
         {
             return $command;
         }
@@ -120,7 +120,7 @@ 
     {
         $command = $this->instantiator->buildIfNotEmpty('If', $variable);
         
-        if($command instanceof Mailcode_Commands_Command_If_NotEmpty)
+        if ($command instanceof Mailcode_Commands_Command_If_NotEmpty)
         {
             return $command;
         }
@@ -135,11 +135,11 @@ 
      * @return Mailcode_Commands_Command_If_Contains
      * @throws Mailcode_Factory_Exception
      */
-    public function contains(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_Contains
+    public function contains(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_Contains
     {
         $command = $this->instantiator->buildIfContains('If', $variable, $searchTerms, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_Contains)
+        if ($command instanceof Mailcode_Commands_Command_If_Contains)
         {
             return $command;
         }
@@ -154,11 +154,11 @@ 
      * @return Mailcode_Commands_Command_If_NotContains
      * @throws Mailcode_Factory_Exception
      */
-    public function notContains(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_NotContains
+    public function notContains(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_NotContains
     {
         $command = $this->instantiator->buildIfNotContains('If', $variable, $searchTerms, $caseInsensitive);
 
-        if($command instanceof Mailcode_Commands_Command_If_NotContains)
+        if ($command instanceof Mailcode_Commands_Command_If_NotContains)
         {
             return $command;
         }
@@ -174,11 +174,11 @@ 
      * @return Mailcode_Commands_Command_If_ListContains
      * @throws Mailcode_Factory_Exception
      */
-    public function listContains(string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_Command_If_ListContains
+    public function listContains(string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_Command_If_ListContains
     {
         $command = $this->instantiator->buildIfListContains('If', $variable, $searchTerms, $caseInsensitive, $regexEnabled, 'list-contains');
 
-        if($command instanceof Mailcode_Commands_Command_If_ListContains)
+        if ($command instanceof Mailcode_Commands_Command_If_ListContains)
         {
             return $command;
         }
@@ -193,11 +193,11 @@ 
      * @return Mailcode_Commands_Command_If_ListEquals
      * @throws Mailcode_Factory_Exception
      */
-    public function listEquals(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_ListEquals
+    public function listEquals(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_ListEquals
     {
         $command = $this->instantiator->buildIfListContains('If', $variable, $searchTerms, $caseInsensitive, false, 'list-equals');
 
-        if($command instanceof Mailcode_Commands_Command_If_ListEquals)
+        if ($command instanceof Mailcode_Commands_Command_If_ListEquals)
         {
             return $command;
         }
@@ -213,11 +213,11 @@ 
      * @return Mailcode_Commands_Command_If_ListNotContains
      * @throws Mailcode_Factory_Exception
      */
-    public function listNotContains(string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_Command_If_ListNotContains
+    public function listNotContains(string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_Command_If_ListNotContains
     {
         $command = $this->instantiator->buildIfListNotContains('If', $variable, $searchTerms, $caseInsensitive, $regexEnabled);
 
-        if($command instanceof Mailcode_Commands_Command_If_ListNotContains)
+        if ($command instanceof Mailcode_Commands_Command_If_ListNotContains)
         {
             return $command;
         }
@@ -233,11 +233,11 @@ 
      * @return Mailcode_Commands_Command_If_ListBeginsWith
      * @throws Mailcode_Factory_Exception
      */
-    public function listBeginsWith(string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_Command_If_ListBeginsWith
+    public function listBeginsWith(string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_Command_If_ListBeginsWith
     {
-        $command = $this->instantiator->buildIfListContains('If', $variable, $searchTerms, $caseInsensitive, $regexEnabled,'list-begins-with');
+        $command = $this->instantiator->buildIfListContains('If', $variable, $searchTerms, $caseInsensitive, $regexEnabled, 'list-begins-with');
 
-        if($command instanceof Mailcode_Commands_Command_If_ListBeginsWith)
+        if ($command instanceof Mailcode_Commands_Command_If_ListBeginsWith)
         {
             return $command;
         }
@@ -253,11 +253,11 @@ 
      * @return Mailcode_Commands_Command_If_ListEndsWith
      * @throws Mailcode_Factory_Exception
      */
-    public function listEndsWith(string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_Command_If_ListEndsWith
+    public function listEndsWith(string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_Command_If_ListEndsWith
     {
-        $command = $this->instantiator->buildIfListContains('If', $variable, $searchTerms, $caseInsensitive, $regexEnabled,'list-ends-with');
+        $command = $this->instantiator->buildIfListContains('If', $variable, $searchTerms, $caseInsensitive, $regexEnabled, 'list-ends-with');
 
-        if($command instanceof Mailcode_Commands_Command_If_ListEndsWith)
+        if ($command instanceof Mailcode_Commands_Command_If_ListEndsWith)
         {
             return $command;
         }
@@ -265,11 +265,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfListEndsWith', $command);
     }
 
-    public function beginsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_BeginsWith
+    public function beginsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_BeginsWith
     {
         $command = $this->instantiator->buildIfBeginsWith('If', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_BeginsWith)
+        if ($command instanceof Mailcode_Commands_Command_If_BeginsWith)
         {
             return $command;
         }
@@ -277,11 +277,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('IfBeginsWith', $command);
     }
     
-    public function endsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_If_EndsWith
+    public function endsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_If_EndsWith
     {
         $command = $this->instantiator->buildIfEndsWith('If', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_If_EndsWith)
+        if ($command instanceof Mailcode_Commands_Command_If_EndsWith)
         {
             return $command;
         }
@@ -293,7 +293,7 @@ 
     {
         $command = $this->instantiator->buildIfBiggerThan('If', $variable, $value);
 
-        if($command instanceof Mailcode_Commands_Command_If_BiggerThan)
+        if ($command instanceof Mailcode_Commands_Command_If_BiggerThan)
         {
             return $command;
         }
@@ -305,7 +305,7 @@ 
     {
         $command = $this->instantiator->buildIfSmallerThan('If', $variable, $value);
 
-        if($command instanceof Mailcode_Commands_Command_If_SmallerThan)
+        if ($command instanceof Mailcode_Commands_Command_If_SmallerThan)
         {
             return $command;
         }
@@ -317,7 +317,7 @@ 
     {
         $command = $this->instantiator->buildIfEquals('If', $variable, $value);
 
-        if($command instanceof Mailcode_Commands_Command_If_EqualsNumber)
+        if ($command instanceof Mailcode_Commands_Command_If_EqualsNumber)
         {
             return $command;
         }

src/Mailcode/Factory/CommandSets/Set/ElseIf.php

Spacing +37 added lines, -37 removed lines

@@ -20,11 +20,11 @@ 
  */
 class Mailcode_Factory_CommandSets_Set_ElseIf extends Mailcode_Factory_CommandSets_IfBase
 {
-    public function elseIf(string $condition, string $type='') : Mailcode_Commands_Command_ElseIf
+    public function elseIf (string $condition, string $type = '') : Mailcode_Commands_Command_ElseIf
     {
         $command = $this->instantiator->buildIf('ElseIf', $condition, $type);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf)
         {
             return $command;
         }
@@ -32,11 +32,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIf', $command);
     }
     
-    public function var(string $variable, string $operand, string $value, bool $quoteValue=false, bool $insensitive=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function var(string $variable, string $operand, string $value, bool $quoteValue = false, bool $insensitive = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, $operand, $value, $quoteValue, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -44,11 +44,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfVariable', $command);
     }
     
-    public function varString(string $variable, string $operand, string $value, bool $insensitive=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function varString(string $variable, string $operand, string $value, bool $insensitive = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, $operand, $value, true, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -56,11 +56,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfVarString', $command);
     }
     
-    public function varEquals(string $variable, string $value, bool $quoteValue=false, bool $insensitive=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function varEquals(string $variable, string $value, bool $quoteValue = false, bool $insensitive = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '==', $value, $quoteValue, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -68,11 +68,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfVarEquals', $command);
     }
     
-    public function varEqualsString(string $variable, string $value, bool $insensitive=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function varEqualsString(string $variable, string $value, bool $insensitive = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '==', $value, true, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -80,11 +80,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfVarEqualsString', $command);
     }
     
-    public function varNotEquals(string $variable, string $value, bool $quoteValue=false, bool $insensitive=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function varNotEquals(string $variable, string $value, bool $quoteValue = false, bool $insensitive = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '!=', $value, $quoteValue, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -92,11 +92,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfVarNotEquals', $command);
     }
     
-    public function varNotEqualsString(string $variable, string $value, bool $insensitive=false) : Mailcode_Commands_Command_ElseIf_Variable
+    public function varNotEqualsString(string $variable, string $value, bool $insensitive = false) : Mailcode_Commands_Command_ElseIf_Variable
     {
         $command = $this->instantiator->buildIfVar('ElseIf', $variable, '!=', $value, true, $insensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Variable)
         {
             return $command;
         }
@@ -111,11 +111,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_Contains
      * @throws Mailcode_Factory_Exception
      */
-    public function contains(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_Contains
+    public function contains(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_Contains
     {
         $command = $this->instantiator->buildIfContains('ElseIf', $variable, $searchTerms, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Contains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Contains)
         {
             return $command;
         }
@@ -130,11 +130,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_NotContains
      * @throws Mailcode_Factory_Exception
      */
-    public function notContains(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_NotContains
+    public function notContains(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_NotContains
     {
         $command = $this->instantiator->buildIfNotContains('ElseIf', $variable, $searchTerms, $caseInsensitive);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_NotContains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_NotContains)
         {
             return $command;
         }
@@ -150,11 +150,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_ListContains
      * @throws Mailcode_Factory_Exception
      */
-    public function listContains(string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_Command_ElseIf_ListContains
+    public function listContains(string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_Command_ElseIf_ListContains
     {
         $command = $this->instantiator->buildIfListContains('ElseIf', $variable, $searchTerms, $caseInsensitive, $regexEnabled);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_ListContains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_ListContains)
         {
             return $command;
         }
@@ -169,11 +169,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_ListEquals
      * @throws Mailcode_Factory_Exception
      */
-    public function listEquals(string $variable, array $searchTerms, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_ListEquals
+    public function listEquals(string $variable, array $searchTerms, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_ListEquals
     {
         $command = $this->instantiator->buildIfListContains('ElseIf', $variable, $searchTerms, $caseInsensitive, false, 'list-equals');
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_ListEquals)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_ListEquals)
         {
             return $command;
         }
@@ -189,11 +189,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_ListNotContains
      * @throws Mailcode_Factory_Exception
      */
-    public function listNotContains(string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_Command_ElseIf_ListNotContains
+    public function listNotContains(string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_Command_ElseIf_ListNotContains
     {
         $command = $this->instantiator->buildIfListNotContains('ElseIf', $variable, $searchTerms, $caseInsensitive, $regexEnabled);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_ListNotContains)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_ListNotContains)
         {
             return $command;
         }
@@ -209,11 +209,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_ListBeginsWith
      * @throws Mailcode_Factory_Exception
      */
-    public function listBeginsWith(string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_Command_ElseIf_ListBeginsWith
+    public function listBeginsWith(string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_Command_ElseIf_ListBeginsWith
     {
         $command = $this->instantiator->buildIfListContains('ElseIf', $variable, $searchTerms, $caseInsensitive, $regexEnabled, 'list-begins-with');
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_ListBeginsWith)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_ListBeginsWith)
         {
             return $command;
         }
@@ -229,11 +229,11 @@ 
      * @return Mailcode_Commands_Command_ElseIf_ListEndsWith
      * @throws Mailcode_Factory_Exception
      */
-    public function listEndsWith(string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_Command_ElseIf_ListEndsWith
+    public function listEndsWith(string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_Command_ElseIf_ListEndsWith
     {
         $command = $this->instantiator->buildIfListContains('ElseIf', $variable, $searchTerms, $caseInsensitive, $regexEnabled, 'list-ends-with');
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_ListEndsWith)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_ListEndsWith)
         {
             return $command;
         }
@@ -241,11 +241,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfListEndsWith', $command);
     }
 
-    public function beginsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_BeginsWith
+    public function beginsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_BeginsWith
     {
         $command = $this->instantiator->buildIfBeginsWith('ElseIf', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_BeginsWith)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_BeginsWith)
         {
             return $command;
         }
@@ -253,11 +253,11 @@ 
         throw $this->instantiator->exceptionUnexpectedType('ElseIfBeginsWith', $command);
     }
     
-    public function endsWith(string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_Command_ElseIf_EndsWith
+    public function endsWith(string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_Command_ElseIf_EndsWith
     {
         $command = $this->instantiator->buildIfEndsWith('ElseIf', $variable, $search, $caseInsensitive);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_EndsWith)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_EndsWith)
         {
             return $command;
         }
@@ -269,7 +269,7 @@ 
     {
         $command = $this->instantiator->buildIfEmpty('ElseIf', $variable);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_Empty)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_Empty)
         {
             return $command;
         }
@@ -281,7 +281,7 @@ 
     {
         $command = $this->instantiator->buildIfNotEmpty('ElseIf', $variable);
         
-        if($command instanceof Mailcode_Commands_Command_ElseIf_NotEmpty)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_NotEmpty)
         {
             return $command;
         }
@@ -293,7 +293,7 @@ 
     {
         $command = $this->instantiator->buildIfBiggerThan('ElseIf', $variable, $value);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_BiggerThan)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_BiggerThan)
         {
             return $command;
         }
@@ -305,7 +305,7 @@ 
     {
         $command = $this->instantiator->buildIfSmallerThan('ElseIf', $variable, $value);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_SmallerThan)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_SmallerThan)
         {
             return $command;
         }
@@ -317,7 +317,7 @@ 
     {
         $command = $this->instantiator->buildIfEquals('ElseIf', $variable, $value);
 
-        if($command instanceof Mailcode_Commands_Command_ElseIf_EqualsNumber)
+        if ($command instanceof Mailcode_Commands_Command_ElseIf_EqualsNumber)
         {
             return $command;
         }

src/Mailcode/Factory/Instantiator.php

Spacing +21 added lines, -21 removed lines

@@ -20,11 +20,11 @@ 
  */
 class Mailcode_Factory_Instantiator
 {
-    public function buildIf(string $ifType, string $params, string $type='') : Mailcode_Commands_IfBase
+    public function buildIf(string $ifType, string $params, string $type = '') : Mailcode_Commands_IfBase
     {
         $stringType = $type;
         
-        if(!empty($type))
+        if (!empty($type))
         {
             $stringType = ' '.$type;
         }
@@ -43,7 +43,7 @@ 
         
         $this->checkCommand($command);
         
-        if($command instanceof Mailcode_Commands_IfBase)
+        if ($command instanceof Mailcode_Commands_IfBase)
         {
             return $command;
         }
@@ -51,16 +51,16 @@ 
         throw $this->exceptionUnexpectedType('IfBase', $command);
     }
     
-    public function buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue=false, bool $insensitive=false) : Mailcode_Commands_IfBase
+    public function buildIfVar(string $ifType, string $variable, string $operand, string $value, bool $quoteValue = false, bool $insensitive = false) : Mailcode_Commands_IfBase
     {
         $variable = $this->filterVariableName($variable);
 
-        if($insensitive)
+        if ($insensitive)
         {
             $value = mb_strtolower($value);
         }
 
-        if($quoteValue)
+        if ($quoteValue)
         {
             $value = $this->quoteString($value);
         }
@@ -72,7 +72,7 @@ 
             $value
         );
 
-        if($insensitive)
+        if ($insensitive)
         {
             $condition .= ' '.Mailcode_Commands_Keywords::TYPE_INSENSITIVE;
         }
@@ -100,7 +100,7 @@ 
      * @return Mailcode_Commands_IfBase
      * @throws Mailcode_Factory_Exception
      */
-    public function buildIfContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false, string $containsType='contains') : Mailcode_Commands_IfBase
+    public function buildIfContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false, string $containsType = 'contains') : Mailcode_Commands_IfBase
     {
         $condition = sprintf(
             '%s%s"%s"',
@@ -112,23 +112,23 @@ 
         return $this->buildIf($ifType, $condition, $containsType);
     }
 
-    private function renderListKeywords(bool $caseInsensitive=false, bool $regexEnabled=false) : string
+    private function renderListKeywords(bool $caseInsensitive = false, bool $regexEnabled = false) : string
     {
         $keywords = array();
 
-        if($caseInsensitive)
+        if ($caseInsensitive)
         {
             $keywords[] = Mailcode_Commands_Keywords::TYPE_INSENSITIVE;
         }
 
-        if($regexEnabled)
+        if ($regexEnabled)
         {
             $keywords[] = Mailcode_Commands_Keywords::TYPE_REGEX;
         }
 
         $keywordsString = '';
 
-        if(!empty($keywords))
+        if (!empty($keywords))
         {
             $keywordsString = ' '.implode(' ', $keywords);
         }
@@ -145,7 +145,7 @@ 
      * @return Mailcode_Commands_IfBase
      * @throws Mailcode_Factory_Exception
      */
-    public function buildIfNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_IfBase
+    public function buildIfNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_IfBase
     {
         return $this->buildIfContains($ifType, $variable, $searchTerms, $caseInsensitive, $regexEnabled, 'not-contains');
     }
@@ -160,7 +160,7 @@ 
      * @return Mailcode_Commands_IfBase
      * @throws Mailcode_Factory_Exception
      */
-    public function buildIfListContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false, string $containsType='list-contains') : Mailcode_Commands_IfBase
+    public function buildIfListContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false, string $containsType = 'list-contains') : Mailcode_Commands_IfBase
     {
         return $this->buildIfContains($ifType, $variable, $searchTerms, $caseInsensitive, $regexEnabled, $containsType);
     }
@@ -174,17 +174,17 @@ 
      * @return Mailcode_Commands_IfBase
      * @throws Mailcode_Factory_Exception
      */
-    public function buildIfListNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive=false, bool $regexEnabled=false) : Mailcode_Commands_IfBase
+    public function buildIfListNotContains(string $ifType, string $variable, array $searchTerms, bool $caseInsensitive = false, bool $regexEnabled = false) : Mailcode_Commands_IfBase
     {
         return $this->buildIfContains($ifType, $variable, $searchTerms, $caseInsensitive, $regexEnabled, 'list-not-contains');
     }
 
-    public function buildIfBeginsWith(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    public function buildIfBeginsWith(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         return $this->buildIfSearch($ifType, 'begins-with', $variable, $search, $caseInsensitive);
     }
     
-    public function buildIfEndsWith(string $ifType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    public function buildIfEndsWith(string $ifType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         return $this->buildIfSearch($ifType, 'ends-with', $variable, $search, $caseInsensitive);
     }
@@ -234,11 +234,11 @@ 
         );
     }
 
-    private function buildIfSearch(string $ifType, string $subType, string $variable, string $search, bool $caseInsensitive=false) : Mailcode_Commands_IfBase
+    private function buildIfSearch(string $ifType, string $subType, string $variable, string $search, bool $caseInsensitive = false) : Mailcode_Commands_IfBase
     {
         $keyword = ' ';
         
-        if($caseInsensitive)
+        if ($caseInsensitive)
         {
             $keyword = ' '.Mailcode_Commands_Keywords::TYPE_INSENSITIVE;
         }
@@ -267,7 +267,7 @@ 
     
     public function checkCommand(Mailcode_Commands_Command $command) : void
     {
-        if($command->isValid())
+        if ($command->isValid())
         {
             return;
         }
@@ -318,7 +318,7 @@ 
      */
     public function quoteString(string $string) : string
     {
-        if(substr($string, 0, 1) === '"' && substr($string, -1, 1) === '"') {
+        if (substr($string, 0, 1) === '"' && substr($string, -1, 1) === '"') {
             return $string;
         }