Mistralys / application-utils

src/Request/Param/Validator/Valueslist.php

Spacing +5 added lines, -5 removed lines

@@ -36,22 +36,22 @@
         
         // if we are validating a subvalue, it means we are 
         // validating a single value in the existing list.
-        if($this->isSubvalue) 
+        if ($this->isSubvalue) 
         {
-            if(in_array($this->value, $allowed, true)) {
+            if (in_array($this->value, $allowed, true)) {
                 return $this->value;
             }
             
             return null;
         }
         
-        if(!is_array($this->value)) {
+        if (!is_array($this->value)) {
             return array();
         }
         
         $keep = array();
-        foreach($this->value as $item) {
-            if(in_array($item, $allowed, true)) {
+        foreach ($this->value as $item) {
+            if (in_array($item, $allowed, true)) {
                 $keep[] = $item;
             }
         }

src/Request/Param/Validator/Regex.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     
     protected function _validate() : ?string
     {
-        if(!is_scalar($this->value)) {
+        if (!is_scalar($this->value)) {
             return null;
         }
         
@@ -35,13 +35,13 @@ 
         // is a boolean, which is converted to an integer when
         // converted to string, which in turn can be validated
         // with a regex.
-        if(is_bool($this->value)) {
+        if (is_bool($this->value)) {
             return null;
         }
         
         $value = (string)$this->value;
         
-        if(preg_match($this->getStringOption('regex'), $value)) {
+        if (preg_match($this->getStringOption('regex'), $value)) {
             return $value;
         }
         

src/Request/Param/Validator/Url.php

Spacing +2 added lines, -2 removed lines

@@ -27,12 +27,12 @@
     
     protected function _validate() : string
     {
-        if(!is_string($this->value)) {
+        if (!is_string($this->value)) {
             return '';
         }
         
         $info = parseURL($this->value);
-        if($info->isValid()) {
+        if ($info->isValid()) {
             return $this->value;
         }
         

src/Request/Param/Validator/Json.php

Spacing +2 added lines, -2 removed lines

@@ -31,13 +31,13 @@
     
     protected function _validate() : string
     {
-        if(!is_string($this->value)) {
+        if (!is_string($this->value)) {
             return '';
         }
         
         $value = trim($this->value);
         
-        if(empty($value)) {
+        if (empty($value)) {
             return '';
         }
 

Braces +2 added lines, -4 removed lines

@@ -50,13 +50,11 @@
                 {
                     return $value;
                 }
-            }
-            else if (is_array(json_decode($value, true, 512, JSON_THROW_ON_ERROR)))
+            } else if (is_array(json_decode($value, true, 512, JSON_THROW_ON_ERROR)))
             {
                 return $value;
             }
-        }
-        catch (Throwable $e)
+        } catch (Throwable $e)
         {
             // Invalid JSON must return an empty string.
             // The application is responsible for asserting

src/Request/Param/Validator/Numeric.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
      */
     protected function _validate()
     {
-        if(is_numeric($this->value)) {
+        if (is_numeric($this->value)) {
             return $this->value * 1;
         }
         

src/URLInfo/Parser/ParsedInfoFilter.php

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
         if($this->hasScheme())
         {
             $this->setScheme(strtolower($this->getScheme()));
-        }
-        else
+        } else
         {
             $scheme = URISchemes::detectScheme($this->url);
             if(!empty($scheme)) {

Spacing +9 added lines, -9 removed lines

@@ -56,7 +56,7 @@ 
     {
         $path = $this->info['path'] ?? '';
 
-        if(strpos($path, '@') !== false)
+        if (strpos($path, '@') !== false)
         {
             $this->info['path'] = str_replace(' ', '', $path);
         }
@@ -64,14 +64,14 @@ 
 
     private function filterScheme() : void
     {
-        if($this->hasScheme())
+        if ($this->hasScheme())
         {
             $this->setScheme(strtolower($this->getScheme()));
         }
         else
         {
             $scheme = URISchemes::detectScheme($this->url);
-            if(!empty($scheme)) {
+            if (!empty($scheme)) {
                 $this->setScheme(URISchemes::resolveSchemeName($scheme));
             }
         }
@@ -79,7 +79,7 @@ 
 
     private function filterAuth() : void
     {
-        if(!$this->hasAuth()) {
+        if (!$this->hasAuth()) {
             return;
         }
 
@@ -91,7 +91,7 @@ 
 
     private function filterHost() : void
     {
-        if(!$this->hasHost())
+        if (!$this->hasHost())
         {
             return;
         }
@@ -104,7 +104,7 @@ 
 
     private function filterPath() : void
     {
-        if($this->hasPath()) {
+        if ($this->hasPath()) {
             $this->setPath($this->getPath());
         }
     }
@@ -113,7 +113,7 @@ 
     {
         $host = $this->getPath();
 
-        if(empty($host) || !URLHosts::isHostKnown($host))
+        if (empty($host) || !URLHosts::isHostKnown($host))
         {
             return;
         }
@@ -121,7 +121,7 @@ 
         $this->setHost($host);
         $this->removePath();
 
-        if(!$this->hasScheme()) {
+        if (!$this->hasScheme()) {
             $this->setSchemeHTTPS();
         }
     }
@@ -131,7 +131,7 @@ 
         $this->info['params'] = array();
 
         $query = $this->getQuery();
-        if(empty($query)) {
+        if (empty($query)) {
             return;
         }
 

src/URLInfo/URIParser.php

Braces +1 added lines, -2 removed lines

@@ -285,8 +285,7 @@
             if(is_array($val))
             {
                 $val = $this->restoreUnicodeChars($val);
-            }
-            else
+            } else
             {
                 $val = $this->restoreUnicodeChar($val);
             }

Indentation +60 added lines, -60 removed lines

@@ -42,18 +42,18 @@ 
     protected bool $isValid = false;
     protected bool $encodeUTF = false;
 
-   /**
-    * @var array{code:int,message:string}|NULL
-    */
+    /**
+     * @var array{code:int,message:string}|NULL
+     */
     protected ?array $error = null;
     
-   /**
-    * Stores a list of all unicode characters in the URL
-    * that have been filtered out before parsing it with
-    * parse_url.
-    * 
-    * @var array<string,string>
-    */
+    /**
+     * Stores a list of all unicode characters in the URL
+     * that have been filtered out before parsing it with
+     * parse_url.
+     * 
+     * @var array<string,string>
+     */
     protected array $unicodeChars = array();
 
     /**
@@ -78,10 +78,10 @@ 
     );
 
     /**
-    * 
-    * @param string $url The target URL.
-    * @param bool $encodeUTF Whether to URL encode any plain text unicode characters.
-    */
+     * 
+     * @param string $url The target URL.
+     * @param bool $encodeUTF Whether to URL encode any plain text unicode characters.
+     */
     public function __construct(string $url, bool $encodeUTF)
     {
         $this->url = $url;
@@ -92,12 +92,12 @@ 
         $this->validate();
     }
 
-   /**
-    * Retrieves the array as parsed by PHP's parse_url,
-    * filtered and adjusted as necessary.
-    * 
-    * @return array<string,mixed>
-    */
+    /**
+     * Retrieves the array as parsed by PHP's parse_url,
+     * filtered and adjusted as necessary.
+     * 
+     * @return array<string,mixed>
+     */
     public function getInfo() : array
     {
         return $this->info;
@@ -153,11 +153,11 @@ 
         $this->url = implode(':', $parts);
     }
 
-   /**
-    * Finds any non-url encoded unicode characters in 
-    * the URL, and encodes them before the URL is 
-    * passed to parse_url.
-    */
+    /**
+     * Finds any non-url encoded unicode characters in 
+     * the URL, and encodes them before the URL is 
+     * passed to parse_url.
+     */
     protected function filterUnicodeChars() : void
     {
         $chars = ConvertHelper::string2array($this->url);
@@ -228,23 +228,23 @@ 
         $this->isValid = true;
     }
 
-   /**
-    * Goes through all information in the parse_url result
-    * array, and attempts to fix any user errors in formatting
-    * that can be recovered from, mostly regarding stray spaces.
-    */
+    /**
+     * Goes through all information in the parse_url result
+     * array, and attempts to fix any user errors in formatting
+     * that can be recovered from, mostly regarding stray spaces.
+     */
     protected function filterParsed() : void
     {
         $this->info = (new ParsedInfoFilter($this->url, $this->info))->filter();
     }
     
-   /**
-    * Recursively goes through the array, and converts all previously
-    * URL encoded characters with their unicode character counterparts.
-    * 
-    * @param array<string,mixed> $subject
-    * @return array<string,mixed>
-    */
+    /**
+     * Recursively goes through the array, and converts all previously
+     * URL encoded characters with their unicode character counterparts.
+     * 
+     * @param array<string,mixed> $subject
+     * @return array<string,mixed>
+     */
     protected function restoreUnicodeChars(array $subject) : array
     {
         $result = array();
@@ -268,13 +268,13 @@ 
         return $result;
     }
     
-   /**
-    * Replaces all URL encoded unicode characters
-    * in the string with the unicode character.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Replaces all URL encoded unicode characters
+     * in the string with the unicode character.
+     * 
+     * @param string $string
+     * @return string
+     */
     protected function restoreUnicodeChar(string $string) : string
     {
         if(strpos($string, '%') !== false)
@@ -295,32 +295,32 @@ 
         );
     }
    
-   /**
-    * Checks whether the URL that was parsed is valid.
-    * @return bool
-    */
+    /**
+     * Checks whether the URL that was parsed is valid.
+     * @return bool
+     */
     public function isValid() : bool
     {
         return $this->isValid;
     }
 
-   /**
-    * If the validation failed, retrieves the validation
-    * error message.
-    * 
-    * @return string
-    */
+    /**
+     * If the validation failed, retrieves the validation
+     * error message.
+     * 
+     * @return string
+     */
     public function getErrorMessage() : string
     {
         return $this->error['message'] ?? '';
     }
     
-   /**
-    * If the validation failed, retrieves the validation
-    * error code.
-    * 
-    * @return int
-    */
+    /**
+     * If the validation failed, retrieves the validation
+     * error code.
+     * 
+     * @return int
+     */
     public function getErrorCode() : int
     {
         return $this->error['code'] ?? -1;

Spacing +15 added lines, -15 removed lines

@@ -110,13 +110,13 @@ 
         $result = parse_url($this->url);
         $this->info = array();
 
-        if(!is_array($result))
+        if (!is_array($result))
         {
             $this->fixBrokenURL();
             $result = parse_url($this->url);
         }
 
-        if(is_array($result))
+        if (is_array($result))
         {
             $this->info = $result;
         }
@@ -125,7 +125,7 @@ 
 
         // if the URL contains any URL characters, and we
         // do not want them URL encoded, restore them.
-        if(!$this->encodeUTF && !empty($this->unicodeChars))
+        if (!$this->encodeUTF && !empty($this->unicodeChars))
         {
             $this->info = $this->restoreUnicodeChars($this->info);
         }
@@ -137,7 +137,7 @@ 
      */
     private function fixBrokenURL() : void
     {
-        if(strpos($this->url, ':') === false) {
+        if (strpos($this->url, ':') === false) {
             return;
         }
 
@@ -145,7 +145,7 @@ 
         // else, as unlikely as it may be.
         $parts = explode(':', $this->url);
 
-        while(strpos($parts[1], '///') === 0)
+        while (strpos($parts[1], '///') === 0)
         {
             $parts[1] = str_replace('///', '//', $parts[1]);
         }
@@ -164,13 +164,13 @@ 
         
         $keep = array();
         
-        foreach($chars as $char)
+        foreach ($chars as $char)
         {
-            if(preg_match('/\p{L}/uix', $char))
+            if (preg_match('/\p{L}/uix', $char))
             {
                 $encoded = rawurlencode($char);
                 
-                if($encoded !== $char)
+                if ($encoded !== $char)
                 {
                     $this->unicodeChars[$encoded] = $char;
                     $char = $encoded;
@@ -185,7 +185,7 @@ 
 
     protected function detectType() : bool
     {
-        foreach(self::$detectorClasses as $className)
+        foreach (self::$detectorClasses as $className)
         {
             $detector = ClassHelper::requireObjectInstanceOf(
                 BaseURLTypeDetector::class,
@@ -197,7 +197,7 @@ 
             // Use the adjusted data
             $this->info = $detector->getInfo();
 
-            if($detected) {
+            if ($detected) {
                 $this->isValid = true;
                 return true;
             }
@@ -208,7 +208,7 @@ 
 
     protected function validate() : void
     {
-        foreach(self::$validatorClasses as $validatorClass)
+        foreach (self::$validatorClasses as $validatorClass)
         {
             $validator = ClassHelper::requireObjectInstanceOf(
                 BaseURLValidator::class,
@@ -219,7 +219,7 @@ 
 
             $this->info = $validator->getInfo();
 
-            if($result !== true) {
+            if ($result !== true) {
                 $this->isValid = false;
                 return;
             }
@@ -249,9 +249,9 @@ 
     {
         $result = array();
         
-        foreach($subject as $key => $val)
+        foreach ($subject as $key => $val)
         {
-            if(is_array($val))
+            if (is_array($val))
             {
                 $val = $this->restoreUnicodeChars($val);
             }
@@ -277,7 +277,7 @@ 
     */
     protected function restoreUnicodeChar(string $string) : string
     {
-        if(strpos($string, '%') !== false)
+        if (strpos($string, '%') !== false)
         {
             return str_replace(array_keys($this->unicodeChars), array_values($this->unicodeChars), $string);
         }

src/URLInfo/URLHosts.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
     public static function addHost(string $host) : void
     {
-        if(!self::isHostKnown($host)) {
+        if (!self::isHostKnown($host)) {
             self::$knownHosts[] = strtolower($host);
         }
     }

src/URLInfo/Parser/URLTypeDetector/DetectEmail.php

Spacing +2 added lines, -2 removed lines

@@ -22,13 +22,13 @@
 {
     public function detect() : bool
     {
-        if($this->getScheme() === 'mailto') {
+        if ($this->getScheme() === 'mailto') {
             $this->setHostFromEmail((string)$this->getPath());
             $this->setTypeEmail();
             return true;
         }
 
-        if($this->hasPath() && preg_match(RegexHelper::REGEX_EMAIL, $this->getPath()))
+        if ($this->hasPath() && preg_match(RegexHelper::REGEX_EMAIL, $this->getPath()))
         {
             $this->setHostFromEmail($this->getPath());
             $this->setSchemeMailto();