Mistralys / application-utils

src/FileHelper/CLICommandChecker.php

Spacing +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
     {
         $os = $this->getOS();
 
-        if(isset(self::$osCommands[$os]))
+        if (isset(self::$osCommands[$os]))
         {
             return self::$osCommands[$os];
         }
@@ -83,7 +83,7 @@ 
      */
     public function exists(string $command) : bool
     {
-        if(isset(self::$checked[$command]))
+        if (isset(self::$checked[$command]))
         {
             return self::$checked[$command];
         }
@@ -114,7 +114,7 @@ 
             $pipes
         );
 
-        if($process === false)
+        if ($process === false)
         {
             return '';
         }
@@ -126,7 +126,7 @@ 
 
         proc_close($process);
 
-        if($stdout === false)
+        if ($stdout === false)
         {
             return '';
         }

src/FileHelper/FileInfo.php

Braces +1 added lines, -2 removed lines

@@ -255,8 +255,7 @@
         if($this->exists())
         {
             $this->requireWritable();
-        }
-        else
+        } else
         {
             FolderInfo::factory(dirname($this->path))
                 ->create()

Spacing +17 added lines, -17 removed lines

@@ -50,7 +50,7 @@ 
      */
     public static function factory($path) : FileInfo
     {
-        if($path instanceof self) {
+        if ($path instanceof self) {
             return $path;
         }
 
@@ -67,12 +67,12 @@ 
         $pathString = AbstractPathInfo::type2string($path);
         $key = $pathString.';'.static::class;
 
-        if(!isset(self::$infoCache[$key]))
+        if (!isset(self::$infoCache[$key]))
         {
             $class = static::class;
             $instance = new $class($pathString);
 
-            if(!$instance instanceof self) {
+            if (!$instance instanceof self) {
                 throw new FileHelper_Exception(
                     'Invalid class'
                 );
@@ -106,7 +106,7 @@ 
     {
         parent::__construct($path);
 
-        if(!self::is_file($this->path))
+        if (!self::is_file($this->path))
         {
             throw new FileHelper_Exception(
                 'Not a file path',
@@ -120,7 +120,7 @@ 
     {
         $path = trim($path);
 
-        if(empty($path))
+        if (empty($path))
         {
             return false;
         }
@@ -128,9 +128,9 @@ 
         return is_file($path) || pathinfo($path, PATHINFO_EXTENSION) !== '';
     }
 
-    public function removeExtension(bool $keepPath=false) : string
+    public function removeExtension(bool $keepPath = false) : string
     {
-        if(!$keepPath)
+        if (!$keepPath)
         {
             return (string)pathinfo($this->getName(), PATHINFO_FILENAME);
         }
@@ -155,11 +155,11 @@ 
         return $this->removeExtension();
     }
 
-    public function getExtension(bool $lowercase=true) : string
+    public function getExtension(bool $lowercase = true) : string
     {
         $ext = (string)pathinfo($this->path, PATHINFO_EXTENSION);
 
-        if($lowercase)
+        if ($lowercase)
         {
             $ext = mb_strtolower($ext);
         }
@@ -180,12 +180,12 @@ 
      */
     public function delete() : FileInfo
     {
-        if(!$this->exists())
+        if (!$this->exists())
         {
             return $this;
         }
 
-        if(unlink($this->path))
+        if (unlink($this->path))
         {
             return $this;
         }
@@ -212,7 +212,7 @@ 
     {
         $target = $this->checkCopyPrerequisites($targetPath);
 
-        if(copy($this->path, (string)$target))
+        if (copy($this->path, (string)$target))
         {
             return $target;
         }
@@ -264,7 +264,7 @@ 
      */
     public function getLineReader() : LineReader
     {
-        if($this->lineReader === null)
+        if ($this->lineReader === null)
         {
             $this->lineReader = new LineReader($this);
         }
@@ -283,7 +283,7 @@ 
 
         $result = file_get_contents($this->getPath());
 
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
 
@@ -305,7 +305,7 @@ 
      */
     public function putContents(string $content) : FileInfo
     {
-        if($this->exists())
+        if ($this->exists())
         {
             $this->requireWritable();
         }
@@ -316,7 +316,7 @@ 
                 ->requireWritable();
         }
 
-        if(file_put_contents($this->path, $content) !== false)
+        if (file_put_contents($this->path, $content) !== false)
         {
             return $this;
         }
@@ -346,7 +346,7 @@ 
      */
     private function createFolder() : FileInfo
     {
-        if(!$this->exists())
+        if (!$this->exists())
         {
             FolderInfo::factory($this->getFolderPath())
                 ->create()

src/FileHelper/UnicodeHandling.php

Spacing +12 added lines, -12 removed lines

@@ -27,12 +27,12 @@ 
     /**
      * @var array<string,string>|NULL
      */
-    protected static ?array $utfBoms = null;
+    protected static ? array $utfBoms = null;
 
     /**
      * @var string[]|NULL
      */
-    protected static ?array $encodings = null;
+    protected static ? array $encodings = null;
 
     public function __construct()
     {
@@ -70,9 +70,9 @@ 
 
         fclose($fp);
 
-        foreach(self::$utfBoms as $bom => $value)
+        foreach (self::$utfBoms as $bom => $value)
         {
-            if(mb_strpos($text, $value) === 0)
+            if (mb_strpos($text, $value) === 0)
             {
                 return $bom;
             }
@@ -83,23 +83,23 @@ 
 
     private function initBOMs() : void
     {
-        if(isset(self::$utfBoms))
+        if (isset(self::$utfBoms))
         {
             return;
         }
 
         self::$utfBoms = array(
-            'UTF32-BE' => chr(0x00) . chr(0x00) . chr(0xFE) . chr(0xFF),
-            'UTF32-LE' => chr(0xFF) . chr(0xFE) . chr(0x00) . chr(0x00),
-            'UTF16-BE' => chr(0xFE) . chr(0xFF),
-            'UTF16-LE' => chr(0xFF) . chr(0xFE),
-            'UTF8' => chr(0xEF) . chr(0xBB) . chr(0xBF)
+            'UTF32-BE' => chr(0x00).chr(0x00).chr(0xFE).chr(0xFF),
+            'UTF32-LE' => chr(0xFF).chr(0xFE).chr(0x00).chr(0x00),
+            'UTF16-BE' => chr(0xFE).chr(0xFF),
+            'UTF16-LE' => chr(0xFF).chr(0xFE),
+            'UTF8' => chr(0xEF).chr(0xBB).chr(0xBF)
         );
     }
 
     private function initEncodings() : void
     {
-        if(isset(self::$encodings))
+        if (isset(self::$encodings))
         {
             return;
         }
@@ -108,7 +108,7 @@ 
 
         self::$encodings = array();
 
-        foreach($encodings as $string)
+        foreach ($encodings as $string)
         {
             $withHyphen = str_replace('UTF', 'UTF-', $string);
 

src/FileHelper/FileInfo/FileSender.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
         $this->file = $info;
     }
 
-    public function send(?string $fileName = null, bool $asAttachment=true) : void
+    public function send(?string $fileName = null, bool $asAttachment = true) : void
     {
         $this->file
             ->requireExists()
@@ -53,7 +53,7 @@ 
     {
         header("Cache-Control: public", true);
         header("Content-Description: File Transfer", true);
-        header("Content-Type: " . $this->detectMime(), true);
+        header("Content-Type: ".$this->detectMime(), true);
 
         header(sprintf(
             "Content-Disposition: %s; filename=%s",
@@ -69,7 +69,7 @@ 
 
     private function resolveDisposition(bool $asAttachment) : string
     {
-        if($asAttachment)
+        if ($asAttachment)
         {
             return 'attachment';
         }

src/FileHelper/FileInfo/LineReader.php

Spacing +12 added lines, -12 removed lines

@@ -47,15 +47,15 @@ 
 
         $file = new SplFileObject($this->file->getPath());
 
-        if($file->eof()) {
+        if ($file->eof()) {
             return '';
         }
 
-        $targetLine = $lineNumber-1;
+        $targetLine = $lineNumber - 1;
 
         $file->seek($targetLine);
 
-        if($file->key() !== $targetLine)
+        if ($file->key() !== $targetLine)
         {
             return null;
         }
@@ -76,7 +76,7 @@ 
         $number = $spl->key();
 
         // if seeking to the end the cursor is still at 0, there are no lines.
-        if($number === 0)
+        if ($number === 0)
         {
             // since it's a very small file, to get reliable results,
             // we read its contents and use that to determine what
@@ -84,13 +84,13 @@ 
             // that this is not practical to solve with the SplFileObject.
             $content = file_get_contents($path);
 
-            if(empty($content)) {
+            if (empty($content)) {
                 return 0;
             }
         }
 
         // return the line number we were able to reach + 1 (key is zero-based)
-        return $number+1;
+        return $number + 1;
     }
 
     /**
@@ -98,13 +98,13 @@ 
      * @return string[]
      * @throws FileHelper_Exception
      */
-    public function getLines(int $amount=0) : array
+    public function getLines(int $amount = 0) : array
     {
         $this->file->requireExists();
 
         $fn = fopen($this->file->getPath(), 'rb');
 
-        if($fn === false)
+        if ($fn === false)
         {
             throw new FileHelper_Exception(
                 'Could not open file for reading.',
@@ -120,19 +120,19 @@ 
         $counter = 0;
         $first = true;
 
-        while(!feof($fn))
+        while (!feof($fn))
         {
             $counter++;
 
             $line = fgets($fn);
 
             // can happen with zero length files
-            if($line === false) {
+            if ($line === false) {
                 continue;
             }
 
             // the first line may contain a unicode BOM marker.
-            if($first)
+            if ($first)
             {
                 $line = ConvertHelper::stripUTFBom($line);
                 $first = false;
@@ -140,7 +140,7 @@ 
 
             $result[] = $line;
 
-            if($amount > 0 && $counter === $amount) {
+            if ($amount > 0 && $counter === $amount) {
                 break;
             }
         }

src/FileHelper/FileInfo/NameFixer.php

Spacing +2 added lines, -2 removed lines

@@ -49,13 +49,13 @@
 
         $name = str_replace(array_keys($replaces), array_values($replaces), $name);
 
-        while(strpos($name, '  ') !== false) {
+        while (strpos($name, '  ') !== false) {
             $name = str_replace('  ', ' ', $name);
         }
 
         $name = str_replace(array_keys($replaces), array_values($replaces), $name);
 
-        while(strpos($name, '..') !== false) {
+        while (strpos($name, '..') !== false) {
             $name = str_replace('..', '.', $name);
         }
 

src/FileHelper/PathsReducer.php

Spacing +13 added lines, -13 removed lines

@@ -36,7 +36,7 @@ 
      * @param string[] $paths
      * @throws FileHelper_Exception
      */
-    public function __construct(array $paths=array())
+    public function __construct(array $paths = array())
     {
         $this->addPaths($paths);
     }
@@ -49,7 +49,7 @@ 
      */
     public function addPaths(array $paths) : PathsReducer
     {
-        foreach($paths as $path) {
+        foreach ($paths as $path) {
             $this->addPath($path);
         }
 
@@ -66,7 +66,7 @@ 
     {
         $path = FileHelper::normalizePath($path);
 
-        if(!in_array($path, $this->paths, true)) {
+        if (!in_array($path, $this->paths, true)) {
             $this->paths[] = $path;
         }
 
@@ -83,11 +83,11 @@ 
     {
         $split = $this->splitPaths();
 
-        if(empty($split)) {
+        if (empty($split)) {
             return array();
         }
 
-        while($this->shiftPart($split) === true) {}
+        while ($this->shiftPart($split) === true) {}
 
         return $this->joinPaths($split);
     }
@@ -101,7 +101,7 @@ 
         $result = array();
 
         foreach ($split as $entry) {
-            if(!empty($entry)) {
+            if (!empty($entry)) {
                 $result[] = implode('/', $entry);
             }
         }
@@ -118,22 +118,22 @@ 
         $current = null;
         $result = array();
 
-        foreach($split as $entry)
+        foreach ($split as $entry)
         {
-            if(empty($entry)) {
+            if (empty($entry)) {
                 return false;
             }
 
             $part = array_shift($entry);
-            if(empty($entry)) {
+            if (empty($entry)) {
                 return false;
             }
 
-            if($current === null) {
+            if ($current === null) {
                 $current = $part;
             }
 
-            if($part !== $current) {
+            if ($part !== $current) {
                 return false;
             }
 
@@ -152,9 +152,9 @@ 
     {
         $split = array();
 
-        foreach($this->paths as $path) {
+        foreach ($this->paths as $path) {
             $entry = ConvertHelper::explodeTrim('/', $path);
-            if(!empty($entry)) {
+            if (!empty($entry)) {
                 $split[] = $entry;
             }
         }

src/FileHelper/FileDownloader.php

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function setTimeout(int $timeout) : FileDownloader
     {
-        if($timeout > 0)
+        if ($timeout > 0)
         {
             $this->timeout = $timeout;
         }
@@ -52,7 +52,7 @@ 
      * @param bool $enabled
      * @return FileDownloader
      */
-    public function setSSLEnabled(bool $enabled=true) : FileDownloader
+    public function setSSLEnabled(bool $enabled = true) : FileDownloader
     {
         $this->SSLEnabled = $enabled;
         return $this;
@@ -73,7 +73,7 @@ 
 
         $output = curl_exec($ch);
 
-        if($output === false)
+        if ($output === false)
         {
             throw new FileHelper_Exception(
                 'Unable to open URL',
@@ -88,7 +88,7 @@ 
 
         curl_close($ch);
 
-        if(is_string($output))
+        if (is_string($output))
         {
             return $output;
         }
@@ -108,7 +108,7 @@ 
     {
         $ch = curl_init();
 
-        if(!is_resource($ch))
+        if (!is_resource($ch))
         {
             throw new FileHelper_Exception(
                 'Could not initialize a new cURL instance.',
@@ -125,7 +125,7 @@ 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
 
-        if(!$this->SSLEnabled)
+        if (!$this->SSLEnabled)
         {
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

src/URLInfo.php

Indentation +194 added lines, -194 removed lines

@@ -37,42 +37,42 @@ 
     public const TYPE_PHONE = 'phone';
     public const TYPE_URL = 'url';
 
-   /**
-    * The original URL that was passed to the constructor.
-    * @var string
-    */
+    /**
+     * The original URL that was passed to the constructor.
+     * @var string
+     */
     protected string $rawURL;
 
-   /**
-    * @var array<string,mixed>
-    */
+    /**
+     * @var array<string,mixed>
+     */
     protected array $info;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected array $excludedParams = array();
     
-   /**
-    * @var bool
-    * @see URLInfo::setParamExclusion()
-    */
+    /**
+     * @var bool
+     * @see URLInfo::setParamExclusion()
+     */
     protected bool $paramExclusion = false;
     
-   /**
-    * @var array<string,string>|NULL
-    * @see URLInfo::getTypeLabel()
-    */
+    /**
+     * @var array<string,string>|NULL
+     * @see URLInfo::getTypeLabel()
+     */
     protected static ?array $typeLabels = null;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected bool $highlightExcluded = false;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected array $infoKeys = array(
         'scheme',
         'host',
@@ -84,24 +84,24 @@ 
         'fragment'
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected string $url;
     
-   /**
-    * @var URLInfo_Parser
-    */
+    /**
+     * @var URLInfo_Parser
+     */
     protected URLInfo_Parser $parser;
     
-   /**
-    * @var URLInfo_Normalizer|NULL
-    */
+    /**
+     * @var URLInfo_Normalizer|NULL
+     */
     protected ?URLInfo_Normalizer $normalizer = null;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected bool $encodeUTFChars = false;
     
     public function __construct(string $url)
@@ -118,14 +118,14 @@ 
         $this->info = $this->parser->getInfo();
     }
 
-   /**
-    * Whether to URL encode any non-encoded UTF8 characters in the URL.
-    * Default is to leave them as-is for better readability, since 
-    * browsers handle this well.
-    * 
-    * @param bool $enabled
-    * @return URLInfo
-    */
+    /**
+     * Whether to URL encode any non-encoded UTF8 characters in the URL.
+     * Default is to leave them as-is for better readability, since 
+     * browsers handle this well.
+     * 
+     * @param bool $enabled
+     * @return URLInfo
+     */
     public function setUTFEncoding(bool $enabled=true) : URLInfo
     {
         if($this->encodeUTFChars !== $enabled)
@@ -142,13 +142,13 @@ 
         return $this->encodeUTFChars;
     }
     
-   /**
-    * Filters an URL: removes control characters and the
-    * like to have a clean URL to work with.
-    * 
-    * @param string $url
-    * @return string
-    */
+    /**
+     * Filters an URL: removes control characters and the
+     * like to have a clean URL to work with.
+     * 
+     * @param string $url
+     * @return string
+     */
     public static function filterURL(string $url)
     {
         return URLInfo_Filter::filter($url);
@@ -178,12 +178,12 @@ 
         return $this->info['type'] === self::TYPE_PHONE;
     }
     
-   /**
-    * Whether the URL is a regular URL, not one of the 
-    * other types like a phone number or email address.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the URL is a regular URL, not one of the 
+     * other types like a phone number or email address.
+     * 
+     * @return bool
+     */
     public function isURL() : bool
     {
         $host = $this->getHost();
@@ -195,20 +195,20 @@ 
         return $this->parser->isValid();
     }
     
-   /**
-    * Retrieves the host name, or an empty string if none is present.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the host name, or an empty string if none is present.
+     * 
+     * @return string
+     */
     public function getHost() : string
     {
         return $this->getInfoKey('host');
     }
     
-   /**
-    * Retrieves the path, or an empty string if none is present.
-    * @return string
-    */
+    /**
+     * Retrieves the path, or an empty string if none is present.
+     * @return string
+     */
     public function getPath() : string
     {
         return $this->getInfoKey('path');
@@ -224,10 +224,10 @@ 
         return $this->getInfoKey('scheme');
     }
     
-   /**
-    * Retrieves the port specified in the URL, or -1 if none is preseent.
-    * @return int
-    */
+    /**
+     * Retrieves the port specified in the URL, or -1 if none is preseent.
+     * @return int
+     */
     public function getPort() : int
     {
         $port = $this->getInfoKey('port');
@@ -239,13 +239,13 @@ 
         return -1;
     }
     
-   /**
-    * Retrieves the raw query string, or an empty string if none is present.
-    * 
-    * @return string
-    * 
-    * @see URLInfo::getParams()
-    */
+    /**
+     * Retrieves the raw query string, or an empty string if none is present.
+     * 
+     * @return string
+     * 
+     * @see URLInfo::getParams()
+     */
     public function getQuery() : string
     {
         return $this->getInfoKey('query');
@@ -261,20 +261,20 @@ 
         return $this->getInfoKey('pass');
     }
     
-   /**
-    * Whether the URL contains a port number.
-    * @return bool
-    */
+    /**
+     * Whether the URL contains a port number.
+     * @return bool
+     */
     public function hasPort() : bool
     {
         return $this->getPort() !== -1;
     }
     
-   /**
-    * Alias for the hasParams() method.
-    * @return bool
-    * @see URLInfo::hasParams()
-    */
+    /**
+     * Alias for the hasParams() method.
+     * @return bool
+     * @see URLInfo::hasParams()
+     */
     public function hasQuery() : bool
     {
         return $this->hasParams();
@@ -319,23 +319,23 @@ 
         return '';
     }
 
-   /**
-    * Retrieves a normalized URL: this ensures that all parameters
-    * in the URL are always in the same order.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves a normalized URL: this ensures that all parameters
+     * in the URL are always in the same order.
+     * 
+     * @return string
+     */
     public function getNormalized() : string
     {
         return $this->normalize(true);
     }
     
-   /**
-    * Like getNormalized(), but if a username and password are present
-    * in the URL, returns the URL without them.
-    * 
-    * @return string
-    */
+    /**
+     * Like getNormalized(), but if a username and password are present
+     * in the URL, returns the URL without them.
+     * 
+     * @return string
+     */
     public function getNormalizedWithoutAuth() : string
     {
         return $this->normalize(false);
@@ -356,25 +356,25 @@ 
         return $this->normalizer->normalize();
     }
     
-   /**
-    * Creates a hash of the URL, which can be used for comparisons.
-    * Since any parameters in the URL's query are sorted alphabetically,
-    * the same links with a different parameter order will have the 
-    * same hash.
-    * 
-    * @return string
-    */
+    /**
+     * Creates a hash of the URL, which can be used for comparisons.
+     * Since any parameters in the URL's query are sorted alphabetically,
+     * the same links with a different parameter order will have the 
+     * same hash.
+     * 
+     * @return string
+     */
     public function getHash()
     {
         return \AppUtils\ConvertHelper::string2shortHash($this->getNormalized());
     }
 
-   /**
-    * Highlights the URL using HTML tags with specific highlighting
-    * class names.
-    * 
-    * @return string Will return an empty string if the URL is not valid.
-    */
+    /**
+     * Highlights the URL using HTML tags with specific highlighting
+     * class names.
+     * 
+     * @return string Will return an empty string if the URL is not valid.
+     */
     public function getHighlighted() : string
     {
         if(!$this->isValid()) {
@@ -408,15 +408,15 @@ 
         return count($params);
     }
     
-   /**
-    * Retrieves all parameters specified in the url,
-    * if any, as an associative array. 
-    * 
-    * NOTE: Ignores parameters that have been added
-    * to the excluded parameters list.
-    *
-    * @return array<string,string>
-    */
+    /**
+     * Retrieves all parameters specified in the url,
+     * if any, as an associative array. 
+     * 
+     * NOTE: Ignores parameters that have been added
+     * to the excluded parameters list.
+     *
+     * @return array<string,string>
+     */
     public function getParams() : array
     {
         if(!$this->paramExclusion || empty($this->excludedParams)) {
@@ -434,22 +434,22 @@ 
         return $keep;
     }
     
-   /**
-    * Retrieves the names of all parameters present in the URL, if any.
-    * @return string[]
-    */
+    /**
+     * Retrieves the names of all parameters present in the URL, if any.
+     * @return string[]
+     */
     public function getParamNames() : array
     {
         $params = $this->getParams();
         return array_keys($params);
     }
     
-   /**
-    * Retrieves a specific parameter value from the URL.
-    * 
-    * @param string $name
-    * @return string The parameter value, or an empty string if it does not exist.
-    */
+    /**
+     * Retrieves a specific parameter value from the URL.
+     * 
+     * @param string $name
+     * @return string The parameter value, or an empty string if it does not exist.
+     */
     public function getParam(string $name) : string
     {
         if(isset($this->info['params'][$name])) {
@@ -459,16 +459,16 @@ 
         return '';
     }
     
-   /**
-    * Excludes an URL parameter entirely if present:
-    * the parser will act as if the parameter was not
-    * even present in the source URL, effectively
-    * stripping it.
-    *
-    * @param string $name
-    * @param string $reason A human readable explanation why this is excluded - used when highlighting links.
-    * @return URLInfo
-    */
+    /**
+     * Excludes an URL parameter entirely if present:
+     * the parser will act as if the parameter was not
+     * even present in the source URL, effectively
+     * stripping it.
+     *
+     * @param string $name
+     * @param string $reason A human readable explanation why this is excluded - used when highlighting links.
+     * @return URLInfo
+     */
     public function excludeParam(string $name, string $reason='') : URLInfo
     {
         if(!isset($this->excludedParams[$name]))
@@ -521,14 +521,14 @@ 
         return self::$typeLabels[$this->getType()];
     }
 
-   /**
-    * Whether excluded parameters should be highlighted in
-    * a different color in the URL when using the
-    * {@link URLInfo::getHighlighted()} method.
-    *
-    * @param bool $highlight
-    * @return URLInfo
-    */
+    /**
+     * Whether excluded parameters should be highlighted in
+     * a different color in the URL when using the
+     * {@link URLInfo::getHighlighted()} method.
+     *
+     * @param bool $highlight
+     * @return URLInfo
+     */
     public function setHighlightExcluded(bool $highlight=true) : URLInfo
     {
         $this->highlightExcluded = $highlight;
@@ -584,24 +584,24 @@ 
         return $this;
     }
     
-   /**
-    * Whether the parameter exclusion mode is enabled:
-    * In this case, if any parameters have been added to the
-    * exclusion list, all relevant methods will exclude these.
-    *
-    * @return bool
-    */
+    /**
+     * Whether the parameter exclusion mode is enabled:
+     * In this case, if any parameters have been added to the
+     * exclusion list, all relevant methods will exclude these.
+     *
+     * @return bool
+     */
     public function isParamExclusionEnabled() : bool
     {
         return $this->paramExclusion;
     }
     
-   /**
-    * Checks whether the link contains any parameters that
-    * are on the list of excluded parameters.
-    *
-    * @return bool
-    */
+    /**
+     * Checks whether the link contains any parameters that
+     * are on the list of excluded parameters.
+     *
+     * @return bool
+     */
     public function containsExcludedParams() : bool
     {
         if(empty($this->excludedParams)) {
@@ -672,16 +672,16 @@ 
         return $this->highlightExcluded;
     }
     
-   /**
-    * Checks if the URL exists, i.e. can be connected to. Will return
-    * true if the returned HTTP status code is `200` or `302`.
-    * 
-    * NOTE: If the target URL requires HTTP authentication, the username
-    * and password should be integrated into the URL.
-    * 
-    * @return bool
-    * @throws BaseException
-    */
+    /**
+     * Checks if the URL exists, i.e. can be connected to. Will return
+     * true if the returned HTTP status code is `200` or `302`.
+     * 
+     * NOTE: If the target URL requires HTTP authentication, the username
+     * and password should be integrated into the URL.
+     * 
+     * @return bool
+     * @throws BaseException
+     */
     public function tryConnect(bool $verifySSL=true) : bool
     {
         return $this->createConnectionTester()
@@ -689,26 +689,26 @@ 
         ->canConnect();
     }
     
-   /**
-    * Creates the connection tester instance that is used
-    * to check if a URL can be connected to, and which is
-    * used in the {@see URLInfo::tryConnect()} method. It
-    * allows more settings to be used.
-    * 
-    * @return URLInfo_ConnectionTester
-    */
+    /**
+     * Creates the connection tester instance that is used
+     * to check if a URL can be connected to, and which is
+     * used in the {@see URLInfo::tryConnect()} method. It
+     * allows more settings to be used.
+     * 
+     * @return URLInfo_ConnectionTester
+     */
     public function createConnectionTester() : URLInfo_ConnectionTester
     {
         return new URLInfo_ConnectionTester($this);
     }
     
-   /**
-    * Adds/overwrites an URL parameter.
-    *  
-    * @param string $name
-    * @param string $val
-    * @return URLInfo
-    */
+    /**
+     * Adds/overwrites an URL parameter.
+     *  
+     * @param string $name
+     * @param string $val
+     * @return URLInfo
+     */
     public function setParam(string $name, string $val) : URLInfo
     {
         $this->info['params'][$name] = $val;
@@ -716,13 +716,13 @@ 
         return $this;
     }
     
-   /**
-    * Removes an URL parameter. Has no effect if the 
-    * parameter is not present to begin with.
-    * 
-    * @param string $param
-    * @return URLInfo
-    */
+    /**
+     * Removes an URL parameter. Has no effect if the 
+     * parameter is not present to begin with.
+     * 
+     * @param string $param
+     * @return URLInfo
+     */
     public function removeParam(string $param) : URLInfo
     {
         if(isset($this->info['params'][$param]))

Spacing +27 added lines, -27 removed lines

@@ -63,7 +63,7 @@ 
     * @var array<string,string>|NULL
     * @see URLInfo::getTypeLabel()
     */
-    protected static ?array $typeLabels = null;
+    protected static ? array $typeLabels = null;
     
    /**
     * @var bool
@@ -126,9 +126,9 @@ 
     * @param bool $enabled
     * @return URLInfo
     */
-    public function setUTFEncoding(bool $enabled=true) : URLInfo
+    public function setUTFEncoding(bool $enabled = true) : URLInfo
     {
-        if($this->encodeUTFChars !== $enabled)
+        if ($this->encodeUTFChars !== $enabled)
         {
             $this->encodeUTFChars = $enabled;
             $this->parse(); // re-parse the URL to apply the changes
@@ -232,7 +232,7 @@ 
     {
         $port = $this->getInfoKey('port');
         
-        if(!empty($port)) {
+        if (!empty($port)) {
             return (int)$port;
         }
         
@@ -312,7 +312,7 @@ 
     
     protected function getInfoKey(string $name) : string
     {
-        if(isset($this->info[$name])) {
+        if (isset($this->info[$name])) {
             return (string)$this->info[$name];
         }
         
@@ -341,13 +341,13 @@ 
         return $this->normalize(false);
     }
     
-    protected function normalize(bool $auth=true) : string
+    protected function normalize(bool $auth = true) : string
     {
-        if(!$this->isValid()) {
+        if (!$this->isValid()) {
             return '';
         }
         
-        if(!isset($this->normalizer)) {
+        if (!isset($this->normalizer)) {
             $this->normalizer = new URLInfo_Normalizer($this);
         }
         
@@ -377,7 +377,7 @@ 
     */
     public function getHighlighted() : string
     {
-        if(!$this->isValid()) {
+        if (!$this->isValid()) {
             return '';
         }
         
@@ -419,14 +419,14 @@ 
     */
     public function getParams() : array
     {
-        if(!$this->paramExclusion || empty($this->excludedParams)) {
+        if (!$this->paramExclusion || empty($this->excludedParams)) {
             return $this->info['params'];
         }
         
         $keep = array();
-        foreach($this->info['params'] as $name => $value) 
+        foreach ($this->info['params'] as $name => $value) 
         {
-            if(!isset($this->excludedParams[$name])) {
+            if (!isset($this->excludedParams[$name])) {
                 $keep[$name] = $value;
             }
         }
@@ -452,7 +452,7 @@ 
     */
     public function getParam(string $name) : string
     {
-        if(isset($this->info['params'][$name])) {
+        if (isset($this->info['params'][$name])) {
             return $this->info['params'][$name];
         }
         
@@ -469,9 +469,9 @@ 
     * @param string $reason A human readable explanation why this is excluded - used when highlighting links.
     * @return URLInfo
     */
-    public function excludeParam(string $name, string $reason='') : URLInfo
+    public function excludeParam(string $name, string $reason = '') : URLInfo
     {
-        if(!isset($this->excludedParams[$name]))
+        if (!isset($this->excludedParams[$name]))
         {
             $this->excludedParams[$name] = $reason;
             $this->setParamExclusion();
@@ -497,7 +497,7 @@ 
     
     public function getTypeLabel() : string
     {
-        if(!isset(self::$typeLabels))
+        if (!isset(self::$typeLabels))
         {
             self::$typeLabels = array(
                 self::TYPE_EMAIL => t('Email'),
@@ -509,7 +509,7 @@ 
         
         $type = $this->getType();
         
-        if(!isset(self::$typeLabels[$type]))
+        if (!isset(self::$typeLabels[$type]))
         {
             throw new BaseException(
                 sprintf('Unknown URL type label for type [%s].', $type),
@@ -529,7 +529,7 @@ 
     * @param bool $highlight
     * @return URLInfo
     */
-    public function setHighlightExcluded(bool $highlight=true) : URLInfo
+    public function setHighlightExcluded(bool $highlight = true) : URLInfo
     {
         $this->highlightExcluded = $highlight;
         return $this;
@@ -578,7 +578,7 @@ 
      * @see URLInfo::isParamExclusionEnabled()
      * @see URLInfo::setHighlightExcluded()
      */
-    public function setParamExclusion(bool $enabled=true) : URLInfo
+    public function setParamExclusion(bool $enabled = true) : URLInfo
     {
         $this->paramExclusion = $enabled;
         return $this;
@@ -604,13 +604,13 @@ 
     */
     public function containsExcludedParams() : bool
     {
-        if(empty($this->excludedParams)) {
+        if (empty($this->excludedParams)) {
             return false;
         }
         
         $names = array_keys($this->info['params']);
-        foreach($names as $name) {
-            if(isset($this->excludedParams[$name])) {
+        foreach ($names as $name) {
+            if (isset($this->excludedParams[$name])) {
                 return true;
             }
         }
@@ -626,7 +626,7 @@ 
 
     public function offsetSet($offset, $value) 
     {
-        if(in_array($offset, $this->infoKeys)) {
+        if (in_array($offset, $this->infoKeys)) {
             $this->info[$offset] = $value;
         }
     }
@@ -643,11 +643,11 @@ 
     
     public function offsetGet($offset)
     {
-        if($offset === 'port') {
+        if ($offset === 'port') {
             return $this->getPort();
         }
         
-        if(in_array($offset, $this->infoKeys)) {
+        if (in_array($offset, $this->infoKeys)) {
             return $this->getInfoKey($offset);
         }
         
@@ -682,7 +682,7 @@ 
     * @return bool
     * @throws BaseException
     */
-    public function tryConnect(bool $verifySSL=true) : bool
+    public function tryConnect(bool $verifySSL = true) : bool
     {
         return $this->createConnectionTester()
         ->setVerifySSL($verifySSL)
@@ -725,7 +725,7 @@ 
     */
     public function removeParam(string $param) : URLInfo
     {
-        if(isset($this->info['params'][$param]))
+        if (isset($this->info['params'][$param]))
         {
             unset($this->info['params'][$param]);
         }