Mistralys / mailcode

src/Mailcode/Traits/Commands/Validation/NamespaceTrait.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 
         if (!$token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) {
             $this->validationResult->makeError(
-                t('Invalid namespace token:') . ' ' . t('Expected a string.'),
+                t('Invalid namespace token:').' '.t('Expected a string.'),
                 NamespaceInterface::VALIDATION_NAMESPACE_WRONG_TYPE
             );
             return;
@@ -61,7 +61,7 @@ 
     {
         $token = $this->getNamespaceToken();
 
-        if($token !== null) {
+        if ($token !== null) {
             return $token;
         }
 

src/Mailcode/Commands/LogicKeywords.php

Indentation +39 added lines, -39 removed lines

@@ -31,17 +31,17 @@ 
 
     private string $paramsString;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     private array $names = array(
         'and', 
         'or'
     );
     
-   /**
-    * @var Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * @var Mailcode_Commands_LogicKeywords_Keyword[]
+     */
     private array $keywords = array();
     
     private string $mainParams = '';
@@ -128,9 +128,9 @@ 
         }
     }
     
-   /**
-    * @return string[]
-    */
+    /**
+     * @return string[]
+     */
     private function detectParameters() : array
     {
         $params = $this->paramsString;
@@ -148,13 +148,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();
@@ -189,22 +189,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 detected in the
-    * command's parameter string, if any.
-    * 
-    * @return Mailcode_Commands_LogicKeywords_Keyword[]
-    */
+    /**
+     * Retrieves all keywords detected in the
+     * command's parameter 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 +21 added lines, -21 removed lines

@@ -63,9 +63,9 @@ 
     
     private function parse() : void
     {
-        foreach($this->names as $name)
+        foreach ($this->names as $name)
         {
-            if(stripos($this->paramsString, $name) === false) {
+            if (stripos($this->paramsString, $name) === false) {
                 continue;
             }
 
@@ -81,7 +81,7 @@ 
         $names = $this->getDetectedNames();
         $amount = count($names);
         
-        if($amount > 1)
+        if ($amount > 1)
         {
             $this->makeError(
                 t(
@@ -101,7 +101,7 @@ 
     
     private function splitParams() : void
     {
-        if(empty($this->keywords))
+        if (empty($this->keywords))
         {
             $this->mainParams = $this->paramsString;
             
@@ -110,13 +110,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(),
@@ -136,7 +136,7 @@ 
         $params = $this->paramsString;
         $stack = array();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $params = $this->detectParamsKeyword($params, $keyword, $stack);
         }
@@ -160,7 +160,7 @@ 
         $search = $keyword->getMatchedString();
         $pos = strpos($params, $search, 0);
         
-        if($pos === false)
+        if ($pos === false)
         {
             throw new Mailcode_Exception(
                 'Keyword matched string not found',
@@ -173,7 +173,7 @@ 
         
         $store = substr($params, 0, $pos);
 
-        if($store === false)
+        if ($store === false)
         {
             throw new Mailcode_Exception(
                 'Keyword substring not found',
@@ -182,7 +182,7 @@ 
             );
         }
 
-        $params = trim(substr($params, $pos+$length));
+        $params = trim(substr($params, $pos + $length));
         
         $stack[] = $store;
         
@@ -209,11 +209,11 @@ 
     {
         $names = array();
         
-        foreach($this->keywords as $keyword)
+        foreach ($this->keywords as $keyword)
         {
             $name = $keyword->getName();
             
-            if(!in_array($name, $names, true)) {
+            if (!in_array($name, $names, true)) {
                 $names[] = $name;
             }
         }
@@ -245,14 +245,14 @@ 
         $matches = array();
         preg_match_all($regex, $this->paramsString, $matches, PREG_PATTERN_ORDER);
         
-        if(empty($matches[0][0])) {
+        if (empty($matches[0][0])) {
             return array();
         }
         
         $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/Translator/BaseSyntax.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
             $command->getID()
         );
 
-        if(!class_exists($class))
+        if (!class_exists($class))
         {
             throw new Mailcode_Translator_Exception(
                 sprintf('Unknown command %s in translator', $command->getID()),
@@ -58,7 +58,7 @@ 
         
         $translator = new $class($this);
 
-        if($translator instanceof BaseCommandTranslation)
+        if ($translator instanceof BaseCommandTranslation)
         {
             return $translator;
         }
@@ -82,7 +82,7 @@ 
     {
         $subject = $safeguard->makeSafe();
         
-        if(!$safeguard->hasPlaceholders())
+        if (!$safeguard->hasPlaceholders())
         {
             return $subject;
         }
@@ -91,7 +91,7 @@ 
         
         $replaces = array();
         
-        foreach($placeholders as $placeholder)
+        foreach ($placeholders as $placeholder)
         {
             $command = $placeholder->getCommand();
 

src/Mailcode/Translator/Syntax/BaseApacheVelocityCommandTranslation.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
         // All other special characters have to be escaped
         // with two backslashes.
         foreach ($this->regexSpecialChars as $char) {
-            $string = str_replace($char, '\\' . $char, $string);
+            $string = str_replace($char, '\\'.$char, $string);
         }
 
         // Restore the escaped quotes, which stay escaped
@@ -141,20 +141,20 @@ 
         if ($currencyToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) {
             $displayedCurrency = $currencyToken->getNormalized();
         } else if ($currencyToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) {
-            $displayedCurrency = '"' . $currencyToken->getText() . '"';
+            $displayedCurrency = '"'.$currencyToken->getText().'"';
         } else if ($withCurrencyName) {
-            $displayedCurrency = '"' . $localCurrency->getCurrencyName() . '"';
+            $displayedCurrency = '"'.$localCurrency->getCurrencyName().'"';
         } else {
-            $displayedCurrency = '"' . $localCurrency->getCurrencySymbol() . '"';
+            $displayedCurrency = '"'.$localCurrency->getCurrencySymbol().'"';
         }
 
         $regionToken = $localCurrency->getRegion();
         if ($regionToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) {
             $displayedCountry = $regionToken->getNormalized();
         } else if ($regionToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) {
-            $displayedCountry = '"' . $regionToken->getText() . '"';
+            $displayedCountry = '"'.$regionToken->getText().'"';
         } else {
-            $displayedCountry = '"' . $localCurrency->getCountry() . '"';
+            $displayedCountry = '"'.$localCurrency->getCountry().'"';
         }
 
         return sprintf(

src/Mailcode/Translator/Syntax/BaseHubLCommandTranslation.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
     {
         $varName = undollarize($name);
 
-        if(self::areVariableNamesLowercase()) {
+        if (self::areVariableNamesLowercase()) {
             $varName = strtolower($varName);
         }
 
@@ -53,7 +53,7 @@ 
     {
         $variables = Mailcode::create()->createVariables()->parseString($subject)->getAll();
 
-        foreach($variables as $variable) {
+        foreach ($variables as $variable) {
             $subject = str_replace($variable->getMatchedText(), $this->formatVariableName($variable->getFullName()), $subject);
         }
 

src/Mailcode/ClassCache.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
      * @return class-string[]
      * @throws FileHelper_Exception
      */
-    public static function findClassesInFolder($folder, bool $recursive=false, ?string $instanceOf=null) : array
+    public static function findClassesInFolder($folder, bool $recursive = false, ?string $instanceOf = null) : array
     {
         return self::createCache()
             ->findClassesInFolder(
@@ -42,7 +42,7 @@ 
 
     private static function createCache() : ClassRepositoryManager
     {
-        if(!isset(self::$cache)) {
+        if (!isset(self::$cache)) {
             self::$cache = ClassRepositoryManager::create(Mailcode::getCacheFolder());
         }
 

src/Mailcode/Translator.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 
     public static function create() : Mailcode_Translator
     {
-        if(is_null(self::$instance)) {
+        if (is_null(self::$instance)) {
             self::$instance = new self();
         }
 
@@ -42,7 +42,7 @@ 
 
     public function __construct()
     {
-        foreach($this->resolveSyntaxClasses() as $class) {
+        foreach ($this->resolveSyntaxClasses() as $class) {
             $syntax = new $class();
             $this->syntaxes[$syntax->getTypeID()] = $syntax;
         }
@@ -56,7 +56,7 @@ 
      */
     public function createSyntax(string $name) : SyntaxInterface
     {
-        if(isset($this->syntaxes[$name])) {
+        if (isset($this->syntaxes[$name])) {
             return $this->syntaxes[$name];
         }
 

src/Mailcode.php

Indentation +32 added lines, -32 removed lines

@@ -59,10 +59,10 @@ 
         );
     }
 
-   /**
-    * Creates a new mailcode instance.
-    * @return Mailcode
-    */
+    /**
+     * Creates a new mailcode instance.
+     * @return Mailcode
+     */
     public static function create() : Mailcode
     {
         return new Mailcode();
@@ -74,11 +74,11 @@ 
     }
 
     /**
-    * Parses the string to detect all commands contained within.
-    * 
-    * @param string $string
-    * @return Mailcode_Collection
-    */
+     * Parses the string to detect all commands contained within.
+     * 
+     * @param string $string
+     * @return Mailcode_Collection
+     */
     public function parseString(string $string) : Mailcode_Collection
     {
         return $this->getParser()
@@ -86,11 +86,11 @@ 
             ->getCollection();
     }
     
-   /**
-    * Retrieves the string parser instance used to detect commands.
-    * 
-    * @return Mailcode_Parser
-    */
+    /**
+     * Retrieves the string parser instance used to detect commands.
+     * 
+     * @return Mailcode_Parser
+     */
     public function getParser() : Mailcode_Parser
     {
         if(!isset($this->parser)) 
@@ -101,12 +101,12 @@ 
         return $this->parser;
     }
     
-   /**
-    * Retrieves the commands collection, which is used to
-    * access information on the available commands.
-    * 
-    * @return Mailcode_Commands
-    */
+    /**
+     * Retrieves the commands collection, which is used to
+     * access information on the available commands.
+     * 
+     * @return Mailcode_Commands
+     */
     public function getCommands() : Mailcode_Commands
     {
         if(!isset($this->commands)) 
@@ -149,23 +149,23 @@ 
         return $this->variables;
     }
     
-   /**
-    * Creates the translator, which can be used to convert commands
-    * to another supported syntax.
-    * 
-    * @return Mailcode_Translator
-    */
+    /**
+     * Creates the translator, which can be used to convert commands
+     * to another supported syntax.
+     * 
+     * @return Mailcode_Translator
+     */
     public function createTranslator() : Mailcode_Translator
     {
         return Mailcode_Translator::create();
     }
     
-   /**
-    * Creates the styler, which can be used to retrieve the 
-    * CSS required to style the highlighted commands in HTML.
-    * 
-    * @return Mailcode_Styler
-    */
+    /**
+     * Creates the styler, which can be used to retrieve the 
+     * CSS required to style the highlighted commands in HTML.
+     * 
+     * @return Mailcode_Styler
+     */
     public function createStyler() : Mailcode_Styler
     {
         return new Mailcode_Styler();

Spacing +9 added lines, -9 removed lines

@@ -46,12 +46,12 @@ 
 
     public static function getCacheFolder() : FolderInfo
     {
-        if(isset(self::$cacheFolder)) {
+        if (isset(self::$cacheFolder)) {
             return self::$cacheFolder;
         }
 
         $folder = ClassHelper::getCacheFolder();
-        if($folder !== null) {
+        if ($folder !== null) {
             return $folder;
         }
 
@@ -99,7 +99,7 @@ 
     */
     public function getParser() : Mailcode_Parser
     {
-        if(!isset($this->parser)) 
+        if (!isset($this->parser)) 
         {
             $this->parser = new Mailcode_Parser($this);
         }
@@ -115,7 +115,7 @@ 
     */
     public function getCommands() : Mailcode_Commands
     {
-        if(!isset($this->commands)) 
+        if (!isset($this->commands)) 
         {
             $this->commands = new Mailcode_Commands();
         }
@@ -140,14 +140,14 @@ 
      * @param Mailcode_Commands_Command|null $sourceCommand
      * @return Mailcode_Variables_Collection_Regular
      */
-    public function findVariables(string $subject, ?Mailcode_Commands_Command $sourceCommand=null) : Mailcode_Variables_Collection_Regular
+    public function findVariables(string $subject, ?Mailcode_Commands_Command $sourceCommand = null) : Mailcode_Variables_Collection_Regular
     {
         return $this->createVariables()->parseString($subject, $sourceCommand);
     }
     
     public function createVariables() : Mailcode_Variables
     {
-        if(!isset($this->variables))
+        if (!isset($this->variables))
         {
             $this->variables = new Mailcode_Variables();
         }
@@ -206,7 +206,7 @@ 
         return self::$logger;
     }
 
-    public static function setDebugging(bool $enabled=true) : void
+    public static function setDebugging(bool $enabled = true) : void
     {
         self::$debug = $enabled;
     }
@@ -221,9 +221,9 @@ 
      * @param array<string|int,mixed> $context
      * @return void
      */
-    public static function debug(string $message, array $context=array()) : void
+    public static function debug(string $message, array $context = array()) : void
     {
-        if(self::$debug && isset(self::$logger))
+        if (self::$debug && isset(self::$logger))
         {
             self::$logger->debug($message, $context);
         }

tools/extractPhoneCountries.php

Spacing +7 added lines, -7 removed lines

@@ -12,10 +12,10 @@ 
 
 declare(strict_types=1);
 
-use AppUtils\ConvertHelper\JSONConverter;use AppUtils\CSVHelper;
-use AppUtils\CSVHelper_Exception;use AppUtils\FileHelper;
-use AppUtils\FileHelper_Exception;use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumberUtil;use Mailcode\Mailcode;use function AppLocalize\pts;
+use AppUtils\ConvertHelper\JSONConverter; use AppUtils\CSVHelper;
+use AppUtils\CSVHelper_Exception; use AppUtils\FileHelper;
+use AppUtils\FileHelper_Exception; use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberUtil; use Mailcode\Mailcode; use function AppLocalize\pts;
 
 require_once 'prepend.php';
 
@@ -94,14 +94,14 @@ 
 
         $meta = $phoneNumberUtil->getMetadataForRegion($code);
         if (!$meta) {
-            die('No metadata for ' . $code);
+            die('No metadata for '.$code);
         }
 
         $exampleNumber = $phoneNumberUtil->getExampleNumber($code);
 
         // PHPStan complains about this, but the method can return null - it's not documented correctly.
-        if($exampleNumber === null) {
-            die('No example number for ' . $code);
+        if ($exampleNumber === null) {
+            die('No example number for '.$code);
         }
 
         $local = $phoneNumberUtil->formatInOriginalFormat($exampleNumber, $code);