Mistralys / mailcode

src/Mailcode/Exception.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
     public function __construct(string $message, ?string $details = null, $code = null, $previous = null)
     {
-        if(defined('TESTS_ROOT') && !empty($details)) {
+        if (defined('TESTS_ROOT') && !empty($details)) {
             $message .= PHP_EOL.
                 'Details:'.PHP_EOL.
                 $details;

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

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/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/Parser/Statement/Tokenizer.php

Spacing +27 added lines, -27 removed lines

@@ -125,9 +125,9 @@ 
     {
         $result = array();
         
-        foreach($this->tokensOrdered as $token)
+        foreach ($this->tokensOrdered as $token)
         {
-            if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown)
+            if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Unknown)
             {
                 $result[] = $token;
             }
@@ -140,7 +140,7 @@ 
     {
         $unknown = $this->getUnknown();
         
-        if(!empty($unknown))
+        if (!empty($unknown))
         {
             return array_shift($unknown);
         }
@@ -152,16 +152,16 @@ 
     {
         $parts = array();
 
-        foreach($this->tokensOrdered as $token)
+        foreach ($this->tokensOrdered as $token)
         {
             $string = $token->getNormalized();
             
-            if($string === '') {
+            if ($string === '') {
                 continue;
             }
 
             // Only add spaces between tokens if they require spacing
-            if($token->hasSpacing()) {
+            if ($token->hasSpacing()) {
                 $string .= ' ';
             }
 
@@ -187,7 +187,7 @@ 
         $statement = trim($statement);
         $tokens = array();
 
-        foreach($this->tokenClasses as $tokenClass)
+        foreach ($this->tokenClasses as $tokenClass)
         {
             $processor = $this->createProcessor($tokenClass, $statement, $tokens);
             $processor->process();
@@ -211,7 +211,7 @@ 
     {
         $instance = new $className($this, $statement, $tokens);
 
-        if($instance instanceof Mailcode_Parser_Statement_Tokenizer_Process)
+        if ($instance instanceof Mailcode_Parser_Statement_Tokenizer_Process)
         {
             return $instance;
         }
@@ -232,7 +232,7 @@ 
      * @param mixed $subject
      * @return Mailcode_Parser_Statement_Tokenizer_Token
      */
-    public function createToken(string $type, string $matchedText, $subject=null) : Mailcode_Parser_Statement_Tokenizer_Token
+    public function createToken(string $type, string $matchedText, $subject = null) : Mailcode_Parser_Statement_Tokenizer_Token
     {
         $tokenID = $this->generateID();
 
@@ -240,7 +240,7 @@ 
 
         $token = new $class($tokenID, $matchedText, $subject, $this->getSourceCommand());
 
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token)
         {
             return $token;
         }
@@ -269,7 +269,7 @@ 
 
         $token = $this->createToken('Keyword', $name);
 
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword)
         {
             return $token;
         }
@@ -294,7 +294,7 @@ 
     {
         $token = $this->createToken('StringLiteral', SpecialChars::encodeAll($text));
 
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral)
         {
             return $token;
         }
@@ -310,7 +310,7 @@ 
     {
         $token = $this->createToken('Number', $number);
 
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number)
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number)
         {
             return $token;
         }
@@ -352,7 +352,7 @@ 
     public function removeToken(Mailcode_Parser_Statement_Tokenizer_Token $token) : Mailcode_Parser_Statement_Tokenizer
     {
         $name = $this->findNameToken($token);
-        if($name !== null) {
+        if ($name !== null) {
             $this->removeToken($name);
         }
 
@@ -362,7 +362,7 @@ 
 
         foreach ($this->tokensOrdered as $checkToken)
         {
-            if($checkToken->getID() === $tokenID)
+            if ($checkToken->getID() === $tokenID)
             {
                 $removed = true;
                 continue;
@@ -373,7 +373,7 @@ 
 
         $this->tokensOrdered = $keep;
 
-        if($removed)
+        if ($removed)
         {
             $this->eventHandler->handleTokenRemoved($token);
         }
@@ -418,7 +418,7 @@ 
     {
         static $alphas;
 
-        if(!isset($alphas))
+        if (!isset($alphas))
         {
             $alphas = range('A', 'Z');
         }
@@ -427,12 +427,12 @@ 
 
         $result = '';
 
-        for($i=0; $i < $amount; $i++)
+        for ($i = 0; $i < $amount; $i++)
         {
             $result .= $alphas[array_rand($alphas)];
         }
 
-        if(!in_array($result, self::$ids))
+        if (!in_array($result, self::$ids))
         {
             self::$ids[] = $result;
             return $result;
@@ -468,12 +468,12 @@ 
     {
         $targetID = $targetToken->getID();
 
-        foreach($this->tokensOrdered as $idx => $token)
+        foreach ($this->tokensOrdered as $idx => $token)
         {
-            if($token->getID() === $targetID)
+            if ($token->getID() === $targetID)
             {
-                $prev = $this->tokensOrdered[$idx-1] ?? null;
-                if($prev instanceof Mailcode_Parser_Statement_Tokenizer_Token_ParamName)
+                $prev = $this->tokensOrdered[$idx - 1] ?? null;
+                if ($prev instanceof Mailcode_Parser_Statement_Tokenizer_Token_ParamName)
                 {
                     return $prev;
                 }
@@ -497,7 +497,7 @@ 
     public function injectParamName(Mailcode_Parser_Statement_Tokenizer_Token $targetToken, string $name) : Mailcode_Parser_Statement_Tokenizer_Token_ParamName
     {
         $existing = $this->findNameToken($targetToken);
-        if($existing) {
+        if ($existing) {
             $this->removeToken($existing);
         }
 
@@ -518,9 +518,9 @@ 
         $tokens = array();
         $found = false;
 
-        foreach($this->tokensOrdered as $token)
+        foreach ($this->tokensOrdered as $token)
         {
-            if($token->getID() === $targetID)
+            if ($token->getID() === $targetID)
             {
                 $tokens[] = $newToken;
                 $found = true;
@@ -529,7 +529,7 @@ 
             $tokens[] = $token;
         }
 
-        if($found) {
+        if ($found) {
             $this->tokensOrdered = $tokens;
 
             return $this;

src/Mailcode.php

Spacing +8 added lines, -8 removed lines

@@ -45,7 +45,7 @@ 
 
     public static function getCacheFolder() : FolderInfo
     {
-        if(isset(self::$cacheFolder)) {
+        if (isset(self::$cacheFolder)) {
             return self::$cacheFolder;
         }
 
@@ -93,7 +93,7 @@ 
     */
     public function getParser() : Mailcode_Parser
     {
-        if(!isset($this->parser)) 
+        if (!isset($this->parser)) 
         {
             $this->parser = new Mailcode_Parser($this);
         }
@@ -109,7 +109,7 @@ 
     */
     public function getCommands() : Mailcode_Commands
     {
-        if(!isset($this->commands)) 
+        if (!isset($this->commands)) 
         {
             $this->commands = new Mailcode_Commands();
         }
@@ -134,14 +134,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();
         }
@@ -200,7 +200,7 @@ 
         return self::$logger;
     }
 
-    public static function setDebugging(bool $enabled=true) : void
+    public static function setDebugging(bool $enabled = true) : void
     {
         self::$debug = $enabled;
     }
@@ -215,9 +215,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);