Mistralys / application-utils

src/URLInfo/Highlighter.php

Spacing +15 added lines, -15 removed lines

@@ -77,7 +77,7 @@ 
             'fragment'
         );
         
-        foreach($parts as $part) 
+        foreach ($parts as $part) 
         {
             $method = 'render_'.$part;
             $result[] = (string)$this->$method();
@@ -88,7 +88,7 @@ 
     
     protected function render_scheme() : string
     {
-        if(!$this->info->hasScheme()) {
+        if (!$this->info->hasScheme()) {
             return '';
         }
         
@@ -103,7 +103,7 @@ 
     
     protected function render_username() : string
     {
-        if(!$this->info->hasUsername()) {
+        if (!$this->info->hasUsername()) {
             return '';
         }
         
@@ -119,7 +119,7 @@ 
     
     protected function render_host() : string
     {
-        if(!$this->info->hasHost()) {
+        if (!$this->info->hasHost()) {
             return '';
         }
         
@@ -131,7 +131,7 @@ 
     
     protected function render_port() : string
     {
-        if(!$this->info->hasPort()) {
+        if (!$this->info->hasPort()) {
             return '';
         }
         
@@ -144,7 +144,7 @@ 
        
     protected function render_path() : string
     {
-        if(!$this->info->hasPath()) {
+        if (!$this->info->hasPath()) {
             return '';
         }
         
@@ -169,7 +169,7 @@ 
     {
         $previous = $this->info->isParamExclusionEnabled();
         
-        if($previous)
+        if ($previous)
         {
             $this->info->setParamExclusion(false);
         }
@@ -185,19 +185,19 @@ 
     {
         $params = $this->resolveParams();
         
-        if(empty($params)) {
+        if (empty($params)) {
             return '';
         }
         
         $tokens = array();
         $excluded = array();
         
-        if($this->info->isParamExclusionEnabled())
+        if ($this->info->isParamExclusionEnabled())
         {
             $excluded = $this->info->getExcludedParams();
         }
         
-        foreach($params as $param => $value)
+        foreach ($params as $param => $value)
         {
             // If the parameter is numeric, it will automatically
             // be an integer, so we need the conversion here.
@@ -218,7 +218,7 @@ 
             
             $tag = $this->resolveTag($excluded, $param);
             
-            if(!empty($tag))
+            if (!empty($tag))
             {
                 $tokens[] = sprintf($tag, $parts);
             }
@@ -232,13 +232,13 @@ 
     protected function resolveTag(array $excluded, string $paramName) : string
     {
         // regular, non-excluded parameter
-        if(!isset($excluded[$paramName]))
+        if (!isset($excluded[$paramName]))
         {
             return '<span class="link-param">%s</span>';
         }
 
         // highlight excluded parameters is disabled, ignore this parameter
-        if(!$this->info->isHighlightExcludeEnabled())
+        if (!$this->info->isHighlightExcludeEnabled())
         {
             return '';
         }
@@ -254,7 +254,7 @@ 
      
     protected function render_fragment() : string
     {
-        if(!$this->info->hasFragment()) {
+        if (!$this->info->hasFragment()) {
             return '';
         }
         
@@ -269,7 +269,7 @@ 
     {
         $cssFolder = realpath(__DIR__.'/../../css');
         
-        if($cssFolder === false) {
+        if ($cssFolder === false) {
             throw new BaseException(
                 'Cannot find package CSS folder.',
                 null,

Indentation +10 added lines, -10 removed lines

@@ -20,9 +20,9 @@ 
  */
 class URLInfo_Highlighter
 {
-   /**
-    * @var URLInfo
-    */
+    /**
+     * @var URLInfo
+     */
     protected $info;
     
     public function __construct(URLInfo $info)
@@ -158,13 +158,13 @@ 
         );
     }
     
-   /**
-    * Fetches all parameters in the URL, regardless of 
-    * whether parameter exclusion is enabled, so they
-    * can be highlighted is need be.
-    * 
-    * @return array<string,string>
-    */
+    /**
+     * Fetches all parameters in the URL, regardless of 
+     * whether parameter exclusion is enabled, so they
+     * can be highlighted is need be.
+     * 
+     * @return array<string,string>
+     */
     protected function resolveParams() : array
     {
         $previous = $this->info->isParamExclusionEnabled();

localization/index.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     $autoload = $root.'/vendor/autoload.php';
     
     // we need the autoloader to be present
-    if($autoload === false) 
+    if ($autoload === false) 
     {
         die('<b>ERROR:</b> Autoloader not present. Run composer update first.');
     }

src/ConvertHelper/EOL.php

Spacing +5 added lines, -5 removed lines

@@ -121,7 +121,7 @@ 
      */
     public static function detect(string $subjectString) : ?ConvertHelper_EOL
     {
-        if(empty($subjectString)) {
+        if (empty($subjectString)) {
             return null;
         }
 
@@ -129,18 +129,18 @@ 
         $results = array();
         $chars = self::getEOLChars();
 
-        foreach($chars as $def)
+        foreach ($chars as $def)
         {
             $amount = substr_count($subjectString, $def['char']);
 
-            if($amount > $max)
+            if ($amount > $max)
             {
                 $max = $amount;
                 $results[] = $def;
             }
         }
 
-        if(empty($results)) {
+        if (empty($results)) {
             return null;
         }
 
@@ -156,7 +156,7 @@ 
      */
     public static function getEOLChars() : array
     {
-        if(isset(self::$eolChars)) {
+        if (isset(self::$eolChars)) {
             return self::$eolChars;
         }
 

Indentation +26 added lines, -26 removed lines

@@ -29,19 +29,19 @@ 
     public const TYPE_LF = 'LF';
     public const TYPE_CR = 'CR';
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $char;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $type;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $description;
 
     /**
@@ -56,33 +56,33 @@ 
         $this->description = $description;
     }
     
-   /**
-    * The actual EOL character.
-    * @return string
-    */
+    /**
+     * The actual EOL character.
+     * @return string
+     */
     public function getCharacter() : string
     {
         return $this->char;
     }
     
-   /**
-    * A more detailed, human readable description of the character.
-    * @return string
-    */
+    /**
+     * A more detailed, human readable description of the character.
+     * @return string
+     */
     public function getDescription() : string
     {
         return $this->description;
     }
     
-   /**
-    * The EOL character type, e.g. "CR+LF", "CR"...
-    * @return string
-    * 
-    * @see ConvertHelper_EOL::TYPE_CR
-    * @see ConvertHelper_EOL::TYPE_CRLF
-    * @see ConvertHelper_EOL::TYPE_LF
-    * @see ConvertHelper_EOL::TYPE_LFCR
-    */
+    /**
+     * The EOL character type, e.g. "CR+LF", "CR"...
+     * @return string
+     * 
+     * @see ConvertHelper_EOL::TYPE_CR
+     * @see ConvertHelper_EOL::TYPE_CRLF
+     * @see ConvertHelper_EOL::TYPE_LF
+     * @see ConvertHelper_EOL::TYPE_LFCR
+     */
     public function getType() : string
     {
         return $this->type;

src/URLInfo/ConnectionTester.php

Indentation +19 added lines, -19 removed lines

@@ -22,9 +22,9 @@ 
 {
     use Traits_Optionable;
     
-   /**
-    * @var URLInfo
-    */
+    /**
+     * @var URLInfo
+     */
     private $url;
     
     public function __construct(URLInfo $url)
@@ -41,13 +41,13 @@ 
         );
     }
     
-   /**
-    * Whether to verify the host's SSL certificate, in
-    * case of an https connection.
-    * 
-    * @param bool $verifySSL
-    * @return URLInfo_ConnectionTester
-    */
+    /**
+     * Whether to verify the host's SSL certificate, in
+     * case of an https connection.
+     * 
+     * @param bool $verifySSL
+     * @return URLInfo_ConnectionTester
+     */
     public function setVerifySSL(bool $verifySSL=true) : URLInfo_ConnectionTester
     {
         $this->setOption('verify-ssl', $verifySSL);
@@ -81,12 +81,12 @@ 
         return $this->getIntOption('timeout');
     }
     
-   /**
-    * Initializes the CURL instance.
-    * 
-    * @throws BaseException
-    * @return resource
-    */
+    /**
+     * Initializes the CURL instance.
+     * 
+     * @throws BaseException
+     * @return resource
+     */
     private function initCURL()
     {
         $ch = curl_init();
@@ -103,9 +103,9 @@ 
         return $ch;
     }
     
-   /**
-    * @param resource $ch
-    */
+    /**
+     * @param resource $ch
+     */
     private function configureOptions($ch) : void
     {
         if($this->isVerboseModeEnabled())

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
     * @param bool $verifySSL
     * @return URLInfo_ConnectionTester
     */
-    public function setVerifySSL(bool $verifySSL=true) : URLInfo_ConnectionTester
+    public function setVerifySSL(bool $verifySSL = true) : URLInfo_ConnectionTester
     {
         $this->setOption('verify-ssl', $verifySSL);
             return $this;
@@ -59,7 +59,7 @@ 
         return $this->getBoolOption('verify-ssl');
     }
     
-    public function setVerboseMode(bool $enabled=true) : URLInfo_ConnectionTester
+    public function setVerboseMode(bool $enabled = true) : URLInfo_ConnectionTester
     {
         $this->setOption('curl-verbose', $enabled);
         return $this;
@@ -91,7 +91,7 @@ 
     {
         $ch = curl_init();
         
-        if(!is_resource($ch))
+        if (!is_resource($ch))
         {
             throw new BaseException(
                 'Could not initialize a new cURL instance.',
@@ -108,7 +108,7 @@ 
     */
     private function configureOptions($ch) : void
     {
-        if($this->isVerboseModeEnabled())
+        if ($this->isVerboseModeEnabled())
         {
             curl_setopt($ch, CURLOPT_VERBOSE, true);
         }
@@ -118,13 +118,13 @@ 
         curl_setopt($ch, CURLOPT_TIMEOUT, $this->getTimeout());
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
         
-        if(!$this->isVerifySSLEnabled())
+        if (!$this->isVerifySSLEnabled())
         {
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
         }
         
-        if($this->url->hasUsername())
+        if ($this->url->hasUsername())
         {
             curl_setopt($ch, CURLOPT_USERNAME, $this->url->getUsername());
             curl_setopt($ch, CURLOPT_PASSWORD, $this->url->getPassword());

src/VariableInfo/Renderer/String/Callable.php

Spacing +6 added lines, -6 removed lines

@@ -13,20 +13,20 @@ 
         $string = '';
 
         // Simple function call
-        if(is_string($this->value))
+        if (is_string($this->value))
         {
             return $this->value.'()';
         }
 
-        if(is_array($this->value)) {
+        if (is_array($this->value)) {
             return $this->renderArray();
         }
 
-        if($this->value instanceof NamedClosure) {
+        if ($this->value instanceof NamedClosure) {
             return 'Closure:'.$this->value->getOrigin();
         }
 
-        if($this->value instanceof Closure) {
+        if ($this->value instanceof Closure) {
             return 'Closure';
         }
 
@@ -38,9 +38,9 @@ 
         $string = '';
 
         if (is_string($this->value[0])) {
-            $string .= $this->value[0] . '::';
+            $string .= $this->value[0].'::';
         } else {
-            $string .= get_class($this->value[0]) . '->';
+            $string .= get_class($this->value[0]).'->';
         }
 
         $string .= $this->value[1].'()';

src/ConvertHelper/URLFinder/Detector/HTMLAttributes.php

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,9 @@
 
         $result = array();
         $matches = array_unique($matches[2]);
-        foreach($matches as $match) {
+        foreach ($matches as $match) {
             $match = trim($match);
-            if(!empty($match) && !in_array($match, $result)) {
+            if (!empty($match) && !in_array($match, $result)) {
                 $result[] = $match;
             }
         }

src/ConvertHelper/URLFinder/DomainExtensions.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 
     public function __construct()
     {
-        if(empty(self::$cacheFile)) {
+        if (empty(self::$cacheFile)) {
             self::$cacheFile = __DIR__.'/tlds-alpha-by-domain.txt';
         }
 
@@ -58,7 +58,7 @@ 
 
     private function load() : void
     {
-        if(!empty(self::$names)) {
+        if (!empty(self::$names)) {
             return;
         }
 
@@ -68,7 +68,7 @@ 
 
         // Store the names as keys in the array to allow
         // faster lookups (to avoid using in_array).
-        foreach($names as $name) {
+        foreach ($names as $name) {
             self::$names[$name] = '';
         }
     }

src/ConvertHelper/URLFinder.php

Indentation +37 added lines, -37 removed lines

@@ -110,38 +110,38 @@ 
         return $this;
     }
     
-   /**
-    * Whether to enable sorting the URLs alphabetically (disabled by default).
-    * 
-    * @param bool $enabled
-    * @return $this
-    */
+    /**
+     * Whether to enable sorting the URLs alphabetically (disabled by default).
+     * 
+     * @param bool $enabled
+     * @return $this
+     */
     public function enableSorting(bool $enabled=true) : ConvertHelper_URLFinder
     {
         $this->setOption('sorting', $enabled);
         return $this;
     }
     
-   /**
-    * Whether to include email addresses in the search. 
-    * This is only relevant when using the getURLs()
-    * method.
-    * 
-    * @param bool $include
-    * @return ConvertHelper_URLFinder
-    */
+    /**
+     * Whether to include email addresses in the search. 
+     * This is only relevant when using the getURLs()
+     * method.
+     * 
+     * @param bool $include
+     * @return ConvertHelper_URLFinder
+     */
     public function includeEmails(bool $include=true) : ConvertHelper_URLFinder
     {
         $this->setOption('include-emails', $include);
         return $this;
     }
     
-   /**
-    * Whether to omit the mailto: that is automatically added to all email addresses.
-    * 
-    * @param bool $omit
-    * @return ConvertHelper_URLFinder
-    */
+    /**
+     * Whether to omit the mailto: that is automatically added to all email addresses.
+     * 
+     * @param bool $omit
+     * @return ConvertHelper_URLFinder
+     */
     public function omitMailto(bool $omit=true) : ConvertHelper_URLFinder
     {
         $this->setOption('omit-mailto', $omit);
@@ -267,11 +267,11 @@ 
         );
     }
 
-   /**
-    * Fetches all URLs that can be found in the subject string.
-    * 
-    * @return string[]
-    */
+    /**
+     * Fetches all URLs that can be found in the subject string.
+     * 
+     * @return string[]
+     */
     public function getURLs() : array
     {
         $this->parse();
@@ -474,13 +474,13 @@ 
         return array_pop($parts);
     }
 
-   /**
-    * Retrieves all email addresses from the subject string.
-    * 
-    * @return string[]
-    * 
-    * @see omitMailto()
-    */
+    /**
+     * Retrieves all email addresses from the subject string.
+     * 
+     * @return string[]
+     * 
+     * @see omitMailto()
+     */
     public function getEmails() : array
     {
         $this->parse();
@@ -506,11 +506,11 @@ 
         return $result;
     }
     
-   /**
-    * Retrieves all URLs as URLInfo instances.
-    * 
-    * @return URLInfo[]
-    */
+    /**
+     * Retrieves all URLs as URLInfo instances.
+     * 
+     * @return URLInfo[]
+     */
     public function getInfos() : array
     {
         $this->parse();

Spacing +34 added lines, -34 removed lines

@@ -104,7 +104,7 @@ 
      * @param bool $enabled
      * @return $this
      */
-    public function enableNormalizing(bool $enabled=true) : ConvertHelper_URLFinder
+    public function enableNormalizing(bool $enabled = true) : ConvertHelper_URLFinder
     {
         $this->setOption('normalize', $enabled);
         return $this;
@@ -116,7 +116,7 @@ 
     * @param bool $enabled
     * @return $this
     */
-    public function enableSorting(bool $enabled=true) : ConvertHelper_URLFinder
+    public function enableSorting(bool $enabled = true) : ConvertHelper_URLFinder
     {
         $this->setOption('sorting', $enabled);
         return $this;
@@ -130,7 +130,7 @@ 
     * @param bool $include
     * @return ConvertHelper_URLFinder
     */
-    public function includeEmails(bool $include=true) : ConvertHelper_URLFinder
+    public function includeEmails(bool $include = true) : ConvertHelper_URLFinder
     {
         $this->setOption('include-emails', $include);
         return $this;
@@ -142,7 +142,7 @@ 
     * @param bool $omit
     * @return ConvertHelper_URLFinder
     */
-    public function omitMailto(bool $omit=true) : ConvertHelper_URLFinder
+    public function omitMailto(bool $omit = true) : ConvertHelper_URLFinder
     {
         $this->setOption('omit-mailto', $omit);
         return $this;
@@ -169,7 +169,7 @@ 
         {
             $line = $this->analyzeLine($line);
 
-            if($line !== null) {
+            if ($line !== null) {
                 $keep[] = $line;
             }
         }
@@ -190,7 +190,7 @@ 
         $line = trim($line, '.');
 
         // Handle detecting an URI scheme
-        if(strstr($line, ':') !== false)
+        if (strstr($line, ':') !== false)
         {
             $scheme = URLInfo_Schemes::detectScheme($line);
 
@@ -204,7 +204,7 @@ 
         // detect are email addresses and domain names.
 
         // No dot? Then it's certainly not a domain name.
-        if(strstr($line, '.') === false) {
+        if (strstr($line, '.') === false) {
             return null;
         }
 
@@ -222,10 +222,10 @@ 
     {
         $subject = stripslashes($subject);
 
-        foreach($this->detectors as $detector)
+        foreach ($this->detectors as $detector)
         {
             // Avoid processing the string if it is not needed.
-            if($detector->getRunPosition() !== ConvertHelper_URLFinder_Detector::RUN_BEFORE || !$detector->isValidFor($subject)) {
+            if ($detector->getRunPosition() !== ConvertHelper_URLFinder_Detector::RUN_BEFORE || !$detector->isValidFor($subject)) {
                 continue;
             }
 
@@ -246,7 +246,7 @@ 
     {
         $detector = new $className();
 
-        if($detector instanceof ConvertHelper_URLFinder_Detector)
+        if ($detector instanceof ConvertHelper_URLFinder_Detector)
         {
             return $detector;
         }
@@ -273,12 +273,12 @@ 
 
         $result = $this->getItemsAsString($this->urls);
 
-        if($this->getBoolOption('include-emails'))
+        if ($this->getBoolOption('include-emails'))
         {
             $result = array_merge($result, $this->getEmails());
         }
 
-        if($this->getBoolOption('sorting'))
+        if ($this->getBoolOption('sorting'))
         {
             usort($result, function(string $a, string $b) {
                 return strnatcasecmp($a, $b);
@@ -298,12 +298,12 @@ 
 
         $result = array();
 
-        foreach($collection as $url => $info) {
-            if($normalize) {
+        foreach ($collection as $url => $info) {
+            if ($normalize) {
                 $url = $info->getNormalized();
             }
 
-            if(!in_array($url, $result)) {
+            if (!in_array($url, $result)) {
                 $result[] = $url;
             }
         }
@@ -320,9 +320,9 @@ 
      */
     private function initDetectors() : void
     {
-        foreach($this->enabledDetectorClasses as $className => $enabled)
+        foreach ($this->enabledDetectorClasses as $className => $enabled)
         {
-            if($enabled) {
+            if ($enabled) {
                 $this->detectors[] = $this->createDetector($className);
             }
         }
@@ -337,7 +337,7 @@ 
      */
     private function parse() : void
     {
-        if($this->parsed) {
+        if ($this->parsed) {
             return;
         }
 
@@ -348,11 +348,11 @@ 
 
         unset($this->subject);
 
-        foreach($this->matches as $match)
+        foreach ($this->matches as $match)
         {
             $info = parseURL($match);
 
-            if($info->isEmail())
+            if ($info->isEmail())
             {
                 $this->emails[$this->filterEmailAddress($match)] = $info;
                 continue;
@@ -368,7 +368,7 @@ 
      * @param bool $enable
      * @return $this
      */
-    public function enableHTMLAttributes(bool $enable=true) : ConvertHelper_URLFinder
+    public function enableHTMLAttributes(bool $enable = true) : ConvertHelper_URLFinder
     {
         $this->enabledDetectorClasses[ConvertHelper_URLFinder_Detector_HTMLAttributes::class] = $enable;
         return $this;
@@ -383,7 +383,7 @@ 
      */
     private function filterEmailAddress(string $email) : string
     {
-        if(stristr($email, 'mailto:') === false) {
+        if (stristr($email, 'mailto:') === false) {
             $email = 'mailto:'.$email;
         }
 
@@ -405,14 +405,14 @@ 
         foreach ($lines as $line)
         {
             $scheme = URLInfo_Schemes::detectScheme($line);
-            if($scheme !== null) {
+            if ($scheme !== null) {
                 $this->matches[] = $line;
                 continue;
             }
 
             $extension = $this->detectDomainExtension($line);
 
-            if($domains->nameExists($extension)) {
+            if ($domains->nameExists($extension)) {
                 $this->matches[] = $line;
             }
         }
@@ -431,9 +431,9 @@ 
 
         $subject = str_replace($remove, ' ', $subject);
 
-        foreach($this->detectors as $detector)
+        foreach ($this->detectors as $detector)
         {
-            if($detector->getRunPosition() !== ConvertHelper_URLFinder_Detector::RUN_AFTER || !$detector->isValidFor($subject)) {
+            if ($detector->getRunPosition() !== ConvertHelper_URLFinder_Detector::RUN_AFTER || !$detector->isValidFor($subject)) {
                 continue;
             }
 
@@ -456,8 +456,8 @@ 
         $boundaries = array('/', '?');
 
         // Remove the path or query parts to access the domain extension only
-        foreach($boundaries as $boundary) {
-            if(strstr($url, $boundary)) {
+        foreach ($boundaries as $boundary) {
+            if (strstr($url, $boundary)) {
                 $parts = explode($boundary, $url);
                 $url = array_shift($parts);
                 break;
@@ -482,16 +482,16 @@ 
 
         $result = $this->getItemsAsString($this->emails);
 
-        if($this->getBoolOption('omit-mailto')) {
+        if ($this->getBoolOption('omit-mailto')) {
             $keep = array();
-            foreach($result as $email) {
+            foreach ($result as $email) {
                 $keep[] = str_replace('mailto:', '', $email);
             }
 
             $result = $keep;
         }
 
-        if($this->getBoolOption('sorting'))
+        if ($this->getBoolOption('sorting'))
         {
             usort($result, function(string $a, string $b) {
                 return strnatcasecmp($a, $b);
@@ -513,16 +513,16 @@ 
         $result = array();
         $normalize = $this->getBoolOption('normalize');
 
-        foreach($this->urls as $url => $info)
+        foreach ($this->urls as $url => $info)
         {
-            if($normalize) {
+            if ($normalize) {
                 $url = $info->getNormalized();
             }
 
             $result[$url] = $info;
         }
 
-        if($this->getBoolOption('sorting'))
+        if ($this->getBoolOption('sorting'))
         {
             ksort($result);
         }

src/URLInfo/Parser.php

Indentation +73 added lines, -73 removed lines

@@ -23,24 +23,24 @@ 
  */
 class URLInfo_Parser
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $url;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $isValid = false;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $info;
     
-   /**
-    * @var array|NULL
-    */
+    /**
+     * @var array|NULL
+     */
     protected $error;
     
     /**
@@ -57,25 +57,25 @@ 
         'git'
     );
     
-   /**
-    * Stores a list of all unicode characters in the URL
-    * that have been filtered out before parsing it with
-    * parse_url.
-    * 
-    * @var string[]string
-    */
+    /**
+     * Stores a list of all unicode characters in the URL
+     * that have been filtered out before parsing it with
+     * parse_url.
+     * 
+     * @var string[]string
+     */
     protected $unicodeChars = array();
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $encodeUTF = false;
     
-   /**
-    * 
-    * @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;
@@ -88,12 +88,12 @@ 
         }
     }
 
-   /**
-    * Retrieves the array as parsed by PHP's parse_url,
-    * filtered and adjusted as necessary.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves the array as parsed by PHP's parse_url,
+     * filtered and adjusted as necessary.
+     * 
+     * @return array
+     */
     public function getInfo() : array
     {
         return $this->info;
@@ -115,11 +115,11 @@ 
         }
     }
 
-   /**
-    * 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);
@@ -238,11 +238,11 @@ 
         return false;
     }
 
-   /**
-    * 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['params'] = array();
@@ -284,13 +284,13 @@ 
         }
     }
     
-   /**
-    * Recursively goes through the array, and converts all previously
-    * URL encoded characters with their unicode character counterparts.
-    * 
-    * @param array $subject
-    * @return array
-    */
+    /**
+     * Recursively goes through the array, and converts all previously
+     * URL encoded characters with their unicode character counterparts.
+     * 
+     * @param array $subject
+     * @return array
+     */
     protected function restoreUnicodeChars(array $subject) : array
     {
         $result = array();
@@ -314,13 +314,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(strstr($string, '%'))
@@ -404,21 +404,21 @@ 
         );
     }
    
-   /**
-    * 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
     {
         if(isset($this->error)) {
@@ -428,12 +428,12 @@ 
         return '';
     }
     
-   /**
-    * 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
     {
         if(isset($this->error)) {

Spacing +33 added lines, -33 removed lines

@@ -83,7 +83,7 @@ 
         
         $this->parse();
         
-        if(!$this->detectType()) {
+        if (!$this->detectType()) {
             $this->validate();
         }
     }
@@ -109,7 +109,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);
         }
@@ -126,13 +126,13 @@ 
         
         $keep = array();
         
-        foreach($chars as $char)
+        foreach ($chars as $char)
         {
-            if(preg_match('/\p{L}/usix', $char))
+            if (preg_match('/\p{L}/usix', $char))
             {
                 $encoded = rawurlencode($char);
                 
-                if($encoded != $char)
+                if ($encoded != $char)
                 {
                     $this->unicodeChars[$encoded] = $char;
                     $char = $encoded;
@@ -154,11 +154,11 @@ 
             'ipAddress'
         );
         
-        foreach($types as $type)
+        foreach ($types as $type)
         {
             $method = 'detectType_'.$type;
             
-            if($this->$method() === true) 
+            if ($this->$method() === true) 
             {
                 $this->isValid = true;
                 return true;
@@ -176,11 +176,11 @@ 
             'hostIsPresent'
         );
         
-        foreach($validations as $validation) 
+        foreach ($validations as $validation) 
         {
             $method = 'validate_'.$validation;
             
-            if($this->$method() !== true) {
+            if ($this->$method() !== true) {
                 return;
             }
         }
@@ -193,13 +193,13 @@ 
         // every link needs a host. This case can happen for ex, if
         // the link starts with a typo with only one slash, like:
         // "http:/hostname"
-        if(isset($this->info['host'])) {
+        if (isset($this->info['host'])) {
             return true;
         }
         
         $this->setError(
             URLInfo::ERROR_MISSING_HOST,
-            t('Cannot determine the link\'s host name.') . ' ' .
+            t('Cannot determine the link\'s host name.').' '.
             t('This usually happens when there\'s a typo somewhere.')
         );
 
@@ -208,7 +208,7 @@ 
     
     protected function validate_schemeIsSet() : bool
     {
-        if(isset($this->info['scheme'])) {
+        if (isset($this->info['scheme'])) {
             return true;
         }
         
@@ -225,13 +225,13 @@ 
     
     protected function validate_schemeIsKnown() : bool
     {
-        if(in_array($this->info['scheme'], $this->knownSchemes)) {
+        if (in_array($this->info['scheme'], $this->knownSchemes)) {
             return true;
         }
         
         $this->setError(
             URLInfo::ERROR_INVALID_SCHEME,
-            t('The scheme %1$s is not supported for links.', $this->info['scheme']) . ' ' .
+            t('The scheme %1$s is not supported for links.', $this->info['scheme']).' '.
             t('Valid schemes are: %1$s.', implode(', ', $this->knownSchemes))
         );
 
@@ -248,36 +248,36 @@ 
         $this->info['params'] = array();
         $this->info['type'] = URLInfo::TYPE_URL;
 
-        if(isset($this->info['scheme']))
+        if (isset($this->info['scheme']))
         {
             $this->info['scheme'] = strtolower($this->info['scheme']);
         }
         else
         {
             $scheme = URLInfo_Schemes::detectScheme($this->url);
-            if(!empty($scheme)) {
-                $this->info['scheme'] = substr($scheme,0, strpos($scheme, ':'));
+            if (!empty($scheme)) {
+                $this->info['scheme'] = substr($scheme, 0, strpos($scheme, ':'));
             }
         }
 
-        if(isset($this->info['user'])) {
+        if (isset($this->info['user'])) {
             $this->info['user'] = urldecode($this->info['user']);
         }
 
-        if(isset($this->info['pass'])) {
+        if (isset($this->info['pass'])) {
             $this->info['pass'] = urldecode($this->info['pass']);
         }
         
-        if(isset($this->info['host'])) {
+        if (isset($this->info['host'])) {
             $this->info['host'] = strtolower($this->info['host']);
             $this->info['host'] = str_replace(' ', '', $this->info['host']);
         }
         
-        if(isset($this->info['path'])) {
+        if (isset($this->info['path'])) {
             $this->info['path'] = str_replace(' ', '', $this->info['path']);
         }
         
-        if(isset($this->info['query']) && !empty($this->info['query']))
+        if (isset($this->info['query']) && !empty($this->info['query']))
         {
             $this->info['params'] = ConvertHelper::parseQueryString($this->info['query']);
             ksort($this->info['params']);
@@ -295,9 +295,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);
             }
@@ -323,7 +323,7 @@ 
     */
     protected function restoreUnicodeChar(string $string) : string
     {
-        if(strstr($string, '%'))
+        if (strstr($string, '%'))
         {
             return str_replace(array_keys($this->unicodeChars), array_values($this->unicodeChars), $string);
         }
@@ -333,12 +333,12 @@ 
     
     protected function detectType_email() : bool
     {
-        if(isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') {
+        if (isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') {
             $this->info['type'] = URLInfo::TYPE_EMAIL;
             return true;
         }
         
-        if(isset($this->info['path']) && preg_match(RegexHelper::REGEX_EMAIL, $this->info['path']))
+        if (isset($this->info['path']) && preg_match(RegexHelper::REGEX_EMAIL, $this->info['path']))
         {
             $this->info['scheme'] = 'mailto';
             $this->info['type'] = URLInfo::TYPE_EMAIL;
@@ -350,13 +350,13 @@ 
 
     protected function detectType_ipAddress() : bool
     {
-        if($this->isPathOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['path'])) {
+        if ($this->isPathOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['path'])) {
             $this->info['host'] = $this->info['path'];
             $this->info['scheme'] = 'https';
             unset($this->info['path']);
         }
 
-        if($this->isHostOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['host'])) {
+        if ($this->isHostOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['host'])) {
             $this->info['ip'] = $this->info['host'];
             return true;
         }
@@ -376,7 +376,7 @@ 
 
     protected function detectType_fragmentLink() : bool
     {
-        if(isset($this->info['fragment']) && !isset($this->info['scheme'])) {
+        if (isset($this->info['fragment']) && !isset($this->info['scheme'])) {
             $this->info['type'] = URLInfo::TYPE_FRAGMENT;
             return true;
         }
@@ -386,7 +386,7 @@ 
     
     protected function detectType_phoneLink() : bool
     {
-        if(isset($this->info['scheme']) && $this->info['scheme'] == 'tel') {
+        if (isset($this->info['scheme']) && $this->info['scheme'] == 'tel') {
             $this->info['type'] = URLInfo::TYPE_PHONE;
             return true;
         }
@@ -421,7 +421,7 @@ 
     */
     public function getErrorMessage() : string
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             return $this->error['message'];
         }
         
@@ -436,7 +436,7 @@ 
     */
     public function getErrorCode() : int
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             return $this->error['code'];
         }
         

Braces +2 added lines, -4 removed lines

@@ -251,8 +251,7 @@ 
         if(isset($this->info['scheme']))
         {
             $this->info['scheme'] = strtolower($this->info['scheme']);
-        }
-        else
+        } else
         {
             $scheme = URLInfo_Schemes::detectScheme($this->url);
             if(!empty($scheme)) {
@@ -300,8 +299,7 @@ 
             if(is_array($val))
             {
                 $val = $this->restoreUnicodeChars($val);
-            }
-            else
+            } else
             {
                 $val = $this->restoreUnicodeChar($val);
             }