Mistralys / mailcode

src/Mailcode/Parser/Statement/Tokenizer/Process/NamedParameters.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
         $matches = array();
         preg_match_all('/([a-z][a-z0-9-]+)\s*=/iU', $this->tokenized, $matches, PREG_PATTERN_ORDER);
 
-        foreach($matches[0] as $match)
+        foreach ($matches[0] as $match)
         {
             $this->registerToken('ParamName', $match);
         }

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

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
             ->getInfo()
             ->getTokenByParamName(CountInterface::PARAMETER_NAME);
 
-        if($token === null)
+        if ($token === null)
         {
             $this->countEnabled = false;
             return;
@@ -57,7 +57,7 @@ 
         }
 
         $this->validationResult->makeError(
-            t('Invalid count subject:') . ' ' . t('Expected a variable.'),
+            t('Invalid count subject:').' '.t('Expected a variable.'),
             CountInterface::VALIDATION_COUNT_CODE_WRONG_TYPE
         );
     }
@@ -69,7 +69,7 @@ 
 
     public function getCountVariable(): ?Mailcode_Variables_Variable
     {
-        if($this->countToken !== null)
+        if ($this->countToken !== null)
         {
             return $this->countToken->getVariable();
         }
@@ -88,15 +88,15 @@ 
 
         $info = $this->requireParams()->getInfo();
 
-        if(isset($this->countToken)) {
+        if (isset($this->countToken)) {
             $info->removeToken($this->countToken);
         }
 
-        if(is_string($variable)) {
+        if (is_string($variable)) {
             $variable = Mailcode_Factory::var()->fullName($variable);
         }
 
-        if($variable !== null) {
+        if ($variable !== null) {
             $this->countEnabled = true;
             $this->countToken = $info->addVariable($variable);
             $info->setParamName($this->countToken, CountInterface::PARAMETER_NAME);

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

Spacing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
             ->getInfo()
             ->getTokenByParamName(BreakAtInterface::PARAMETER_NAME);
 
-        if($this->breakAtToken === null) {
+        if ($this->breakAtToken === null) {
             $this->breakAtEnabled = false;
             return;
         }
@@ -55,7 +55,7 @@ 
         if (!$this->breakAtToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number &&
             !$this->breakAtToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) {
             $this->validationResult->makeError(
-                t('Invalid break-at value:') . ' ' . t('Expected a number or variable.'),
+                t('Invalid break-at value:').' '.t('Expected a number or variable.'),
                 BreakAtInterface::VALIDATION_BREAK_AT_CODE_WRONG_TYPE
             );
             return;
@@ -80,19 +80,19 @@ 
     public function getBreakAt()
     {
         $token = $this->getBreakAtToken();
-        if($token === null) {
+        if ($token === null) {
             return null;
         }
 
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) {
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) {
             return $token->getVariable();
         }
 
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number) {
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_Number) {
             return (int)$token->getValue();
         }
 
-        if($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) {
+        if ($token instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral) {
             return (int)$token->getText();
         }
 
@@ -109,29 +109,29 @@ 
     {
         $info = $this->requireParams()->getInfo();
 
-        if(isset($this->breakAtToken)) {
+        if (isset($this->breakAtToken)) {
             $info->removeToken($this->breakAtToken);
         }
 
         $this->breakAtEnabled = false;
         $this->breakAtToken = null;
 
-        if($breakAt === null) {
+        if ($breakAt === null) {
             return $this;
         }
 
         $token = null;
 
-        if(is_numeric($breakAt))
+        if (is_numeric($breakAt))
         {
             $token = $info->addNumber((string)(int)$breakAt);
         }
-        else if($breakAt instanceof Mailcode_Variables_Variable)
+        else if ($breakAt instanceof Mailcode_Variables_Variable)
         {
             $token = $info->addVariable($breakAt);
         }
 
-        if($token !== null)
+        if ($token !== null)
         {
             $info->setParamName($token, BreakAtInterface::PARAMETER_NAME);
 

Braces +1 added lines, -2 removed lines

@@ -125,8 +125,7 @@
         if(is_numeric($breakAt))
         {
             $token = $info->addNumber((string)(int)$breakAt);
-        }
-        else if($breakAt instanceof Mailcode_Variables_Variable)
+        } else if($breakAt instanceof Mailcode_Variables_Variable)
         {
             $token = $info->addVariable($breakAt);
         }

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

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
         if (!$this->timezoneToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_StringLiteral &&
             !$this->timezoneToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Variable) {
             $this->validationResult->makeError(
-                t('Invalid timezone:') . ' ' . t('Expected a string or variable.'),
+                t('Invalid timezone:').' '.t('Expected a string or variable.'),
                 TimezoneInterface::VALIDATION_TIMEZONE_CODE_WRONG_TYPE
             );
         }
@@ -62,7 +62,7 @@ 
      */
     public function getTimezoneToken(): Mailcode_Parser_Statement_Tokenizer_Token
     {
-        if(!isset($this->timezoneToken)) {
+        if (!isset($this->timezoneToken)) {
             $this->timezoneToken = $this->createTimeZoneToken();
         }
 
@@ -79,7 +79,7 @@ 
         $default = Mailcode_Commands_Command_ShowDate::getDefaultTimezone();
         $info = $this->requireParams()->getInfo();
 
-        if($default instanceof Mailcode_Variables_Variable) {
+        if ($default instanceof Mailcode_Variables_Variable) {
             $token = $info->addVariable($default);
         } else {
             $token = $info->addStringLiteral($default);
@@ -100,17 +100,17 @@ 
         $token = null;
 
         $existing = $info->getTokenByParamName(TimezoneInterface::PARAMETER_NAME);
-        if($existing) {
+        if ($existing) {
             $info->removeToken($existing);
         }
 
-        if($timezone instanceof Mailcode_Variables_Variable) {
+        if ($timezone instanceof Mailcode_Variables_Variable) {
             $token = $info->addVariable($timezone);
-        } else if(is_string($timezone)) {
+        } else if (is_string($timezone)) {
             $token = $info->addStringLiteral($timezone);
         }
 
-        if($token !== null) {
+        if ($token !== null) {
             $info->setParamName($token, TimezoneInterface::PARAMETER_NAME);
         }
 

src/Mailcode/Traits/Formatting/HTMLHighlighting.php

Indentation +26 added lines, -26 removed lines

@@ -23,25 +23,25 @@ 
  */
 trait Mailcode_Traits_Formatting_HTMLHighlighting
 {
-   /**
-    * Stored this way, so we can use isset() instead
-    * of using in_array, which is some magnitudes slower.
-    * The boolean value is not used otherwise.
-    *
-    * @var array<string,bool>
-    */
+    /**
+     * Stored this way, so we can use isset() instead
+     * of using in_array, which is some magnitudes slower.
+     * The boolean value is not used otherwise.
+     *
+     * @var array<string,bool>
+     */
     private array $excludeTags = array(
         'style' => true, // NOTE: style tags are excluded natively on the parser level.
         'script' => true
     );
     
-   /**
-    * Adds an HTML tag name to the list of tags within which
-    * commands may not be highlighted.
-    *
-    * @param string $tagName Case-insensitive.
-    * @return $this
-    */
+    /**
+     * Adds an HTML tag name to the list of tags within which
+     * commands may not be highlighted.
+     *
+     * @param string $tagName Case-insensitive.
+     * @return $this
+     */
     public function excludeTag(string $tagName) : self
     {
         $tagName = strtolower($tagName);
@@ -51,12 +51,12 @@ 
         return $this;
     }
     
-   /**
-    * Adds several excluded tag names at once.
-    *
-    * @param string[] $tagNames
-    * @return $this
-    */
+    /**
+     * Adds several excluded tag names at once.
+     *
+     * @param string[] $tagNames
+     * @return $this
+     */
     public function excludeTags(array $tagNames) : self
     {
         foreach($tagNames as $tagName)
@@ -67,12 +67,12 @@ 
         return $this;
     }
     
-   /**
-    * Whether the specified tag name is in the exclusion list.
-    *
-    * @param string $tagName
-    * @return bool
-    */
+    /**
+     * Whether the specified tag name is in the exclusion list.
+     *
+     * @param string $tagName
+     * @return bool
+     */
     public function isTagExcluded(string $tagName) : bool
     {
         $tagName = strtolower($tagName);

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     */
     public function excludeTags(array $tagNames) : self
     {
-        foreach($tagNames as $tagName)
+        foreach ($tagNames as $tagName)
         {
             $this->excludeTag((string)$tagName);
         }

tools/extractPhoneCountries.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 use AppUtils\CSVHelper;
 use AppUtils\FileHelper;
 use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumberUtil;use Mailcode\Mailcode;use function AppLocalize\pts;
+use libphonenumber\PhoneNumberUtil; use Mailcode\Mailcode; use function AppLocalize\pts;
 
 require_once 'prepend.php';
 
@@ -89,7 +89,7 @@ 
     {
         $meta = $phoneNumberUtil->getMetadataForRegion($code);
         if (!$meta) {
-            die('No metadata for ' . $code);
+            die('No metadata for '.$code);
         }
 
         $exampleNumber = $phoneNumberUtil->getExampleNumber($code);

tools/syntax-highlighter.php

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
 use Mailcode\Mailcode_Exception;
 use Mailcode\Mailcode_Translator_Exception;
 use function \AppLocalize\pt;
-use function \AppLocalize\pts;use function AppLocalize\t;
+use function \AppLocalize\pts; use function AppLocalize\t;
 
 require_once 'prepend.php';
 
@@ -27,7 +27,7 @@ 
 $translated = '';
 $error = null;
 
-if($request->getBool('highlight'))
+if ($request->getBool('highlight'))
 {
     $commandsText = $request->getParam('mailcode');
 
@@ -42,13 +42,13 @@ 
         $error = $e->getMessage();
 
         $collection = $e->getCollection();
-        if($collection)
+        if ($collection)
         {
             $first = $collection->getFirstError();
             $error = $first->getMessage();
             $matched = $first->getMatchedText();
-            if(!empty($matched)) {
-                $error .= '<br>'. t('In command:').' <code>'.$matched.'</code>';
+            if (!empty($matched)) {
+                $error .= '<br>'.t('In command:').' <code>'.$matched.'</code>';
             }
         }
     }
@@ -92,7 +92,7 @@ 
         <p></p><br>
         <h2><?php pt('Highlighted commands') ?></h2>
         <?php
-            if(empty($commandsText))
+            if (empty($commandsText))
             {
                 ?>
                     <div class="alert alert-info">
@@ -100,7 +100,7 @@ 
                     </div>
                 <?php
             }
-            else if($error)
+            else if ($error)
             {
                 ?>
                     <div class="alert alert-danger">

Braces +3 added lines, -6 removed lines

@@ -36,8 +36,7 @@ 
         $safeguard = $mailcode->createSafeguard($commandsText);
         $safe = htmlspecialchars($safeguard->makeSafe(), ENT_QUOTES, 'UTF-8');
         $highlighted = $safeguard->makeHighlighted($safe);
-    }
-    catch (Mailcode_Exception $e)
+    } catch (Mailcode_Exception $e)
     {
         $error = $e->getMessage();
 
@@ -99,8 +98,7 @@ 
                         <?php pt('No commands specified.') ?>
                     </div>
                 <?php
-            }
-            else if($error)
+            } else if($error)
             {
                 ?>
                     <div class="alert alert-danger">
@@ -108,8 +106,7 @@ 
                         <?php echo $error ?>
                     </div>
                 <?php
-            }
-            else
+            } else
             {
                 ?>
                     <pre style="border: solid 1px #ccc;padding:12px;border-radius: 5px"><?php

src/Mailcode/Variables/Variable.php

Indentation +18 added lines, -18 removed lines

@@ -32,34 +32,34 @@
     public const VALIDATION_ERROR_PATH_UNDERSCORE = 48203;
     public const VALIDATION_ERROR_NAME_UNDERSCORE = 48204;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected string $path;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected string $name;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected string $matchedText;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected string $hash = '';
     
-   /**
-    * @var OperationResult|NULL
-    */
+    /**
+     * @var OperationResult|NULL
+     */
     protected ?OperationResult $validationResult = null;
     
-   /**
-    * @var array<string>
-    */
+    /**
+     * @var array<string>
+     */
     protected array $validations = array(
         'number_path',
         'number_name',

Spacing +10 added lines, -10 removed lines

@@ -72,7 +72,7 @@ 
      */
     private ?Mailcode_Commands_Command $command;
 
-    public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null)
+    public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null)
     {
         $this->path = $path;
         $this->name = $name;
@@ -95,7 +95,7 @@ 
     
     public function getFullName() : string
     {
-        if(empty($this->path))
+        if (empty($this->path))
         {
             return dollarize($this->name);
         }
@@ -113,7 +113,7 @@ 
      */
     public function getUniqueName() : string
     {
-        if(isset($this->command))
+        if (isset($this->command))
         {
             return $this->getFullName().'/'.$this->command->getHash();
         }
@@ -138,7 +138,7 @@ 
     
     public function getHash() : string
     {
-        if(empty($this->hash))
+        if (empty($this->hash))
         {
             $this->hash = md5($this->matchedText);
         }
@@ -157,7 +157,7 @@ 
      */
     public function getValidationResult() : OperationResult
     {
-        if(isset($this->validationResult))
+        if (isset($this->validationResult))
         {
             return $this->validationResult;
         }
@@ -171,11 +171,11 @@ 
 
     protected function validate(OperationResult $result) : void
     {
-        foreach($this->validations as $validation)
+        foreach ($this->validations as $validation)
         {
             $method = 'validate_'.$validation;
             
-            if(!method_exists($this, $method))
+            if (!method_exists($this, $method))
             {
                 throw new Mailcode_Exception(
                     'Unknown validation method',
@@ -225,7 +225,7 @@ 
     
     protected function validateNumber(string $value, int $errorCode) : void
     {
-        if(empty($value) || !is_numeric($value[0]))
+        if (empty($value) || !is_numeric($value[0]))
         {
             return;
         }
@@ -243,7 +243,7 @@ 
     protected function validateUnderscore(string $value, int $errorCode) : void
     {
         // allow empty paths
-        if(empty($value))
+        if (empty($value))
         {
             return;
         }
@@ -251,7 +251,7 @@ 
         $length = strlen($value);
         
         // trimming underscores does not change the length: no underscores at start or end of string.
-        if(strlen(trim($value, '_')) === $length)
+        if (strlen(trim($value, '_')) === $length)
         {
             return;
         }

src/Mailcode/Translator/Syntax/ApacheVelocity/SetVariable.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
         if ($command->isCountEnabled())
         {
             $result = $this->buildCountAssignment($command);
-            if($result !== null) {
+            if ($result !== null) {
                 $assignmentString = $result;
             }
         }
@@ -47,7 +47,7 @@ 
             return null;
         }
 
-        if($variable->hasPath()) {
+        if ($variable->hasPath()) {
             return sprintf(
                 '$map.of(%s).keys("%s").count()',
                 dollarize($variable->getPath()),