Mistralys / application-utils

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);
             }

src/URLInfo/Schemes.php

Spacing +4 added lines, -4 removed lines

@@ -72,8 +72,8 @@ 
     {
         self::buildCache();
 
-        foreach(self::$cache as $scheme => $length) {
-            if(strtolower(substr($url, 0, $length)) === $scheme) {
+        foreach (self::$cache as $scheme => $length) {
+            if (strtolower(substr($url, 0, $length)) === $scheme) {
                 return $scheme;
             }
         }
@@ -88,11 +88,11 @@ 
      */
     private static function buildCache() : void
     {
-        if(!empty(self::$cache)) {
+        if (!empty(self::$cache)) {
             return;
         }
 
-        foreach(self::$schemes as $scheme) {
+        foreach (self::$schemes as $scheme) {
             self::$cache[$scheme] = strlen($scheme);
         }
     }

src/RegexHelper.php

Indentation +12 added lines, -12 removed lines

@@ -42,10 +42,10 @@ 
     
     const REGEX_MD5 = '/^[a-f0-9]{32}$/i';
 
-   /**
-    * @var string
-    * @see https://en.wikipedia.org/wiki/Email_address#Local-part
-    */
+    /**
+     * @var string
+     * @see https://en.wikipedia.org/wiki/Email_address#Local-part
+     */
     const REGEX_EMAIL = '/[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i';
     
     const REGEX_PHONE = '/\A[+0-9][0-9 +\-()]+\z/m';
@@ -97,14 +97,14 @@ 
      */
     const REGEX_IS_HTML = '%<{0,1}[a-z\/][\s\S]*>|<[a-z\/][\s\S]*>{0,1}%i';
     
-   /**
-    * Hexadecimal color codes. Allows the following formats:
-    * 
-    * FFFFFF
-    * FFF
-    * 
-    * @var string
-    */
+    /**
+     * Hexadecimal color codes. Allows the following formats:
+     * 
+     * FFFFFF
+     * FFF
+     * 
+     * @var string
+     */
     const REGEX_HEX_COLOR_CODE = '/\A(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\z/iU';
 
     /**

src/HTMLHelper.php

Spacing +2 added lines, -2 removed lines

@@ -33,14 +33,14 @@
     {
         preg_match_all('%<([A-Z][A-Z0-9]*)\b[^>]*>(.*?)</\1>%si', $html, $result, PREG_PATTERN_ORDER);
 
-        if(empty($result[1])) {
+        if (empty($result[1])) {
             return '<p>'.$text.'</p>';
         }
 
         $tagName = array_pop($result[1]);
         $pos = strrpos($html, '</'.$tagName.'>');
 
-        if(in_array(strtolower($tagName), self::$newParaTags)) {
+        if (in_array(strtolower($tagName), self::$newParaTags)) {
             $replace = '</'.$tagName.'><p>'.$text.'</p>';
         } else {
             $replace = $text.'</'.$tagName.'>';

src/StringBuilder/Interface.php

Indentation +2 added lines, -2 removed lines

@@ -25,10 +25,10 @@
      * 
      * @return string
      */
-     function render() : string;
+        function render() : string;
      
     /**
      * Renders the string and echos it.
      */
-     function display() : void;
+        function display() : void;
 }

src/Microtime.php

Spacing +4 added lines, -4 removed lines

@@ -23,18 +23,18 @@
      * @see Microtime::ERROR_FAILED_CREATING_DATE_OBJECT
      * @see Microtime::ERROR_FAILED_CONVERTING_STRING
      */
-    public function __construct($datetime='now', DateTimeZone $timeZone=null)
+    public function __construct($datetime = 'now', DateTimeZone $timeZone = null)
     {
-        if($timeZone === null)
+        if ($timeZone === null)
         {
             $timeZone = new DateTimeZone(date_default_timezone_get());
         }
 
-        if(empty($datetime) || $datetime === 'now')
+        if (empty($datetime) || $datetime === 'now')
         {
             $dateObj = DateTime::createFromFormat('0.u00 U', microtime(), new DateTimeZone('America/Denver'));
 
-            if($dateObj === false) {
+            if ($dateObj === false) {
                 throw new ConvertHelper_Exception(
                     'Failed to create microseconds date.',
                     '',

Braces +1 added lines, -2 removed lines

@@ -49,8 +49,7 @@
         try
         {
             parent::__construct($datetime, $timeZone);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new ConvertHelper_Exception(
                 'Failed to create date from string.',

src/ConvertHelper.php

Indentation +469 added lines, -469 removed lines

@@ -55,13 +55,13 @@ 
         return ConvertHelper_String::tabs2spaces($string, $tabSize);
     }
     
-   /**
-    * Converts spaces to tabs in the specified string.
-    * 
-    * @param string $string
-    * @param int $tabSize The amount of spaces per tab in the source string.
-    * @return string
-    */
+    /**
+     * Converts spaces to tabs in the specified string.
+     * 
+     * @param string $string
+     * @param int $tabSize The amount of spaces per tab in the source string.
+     * @return string
+     */
     public static function spaces2tabs(string $string, int $tabSize=4) : string
     {
         return ConvertHelper_String::spaces2tabs($string, $tabSize);
@@ -79,14 +79,14 @@ 
         return ConvertHelper_String::hidden2visible($string);
     }
     
-   /**
-    * Converts the specified amount of seconds into
-    * a human-readable string split in months, weeks,
-    * days, hours, minutes and seconds.
-    *
-    * @param float $seconds
-    * @return string
-    */
+    /**
+     * Converts the specified amount of seconds into
+     * a human-readable string split in months, weeks,
+     * days, hours, minutes and seconds.
+     *
+     * @param float $seconds
+     * @return string
+     */
     public static function time2string($seconds) : string
     {
         $converter = new ConvertHelper_TimeConverter($seconds);
@@ -110,85 +110,85 @@ 
      */
     public static function duration2string($datefrom, $dateto = -1) : string
     {
-         return ConvertHelper_DurationConverter::toString($datefrom, $dateto);
+            return ConvertHelper_DurationConverter::toString($datefrom, $dateto);
     }
 
-   /**
-    * Adds HTML syntax highlighting to the specified SQL string.
-    * 
-    * @param string $sql
-    * @return string
-    * @deprecated Use the Highlighter class directly instead.
-    * @see Highlighter::sql()
-    */
+    /**
+     * Adds HTML syntax highlighting to the specified SQL string.
+     * 
+     * @param string $sql
+     * @return string
+     * @deprecated Use the Highlighter class directly instead.
+     * @see Highlighter::sql()
+     */
     public static function highlight_sql(string $sql) : string
     {
         return Highlighter::sql($sql);
     }
 
-   /**
-    * Adds HTML syntax highlighting to the specified XML code.
-    * 
-    * @param string $xml The XML to highlight.
-    * @param bool $formatSource Whether to format the source with indentation to make it readable.
-    * @return string
-    * @deprecated Use the Highlighter class directly instead.
-    * @see Highlighter::xml()
-    */
+    /**
+     * Adds HTML syntax highlighting to the specified XML code.
+     * 
+     * @param string $xml The XML to highlight.
+     * @param bool $formatSource Whether to format the source with indentation to make it readable.
+     * @return string
+     * @deprecated Use the Highlighter class directly instead.
+     * @see Highlighter::xml()
+     */
     public static function highlight_xml(string $xml, bool $formatSource=false) : string
     {
         return Highlighter::xml($xml, $formatSource);
     }
 
-   /**
-    * @param string $phpCode
-    * @return string
-    * @deprecated Use the Highlighter class directly instead.
-    * @see Highlighter::php()
-    */
+    /**
+     * @param string $phpCode
+     * @return string
+     * @deprecated Use the Highlighter class directly instead.
+     * @see Highlighter::php()
+     */
     public static function highlight_php(string $phpCode) : string
     {
         return Highlighter::php($phpCode);
     }
     
-   /**
-    * Converts a number of bytes to a human readable form,
-    * e.g. xx Kb / xx Mb / xx Gb
-    *
-    * @param int $bytes The amount of bytes to convert.
-    * @param int $precision The amount of decimals
-    * @param int $base The base to calculate with: Base 10 is default (=1000 Bytes in a KB), Base 2 is mainly used for Windows memory (=1024 Bytes in a KB).
-    * @return string
-    * 
-    * @see https://en.m.wikipedia.org/wiki/Megabyte#Definitions
-    */
+    /**
+     * Converts a number of bytes to a human readable form,
+     * e.g. xx Kb / xx Mb / xx Gb
+     *
+     * @param int $bytes The amount of bytes to convert.
+     * @param int $precision The amount of decimals
+     * @param int $base The base to calculate with: Base 10 is default (=1000 Bytes in a KB), Base 2 is mainly used for Windows memory (=1024 Bytes in a KB).
+     * @return string
+     * 
+     * @see https://en.m.wikipedia.org/wiki/Megabyte#Definitions
+     */
     public static function bytes2readable(int $bytes, int $precision = 1, int $base = ConvertHelper_StorageSizeEnum::BASE_10) : string
     {
         return self::parseBytes($bytes)->toString($precision, $base);
     }
     
-   /**
-    * Parses a number of bytes, and creates a converter instance which
-    * allows doing common operations with it.
-    * 
-    * @param int $bytes
-    * @return ConvertHelper_ByteConverter
-    */
+    /**
+     * Parses a number of bytes, and creates a converter instance which
+     * allows doing common operations with it.
+     * 
+     * @param int $bytes
+     * @return ConvertHelper_ByteConverter
+     */
     public static function parseBytes(int $bytes) : ConvertHelper_ByteConverter
     {
         return new ConvertHelper_ByteConverter($bytes);
     }
 
-   /**
-    * Cuts a text to the specified length if it is longer than the
-    * target length. Appends a text to signify it has been cut at 
-    * the end of the string.
-    * 
-    * @param string $text
-    * @param int $targetLength
-    * @param string $append
-    * @return string
-    */
+    /**
+     * Cuts a text to the specified length if it is longer than the
+     * target length. Appends a text to signify it has been cut at 
+     * the end of the string.
+     * 
+     * @param string $text
+     * @param int $targetLength
+     * @param string $append
+     * @return string
+     */
     public static function text_cut(string $text, int $targetLength, string $append = '...') : string
     {
         return ConvertHelper_String::cutText($text, $targetLength, $append);
@@ -212,14 +212,14 @@ 
         return $info->toString();
     }
     
-   /**
-    * Pretty `print_r`.
-    * 
-    * @param mixed $var The variable to dump.
-    * @param bool $return Whether to return the dumped code.
-    * @param bool $html Whether to style the dump as HTML.
-    * @return string
-    */
+    /**
+     * Pretty `print_r`.
+     * 
+     * @param mixed $var The variable to dump.
+     * @param bool $return Whether to return the dumped code.
+     * @param bool $html Whether to style the dump as HTML.
+     * @return string
+     */
     public static function print_r($var, bool $return=false, bool $html=true) : string
     {
         $result = parseVariable($var)->enableType()->toString();
@@ -240,41 +240,41 @@ 
         return $result;
     }
     
-   /**
-    * Converts a string, number or boolean value to a boolean value.
-    *
-    * @param mixed $string
-    * @throws ConvertHelper_Exception
-    * @return bool
-    *
-    * @see ConvertHelper::ERROR_INVALID_BOOLEAN_STRING
-    */
+    /**
+     * Converts a string, number or boolean value to a boolean value.
+     *
+     * @param mixed $string
+     * @throws ConvertHelper_Exception
+     * @return bool
+     *
+     * @see ConvertHelper::ERROR_INVALID_BOOLEAN_STRING
+     */
     public static function string2bool($string) : bool
     {
         return ConvertHelper_Bool::fromString($string);
     }
 
-   /**
-    * Whether the specified string is a boolean string or boolean value.
-    * Alias for {@link ConvertHelper::isBoolean()}.
-    *
-    * @param mixed $string
-    * @return bool
-    * @deprecated
-    * @see ConvertHelper::isBoolean()
-    */
+    /**
+     * Whether the specified string is a boolean string or boolean value.
+     * Alias for {@link ConvertHelper::isBoolean()}.
+     *
+     * @param mixed $string
+     * @return bool
+     * @deprecated
+     * @see ConvertHelper::isBoolean()
+     */
     public static function isBooleanString($string) : bool
     {
         return self::isBoolean($string);
     }
 
-   /**
-    * Alias for the {@\AppUtils\XMLHelper::string2xml()} method.
-    * 
-    * @param string $text
-    * @return string
-    * @deprecated
-    */
+    /**
+     * Alias for the {@\AppUtils\XMLHelper::string2xml()} method.
+     * 
+     * @param string $text
+     * @return string
+     * @deprecated
+     */
     public static function text_makeXMLCompliant($text)
     {
         return XMLHelper::string2xml($text);
@@ -331,36 +331,36 @@ 
         return ConvertHelper_String::transliterate($string, $spaceChar, $lowercase);
     }
     
-   /**
-    * Retrieves the HEX character codes for all control
-    * characters that the {@link stripControlCharacters()} 
-    * method will remove.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves the HEX character codes for all control
+     * characters that the {@link stripControlCharacters()} 
+     * method will remove.
+     * 
+     * @return string[]
+     */
     public static function getControlCharactersAsHex() : array
     {
         return self::createControlCharacters()->getCharsAsHex();
     }
     
-   /**
-    * Retrieves an array of all control characters that
-    * the {@link stripControlCharacters()} method will 
-    * remove, as the actual UTF-8 characters.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves an array of all control characters that
+     * the {@link stripControlCharacters()} method will 
+     * remove, as the actual UTF-8 characters.
+     * 
+     * @return string[]
+     */
     public static function getControlCharactersAsUTF8() : array
     {
         return self::createControlCharacters()->getCharsAsUTF8();
     }
     
-   /**
-    * Retrieves all control characters as JSON encoded
-    * characters, e.g. "\u200b".
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves all control characters as JSON encoded
+     * characters, e.g. "\u200b".
+     * 
+     * @return string[]
+     */
     public static function getControlCharactersAsJSON() : array
     {
         return self::createControlCharacters()->getCharsAsJSON();
@@ -381,31 +381,31 @@ 
         return self::createControlCharacters()->stripControlCharacters($string);
     }
     
-   /**
-    * Creates the control characters class, used to 
-    * work with control characters in strings.
-    * 
-    * @return ConvertHelper_ControlCharacters
-    */
+    /**
+     * Creates the control characters class, used to 
+     * work with control characters in strings.
+     * 
+     * @return ConvertHelper_ControlCharacters
+     */
     public static function createControlCharacters() : ConvertHelper_ControlCharacters
     {
         return new ConvertHelper_ControlCharacters();
     }
 
-   /**
-    * Converts a unicode character to the PHP notation.
-    * 
-    * Example:
-    * 
-    * <pre>unicodeChar2php('"\u0000"')</pre>
-    * 
-    * Returns
-    * 
-    * <pre>\x0</pre>
-    * 
-    * @param string $unicodeChar
-    * @return string
-    */
+    /**
+     * Converts a unicode character to the PHP notation.
+     * 
+     * Example:
+     * 
+     * <pre>unicodeChar2php('"\u0000"')</pre>
+     * 
+     * Returns
+     * 
+     * <pre>\x0</pre>
+     * 
+     * @param string $unicodeChar
+     * @return string
+     */
     public static function unicodeChar2php(string $unicodeChar) : string 
     {
         $unicodeChar = json_decode($unicodeChar);
@@ -556,138 +556,138 @@ 
         return ConvertHelper_Bool::toStringStrict($boolean, $yesNo);
     }
 
-   /**
-    * Converts an associative array with attribute name > value pairs
-    * to an attribute string that can be used in an HTML tag. Empty 
-    * attribute values are ignored.
-    * 
-    * Example:
-    * 
-    * array2attributeString(array(
-    *     'id' => 45,
-    *     'href' => 'http://www.mistralys.com'
-    * ));
-    * 
-    * Result:
-    * 
-    * id="45" href="http://www.mistralys.com"
-    * 
-    * @param array<string,mixed> $array
-    * @return string
-    */
+    /**
+     * Converts an associative array with attribute name > value pairs
+     * to an attribute string that can be used in an HTML tag. Empty 
+     * attribute values are ignored.
+     * 
+     * Example:
+     * 
+     * array2attributeString(array(
+     *     'id' => 45,
+     *     'href' => 'http://www.mistralys.com'
+     * ));
+     * 
+     * Result:
+     * 
+     * id="45" href="http://www.mistralys.com"
+     * 
+     * @param array<string,mixed> $array
+     * @return string
+     */
     public static function array2attributeString(array $array) : string
     {
         return ConvertHelper_Array::toAttributeString($array);
     }
     
-   /**
-    * Converts a string, so it can safely be used in a javascript
-    * statement in an HTML tag: uses single quotes around the string
-    * and encodes all special characters as needed.
-    * 
-    * @param string $string
-    * @return string
-    * @deprecated Use the JSHelper class instead.
-    * @see JSHelper::phpVariable2AttributeJS()
-    */
+    /**
+     * Converts a string, so it can safely be used in a javascript
+     * statement in an HTML tag: uses single quotes around the string
+     * and encodes all special characters as needed.
+     * 
+     * @param string $string
+     * @return string
+     * @deprecated Use the JSHelper class instead.
+     * @see JSHelper::phpVariable2AttributeJS()
+     */
     public static function string2attributeJS(string $string) : string
     {
         return JSHelper::phpVariable2AttributeJS($string);
     }
     
-   /**
-    * Checks if the specified string is a boolean value, which
-    * includes string representations of boolean values, like 
-    * <code>yes</code> or <code>no</code>, and <code>true</code>
-    * or <code>false</code>.
-    * 
-    * @param mixed $value
-    * @return boolean
-    */
+    /**
+     * Checks if the specified string is a boolean value, which
+     * includes string representations of boolean values, like 
+     * <code>yes</code> or <code>no</code>, and <code>true</code>
+     * or <code>false</code>.
+     * 
+     * @param mixed $value
+     * @return boolean
+     */
     public static function isBoolean($value) : bool
     {
         return ConvertHelper_Bool::isBoolean($value);
     }
     
-   /**
-    * Converts an associative array to an HTML style attribute value string.
-    * 
-    * @param array<string,mixed> $subject
-    * @return string
-    */
+    /**
+     * Converts an associative array to an HTML style attribute value string.
+     * 
+     * @param array<string,mixed> $subject
+     * @return string
+     */
     public static function array2styleString(array $subject) : string
     {
         return ConvertHelper_Array::toStyleString($subject);
     }
     
-   /**
-    * Converts a DateTime object to a timestamp, which
-    * is PHP 5.2 compatible.
-    * 
-    * @param DateTime $date
-    * @return integer
-    */
+    /**
+     * Converts a DateTime object to a timestamp, which
+     * is PHP 5.2 compatible.
+     * 
+     * @param DateTime $date
+     * @return integer
+     */
     public static function date2timestamp(DateTime $date) : int
     {
         return ConvertHelper_Date::toTimestamp($date);
     }
     
-   /**
-    * Converts a timestamp into a DateTime instance.
-    * @param int $timestamp
-    * @return DateTime
-    */
+    /**
+     * Converts a timestamp into a DateTime instance.
+     * @param int $timestamp
+     * @return DateTime
+     */
     public static function timestamp2date(int $timestamp) : DateTime
     {
         return ConvertHelper_Date::fromTimestamp($timestamp);
     }
     
-   /**
-    * Strips an absolute path to a file within the application
-    * to make the path relative to the application root path.
-    * 
-    * @param string $path
-    * @return string
-    * 
-    * @see FileHelper::relativizePath()
-    * @see FileHelper::relativizePathByDepth()
-    */
+    /**
+     * Strips an absolute path to a file within the application
+     * to make the path relative to the application root path.
+     * 
+     * @param string $path
+     * @return string
+     * 
+     * @see FileHelper::relativizePath()
+     * @see FileHelper::relativizePathByDepth()
+     */
     public static function fileRelativize(string $path) : string
     {
         return FileHelper::relativizePathByDepth($path);
     }
     
     /**
-    * Converts a PHP regex to a javascript RegExp object statement.
-    * 
-    * NOTE: This is an alias for the JSHelper's `convertRegex` method. 
-    * More details are available on its usage there.
-    *
-    * @param string $regex A PHP preg regex
-    * @param string $statementType The type of statement to return: Defaults to a statement to create a RegExp object.
-    * @return string Depending on the specified return type.
-    * 
-    * @see JSHelper::buildRegexStatement()
-    */
+     * Converts a PHP regex to a javascript RegExp object statement.
+     * 
+     * NOTE: This is an alias for the JSHelper's `convertRegex` method. 
+     * More details are available on its usage there.
+     *
+     * @param string $regex A PHP preg regex
+     * @param string $statementType The type of statement to return: Defaults to a statement to create a RegExp object.
+     * @return string Depending on the specified return type.
+     * 
+     * @see JSHelper::buildRegexStatement()
+     */
     public static function regex2js(string $regex, string $statementType=JSHelper::JS_REGEX_OBJECT) : string
     {
         return JSHelper::buildRegexStatement($regex, $statementType);
     }
     
-   /**
-    * Converts the specified variable to JSON. Works just
-    * like the native `json_encode` method, except that it
-    * will trigger an exception on failure, which has the 
-    * json error details included in its developer details.
-    * 
-    * @param mixed $variable
-    * @param int $options JSON encode options.
-    * @param int $depth 
-    * @return string
-    *
-    * @throws ConvertHelper_Exception
-    * @see ConvertHelper::ERROR_JSON_ENCODE_FAILED
-    */
+    /**
+     * Converts the specified variable to JSON. Works just
+     * like the native `json_encode` method, except that it
+     * will trigger an exception on failure, which has the 
+     * json error details included in its developer details.
+     * 
+     * @param mixed $variable
+     * @param int $options JSON encode options.
+     * @param int $depth 
+     * @return string
+     *
+     * @throws ConvertHelper_Exception
+     * @see ConvertHelper::ERROR_JSON_ENCODE_FAILED
+     */
     public static function var2json($variable, int $options=0, int $depth=512) : string
     {
         $result = json_encode($variable, $options, $depth);
@@ -722,12 +722,12 @@ 
             ->toString();
     }
     
-   /**
-    * Strips all known UTF byte order marks from the specified string.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Strips all known UTF byte order marks from the specified string.
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function stripUTFBom($string)
     {
         $boms = FileHelper::getUTFBOMs();
@@ -742,65 +742,65 @@ 
         return $string;
     }
 
-   /**
-    * Converts a string to valid utf8, regardless
-    * of the string's encoding(s).
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Converts a string to valid utf8, regardless
+     * of the string's encoding(s).
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function string2utf8(string $string) : string
     {
         return ConvertHelper_String::toUtf8($string);
     }
     
-   /**
-    * Checks whether the specified string is an ASCII
-    * string, without any special or UTF8 characters.
-    * Note: empty strings and NULL are considered ASCII.
-    * Any variable types other than strings are not.
-    * 
-    * @param string|float|int|NULL $string
-    * @return boolean
-    */
+    /**
+     * Checks whether the specified string is an ASCII
+     * string, without any special or UTF8 characters.
+     * Note: empty strings and NULL are considered ASCII.
+     * Any variable types other than strings are not.
+     * 
+     * @param string|float|int|NULL $string
+     * @return boolean
+     */
     public static function isStringASCII($string) : bool
     {
         return ConvertHelper_String::isASCII(strval($string));
     }
     
-   /**
-    * Adds HTML syntax highlighting to an URL.
-    * 
-    * NOTE: Includes the necessary CSS styles. When
-    * highlighting several URLs in the same page,
-    * prefer using the `parseURL` function instead.
-    * 
-    * @param string $url
-    * @return string
-    * @deprecated Use the Highlighter class directly instead.
-    * @see Highlighter
-    */
+    /**
+     * Adds HTML syntax highlighting to an URL.
+     * 
+     * NOTE: Includes the necessary CSS styles. When
+     * highlighting several URLs in the same page,
+     * prefer using the `parseURL` function instead.
+     * 
+     * @param string $url
+     * @return string
+     * @deprecated Use the Highlighter class directly instead.
+     * @see Highlighter
+     */
     public static function highlight_url(string $url) : string
     {
         return Highlighter::url($url);
     }
 
-   /**
-    * Calculates a percentage match of the source string with the target string.
-    * 
-    * Options are:
-    * 
-    * - maxLevenshtein, default: 10
-    *   Any levenshtein results above this value are ignored.
-    *   
-    * - precision, default: 1
-    *   The precision of the percentage float value
-    * 
-    * @param string $source
-    * @param string $target
-    * @param array<string,mixed> $options
-    * @return float
-    */
+    /**
+     * Calculates a percentage match of the source string with the target string.
+     * 
+     * Options are:
+     * 
+     * - maxLevenshtein, default: 10
+     *   Any levenshtein results above this value are ignored.
+     *   
+     * - precision, default: 1
+     *   The precision of the percentage float value
+     * 
+     * @param string $source
+     * @param string $target
+     * @param array<string,mixed> $options
+     * @return float
+     */
     public static function matchString(string $source, string $target, array $options=array()) : float
     {
         $defaults = array(
@@ -824,14 +824,14 @@ 
         return round(100 - $percent, $options['precision']);
     }
     
-   /**
-    * Converts a date interval to a human readable string with
-    * all necessary time components, e.g. "1 year, 2 months and 4 days".
-    * 
-    * @param DateInterval $interval
-    * @return string
-    * @see ConvertHelper_IntervalConverter
-    */
+    /**
+     * Converts a date interval to a human readable string with
+     * all necessary time components, e.g. "1 year, 2 months and 4 days".
+     * 
+     * @param DateInterval $interval
+     * @return string
+     * @see ConvertHelper_IntervalConverter
+     */
     public static function interval2string(DateInterval $interval) : string
     {
         $converter = new ConvertHelper_IntervalConverter();
@@ -843,92 +843,92 @@ 
     const INTERVAL_MINUTES = 'minutes';
     const INTERVAL_SECONDS = 'seconds';
     
-   /**
-    * Converts an interval to its total amount of days.
-    * @param DateInterval $interval
-    * @return int
-    */
+    /**
+     * Converts an interval to its total amount of days.
+     * @param DateInterval $interval
+     * @return int
+     */
     public static function interval2days(DateInterval $interval) : int
     {
         return ConvertHelper_DateInterval::toDays($interval);
     }
 
-   /**
-    * Converts an interval to its total amount of hours.
-    * @param DateInterval $interval
-    * @return int
-    */
+    /**
+     * Converts an interval to its total amount of hours.
+     * @param DateInterval $interval
+     * @return int
+     */
     public static function interval2hours(DateInterval $interval) : int
     {
         return ConvertHelper_DateInterval::toHours($interval);
     }
     
-   /**
-    * Converts an interval to its total amount of minutes. 
-    * @param DateInterval $interval
-    * @return int
-    */
+    /**
+     * Converts an interval to its total amount of minutes. 
+     * @param DateInterval $interval
+     * @return int
+     */
     public static function interval2minutes(DateInterval $interval) : int
     {
         return ConvertHelper_DateInterval::toMinutes($interval);
     }
     
-   /**
-    * Converts an interval to its total amount of seconds.
-    * @param DateInterval $interval
-    * @return int
-    */    
+    /**
+     * Converts an interval to its total amount of seconds.
+     * @param DateInterval $interval
+     * @return int
+     */    
     public static function interval2seconds(DateInterval $interval) : int
     {
         return ConvertHelper_DateInterval::toSeconds($interval);
     }
     
-   /**
-    * Calculates the total amount of days / hours / minutes or seconds
-    * of a date interval object (depending on the specified units), and
-    * returns the total amount.
-    * 
-    * @param DateInterval $interval
-    * @param string $unit What total value to calculate.
-    * @return integer
-    * 
-    * @see ConvertHelper::INTERVAL_SECONDS
-    * @see ConvertHelper::INTERVAL_MINUTES
-    * @see ConvertHelper::INTERVAL_HOURS
-    * @see ConvertHelper::INTERVAL_DAYS
-    */
+    /**
+     * Calculates the total amount of days / hours / minutes or seconds
+     * of a date interval object (depending on the specified units), and
+     * returns the total amount.
+     * 
+     * @param DateInterval $interval
+     * @param string $unit What total value to calculate.
+     * @return integer
+     * 
+     * @see ConvertHelper::INTERVAL_SECONDS
+     * @see ConvertHelper::INTERVAL_MINUTES
+     * @see ConvertHelper::INTERVAL_HOURS
+     * @see ConvertHelper::INTERVAL_DAYS
+     */
     public static function interval2total(DateInterval $interval, string $unit=self::INTERVAL_SECONDS) : int
     {
         return ConvertHelper_DateInterval::toTotal($interval, $unit);
     }
 
-   /**
-    * Converts a date to the corresponding day name.
-    * 
-    * @param DateTime $date
-    * @param bool $short
-    * @return string|NULL
-    */
+    /**
+     * Converts a date to the corresponding day name.
+     * 
+     * @param DateTime $date
+     * @param bool $short
+     * @return string|NULL
+     */
     public static function date2dayName(DateTime $date, bool $short=false) : ?string
     {
         return ConvertHelper_Date::toDayName($date, $short);
     }
     
-   /**
-    * Retrieves a list of english day names.
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of english day names.
+     * @return string[]
+     */
     public static function getDayNamesInvariant() : array
     {
         return ConvertHelper_Date::getDayNamesInvariant();
     }
     
-   /**
-    * Retrieves the day names list for the current locale.
-    * 
-    * @param bool $short
-    * @return string[]
-    */
+    /**
+     * Retrieves the day names list for the current locale.
+     * 
+     * @param bool $short
+     * @return string[]
+     */
     public static function getDayNames(bool $short=false) : array
     {
         return ConvertHelper_Date::getDayNames($short);
@@ -947,68 +947,68 @@ 
         return ConvertHelper_Array::implodeWithAnd($list, $sep, $conjunction);
     }
     
-   /**
-    * Splits a string into an array of all characters it is composed of.
-    * Unicode character safe.
-    * 
-    * NOTE: Spaces and newlines (both \r and \n) are also considered single
-    * characters.
-    * 
-    * @param string $string
-    * @return string[]
-    */
+    /**
+     * Splits a string into an array of all characters it is composed of.
+     * Unicode character safe.
+     * 
+     * NOTE: Spaces and newlines (both \r and \n) are also considered single
+     * characters.
+     * 
+     * @param string $string
+     * @return string[]
+     */
     public static function string2array(string $string) : array
     {
         return ConvertHelper_String::toArray($string);
     }
     
-   /**
-    * Checks whether the specified string contains HTML code.
-    * 
-    * @param string $string
-    * @return boolean
-    */
+    /**
+     * Checks whether the specified string contains HTML code.
+     * 
+     * @param string $string
+     * @return boolean
+     */
     public static function isStringHTML(string $string) : bool
     {
         return ConvertHelper_String::isHTML($string);
     }
     
-   /**
-    * UTF8-safe wordwrap method: works like the regular wordwrap
-    * PHP function but compatible with UTF8. Otherwise the lengths
-    * are not calculated correctly.
-    * 
-    * @param string $str
-    * @param int $width
-    * @param string $break
-    * @param bool $cut
-    * @return string
-    */
+    /**
+     * UTF8-safe wordwrap method: works like the regular wordwrap
+     * PHP function but compatible with UTF8. Otherwise the lengths
+     * are not calculated correctly.
+     * 
+     * @param string $str
+     * @param int $width
+     * @param string $break
+     * @param bool $cut
+     * @return string
+     */
     public static function wordwrap(string $str, int $width = 75, string $break = "\n", bool $cut = false) : string 
     {
         return ConvertHelper_String::wordwrap($str, $width, $break, $cut);
     }
     
-   /**
-    * Calculates the byte length of a string, taking into 
-    * account any unicode characters.
-    * 
-    * @param string $string
-    * @return int
-    */
+    /**
+     * Calculates the byte length of a string, taking into 
+     * account any unicode characters.
+     * 
+     * @param string $string
+     * @return int
+     */
     public static function string2bytes(string $string): int
     {
         return ConvertHelper_String::toBytes($string);
     }
     
-   /**
-    * Creates a short, 8-character long hash for the specified string.
-    * 
-    * WARNING: Not cryptographically safe.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Creates a short, 8-character long hash for the specified string.
+     * 
+     * WARNING: Not cryptographically safe.
+     * 
+     * @param string $string
+     * @return string
+     */
     public static function string2shortHash(string $string) : string
     {
         return ConvertHelper_String::toShortHash($string);
@@ -1054,88 +1054,88 @@ 
         return ConvertHelper_ThrowableInfo::fromThrowable($e);
     }
     
-   /**
-    * Parses the specified query string like the native 
-    * function <code>parse_str</code>, without the key
-    * naming limitations.
-    * 
-    * Using parse_str, dots or spaces in key names are 
-    * replaced by underscores. This method keeps all names
-    * intact.
-    * 
-    * It still uses the parse_str implementation as it 
-    * is tested and tried, but fixes the parameter names
-    * after parsing, as needed.
-    * 
-    * @param string $queryString
-    * @return array<string,string>
-    * @see ConvertHelper_QueryParser
-    */
+    /**
+     * Parses the specified query string like the native 
+     * function <code>parse_str</code>, without the key
+     * naming limitations.
+     * 
+     * Using parse_str, dots or spaces in key names are 
+     * replaced by underscores. This method keeps all names
+     * intact.
+     * 
+     * It still uses the parse_str implementation as it 
+     * is tested and tried, but fixes the parameter names
+     * after parsing, as needed.
+     * 
+     * @param string $queryString
+     * @return array<string,string>
+     * @see ConvertHelper_QueryParser
+     */
     public static function parseQueryString(string $queryString) : array
     {
         $parser = new ConvertHelper_QueryParser();
         return $parser->parse($queryString);
     }
 
-   /**
-    * Searches for needle in the specified string, and returns a list
-    * of all occurrences, including the matched string. The matched 
-    * string is useful when doing a case insensitive search, as it 
-    * shows the exact matched case of needle.
-    *   
-    * @param string $needle
-    * @param string $haystack
-    * @param bool $caseInsensitive
-    * @return ConvertHelper_StringMatch[]
-    */
+    /**
+     * Searches for needle in the specified string, and returns a list
+     * of all occurrences, including the matched string. The matched 
+     * string is useful when doing a case insensitive search, as it 
+     * shows the exact matched case of needle.
+     *   
+     * @param string $needle
+     * @param string $haystack
+     * @param bool $caseInsensitive
+     * @return ConvertHelper_StringMatch[]
+     */
     public static function findString(string $needle, string $haystack, bool $caseInsensitive=false): array
     {
         return ConvertHelper_String::findString($needle, $haystack, $caseInsensitive);
     }
     
-   /**
-    * Like explode, but trims all entries, and removes 
-    * empty entries from the resulting array.
-    * 
-    * @param string $delimiter
-    * @param string $string
-    * @return string[]
-    */
+    /**
+     * Like explode, but trims all entries, and removes 
+     * empty entries from the resulting array.
+     * 
+     * @param string $delimiter
+     * @param string $string
+     * @return string[]
+     */
     public static function explodeTrim(string $delimiter, string $string) : array
     {
         return ConvertHelper_String::explodeTrim($delimiter, $string);
     }
     
-   /**
-    * Detects the most used end-of-line character in the subject string.
-    * 
-    * @param string $subjectString The string to check.
-    * @return NULL|ConvertHelper_EOL The detected EOL instance, or NULL if none has been detected.
-    */
+    /**
+     * Detects the most used end-of-line character in the subject string.
+     * 
+     * @param string $subjectString The string to check.
+     * @return NULL|ConvertHelper_EOL The detected EOL instance, or NULL if none has been detected.
+     */
     public static function detectEOLCharacter(string $subjectString) : ?ConvertHelper_EOL
     {
         return ConvertHelper_EOL::detect($subjectString);
     }
 
-   /**
-    * Removes the specified keys from the target array,
-    * if they exist.
-    * 
-    * @param array<string|int,mixed> $array
-    * @param string[] $keys
-    */
+    /**
+     * Removes the specified keys from the target array,
+     * if they exist.
+     * 
+     * @param array<string|int,mixed> $array
+     * @param string[] $keys
+     */
     public static function arrayRemoveKeys(array &$array, array $keys) : void
     {
         ConvertHelper_Array::removeKeys($array, $keys);
     }
     
-   /**
-    * Checks if the specified variable is an integer or a string containing an integer.
-    * Accepts both positive and negative integers.
-    * 
-    * @param mixed $value
-    * @return bool
-    */
+    /**
+     * Checks if the specified variable is an integer or a string containing an integer.
+     * Accepts both positive and negative integers.
+     * 
+     * @param mixed $value
+     * @return bool
+     */
     public static function isInteger($value) : bool
     {
         if(is_int($value)) {
@@ -1155,52 +1155,52 @@ 
         return false;    
     }
     
-   /**
-    * Converts an amount of seconds to a DateInterval object.
-    * 
-    * @param int $seconds
-    * @return DateInterval
-    * @throws ConvertHelper_Exception If the date interval cannot be created.
-    * 
-    * @see ConvertHelper::ERROR_CANNOT_GET_DATE_DIFF
-    */
+    /**
+     * Converts an amount of seconds to a DateInterval object.
+     * 
+     * @param int $seconds
+     * @return DateInterval
+     * @throws ConvertHelper_Exception If the date interval cannot be created.
+     * 
+     * @see ConvertHelper::ERROR_CANNOT_GET_DATE_DIFF
+     */
     public static function seconds2interval(int $seconds) : DateInterval
     {
         return ConvertHelper_DateInterval::fromSeconds($seconds)->getInterval();
     }
     
-   /**
-    * Converts a size string like "50 MB" to the corresponding byte size.
-    * It is case-insensitive, ignores spaces, and supports both traditional
-    * "MB" and "MiB" notations.
-    * 
-    * @param string $size
-    * @return int
-    */
+    /**
+     * Converts a size string like "50 MB" to the corresponding byte size.
+     * It is case-insensitive, ignores spaces, and supports both traditional
+     * "MB" and "MiB" notations.
+     * 
+     * @param string $size
+     * @return int
+     */
     public static function size2bytes(string $size) : int
     {
         return self::parseSize($size)->toBytes();
     }
     
-   /**
-    * Parses a size string like "50 MB" and returns a size notation instance
-    * that has utility methods to access information on it, and convert it.
-    * 
-    * @param string $size
-    * @return ConvertHelper_SizeNotation
-    */
+    /**
+     * Parses a size string like "50 MB" and returns a size notation instance
+     * that has utility methods to access information on it, and convert it.
+     * 
+     * @param string $size
+     * @return ConvertHelper_SizeNotation
+     */
     public static function parseSize(string $size) : ConvertHelper_SizeNotation
     {
         return new ConvertHelper_SizeNotation($size);
     }
     
-   /**
-    * Creates a URL finder instance, which can be used to find
-    * URLs in a string - be it plain text, or HTML.
-    * 
-    * @param string $subject
-    * @return ConvertHelper_URLFinder
-    */
+    /**
+     * Creates a URL finder instance, which can be used to find
+     * URLs in a string - be it plain text, or HTML.
+     * 
+     * @param string $subject
+     * @return ConvertHelper_URLFinder
+     */
     public static function createURLFinder(string $subject) : ConvertHelper_URLFinder
     {
         return new ConvertHelper_URLFinder($subject);

Spacing +30 added lines, -30 removed lines

@@ -50,7 +50,7 @@ 
      * @param int $tabSize The amount of spaces per tab.
      * @return string
      */
-    public static function tabs2spaces(string $string, int $tabSize=4) : string
+    public static function tabs2spaces(string $string, int $tabSize = 4) : string
     {
         return ConvertHelper_String::tabs2spaces($string, $tabSize);
     }
@@ -62,7 +62,7 @@ 
     * @param int $tabSize The amount of spaces per tab in the source string.
     * @return string
     */
-    public static function spaces2tabs(string $string, int $tabSize=4) : string
+    public static function spaces2tabs(string $string, int $tabSize = 4) : string
     {
         return ConvertHelper_String::spaces2tabs($string, $tabSize);
     }
@@ -135,7 +135,7 @@ 
     * @deprecated Use the Highlighter class directly instead.
     * @see Highlighter::xml()
     */
-    public static function highlight_xml(string $xml, bool $formatSource=false) : string
+    public static function highlight_xml(string $xml, bool $formatSource = false) : string
     {
         return Highlighter::xml($xml, $formatSource);
     }
@@ -201,11 +201,11 @@ 
      * @param bool $html
      * @return string
      */
-    public static function var_dump($var, bool $html=true) : string
+    public static function var_dump($var, bool $html = true) : string
     {
         $info = parseVariable($var);
         
-        if($html) {
+        if ($html) {
             return $info->toHTML();
         }
         
@@ -220,11 +220,11 @@ 
     * @param bool $html Whether to style the dump as HTML.
     * @return string
     */
-    public static function print_r($var, bool $return=false, bool $html=true) : string
+    public static function print_r($var, bool $return = false, bool $html = true) : string
     {
         $result = parseVariable($var)->enableType()->toString();
         
-        if($html) 
+        if ($html) 
         {
             $result = 
             '<pre style="background:#fff;color:#333;padding:16px;border:solid 1px #bbb;border-radius:4px">'.
@@ -232,7 +232,7 @@ 
             '</pre>';
         }
         
-        if(!$return) 
+        if (!$return) 
         {
             echo $result;
         }
@@ -413,12 +413,12 @@ 
         $output = '';
         $split = str_split($unicodeChar);
         
-        foreach($split as $octet) 
+        foreach ($split as $octet) 
         {
             $ordInt = ord($octet);
             // Convert from int (base 10) to hex (base 16), for PHP \x syntax
             $ordHex = base_convert((string)$ordInt, 10, 16);
-            $output .= '\x' . $ordHex;
+            $output .= '\x'.$ordHex;
         }
         
         return $output;
@@ -471,19 +471,19 @@ 
      */
     protected static function convertScalarForComparison($scalar) : ?string
     {
-        if($scalar === '' || is_null($scalar)) {
+        if ($scalar === '' || is_null($scalar)) {
             return null;
         }
         
-        if(is_bool($scalar)) {
+        if (is_bool($scalar)) {
             return self::bool2string($scalar);
         }
         
-        if(is_array($scalar)) {
+        if (is_array($scalar)) {
             $scalar = md5(serialize($scalar));
         }
         
-        if($scalar !== null && !is_scalar($scalar)) {
+        if ($scalar !== null && !is_scalar($scalar)) {
             throw new ConvertHelper_Exception(
                 'Not a scalar value in comparison',
                 null,
@@ -669,7 +669,7 @@ 
     * 
     * @see JSHelper::buildRegexStatement()
     */
-    public static function regex2js(string $regex, string $statementType=JSHelper::JS_REGEX_OBJECT) : string
+    public static function regex2js(string $regex, string $statementType = JSHelper::JS_REGEX_OBJECT) : string
     {
         return JSHelper::buildRegexStatement($regex, $statementType);
     }
@@ -688,11 +688,11 @@ 
     * @throws ConvertHelper_Exception
     * @see ConvertHelper::ERROR_JSON_ENCODE_FAILED
     */
-    public static function var2json($variable, int $options=0, int $depth=512) : string
+    public static function var2json($variable, int $options = 0, int $depth = 512) : string
     {
         $result = json_encode($variable, $options, $depth);
         
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
         
@@ -731,10 +731,10 @@ 
     public static function stripUTFBom($string)
     {
         $boms = FileHelper::getUTFBOMs();
-        foreach($boms as $bomChars) {
+        foreach ($boms as $bomChars) {
             $length = mb_strlen($bomChars);
             $text = mb_substr($string, 0, $length);
-            if($text==$bomChars) {
+            if ($text == $bomChars) {
                 return mb_substr($string, $length);
             }
         }
@@ -801,7 +801,7 @@ 
     * @param array<string,mixed> $options
     * @return float
     */
-    public static function matchString(string $source, string $target, array $options=array()) : float
+    public static function matchString(string $source, string $target, array $options = array()) : float
     {
         $defaults = array(
             'maxLevenshtein' => 10,
@@ -811,12 +811,12 @@ 
         $options = array_merge($defaults, $options);
         
         // avoid doing this via levenshtein
-        if($source == $target) {
+        if ($source == $target) {
             return 100;
         }
         
         $diff = levenshtein($source, $target);
-        if($diff > $options['maxLevenshtein']) {
+        if ($diff > $options['maxLevenshtein']) {
             return 0;
         }
         
@@ -897,7 +897,7 @@ 
     * @see ConvertHelper::INTERVAL_HOURS
     * @see ConvertHelper::INTERVAL_DAYS
     */
-    public static function interval2total(DateInterval $interval, string $unit=self::INTERVAL_SECONDS) : int
+    public static function interval2total(DateInterval $interval, string $unit = self::INTERVAL_SECONDS) : int
     {
         return ConvertHelper_DateInterval::toTotal($interval, $unit);
     }
@@ -909,7 +909,7 @@ 
     * @param bool $short
     * @return string|NULL
     */
-    public static function date2dayName(DateTime $date, bool $short=false) : ?string
+    public static function date2dayName(DateTime $date, bool $short = false) : ?string
     {
         return ConvertHelper_Date::toDayName($date, $short);
     }
@@ -929,7 +929,7 @@ 
     * @param bool $short
     * @return string[]
     */
-    public static function getDayNames(bool $short=false) : array
+    public static function getDayNames(bool $short = false) : array
     {
         return ConvertHelper_Date::getDayNames($short);
     }
@@ -1088,7 +1088,7 @@ 
     * @param bool $caseInsensitive
     * @return ConvertHelper_StringMatch[]
     */
-    public static function findString(string $needle, string $haystack, bool $caseInsensitive=false): array
+    public static function findString(string $needle, string $haystack, bool $caseInsensitive = false): array
     {
         return ConvertHelper_String::findString($needle, $haystack, $caseInsensitive);
     }
@@ -1138,17 +1138,17 @@ 
     */
     public static function isInteger($value) : bool
     {
-        if(is_int($value)) {
+        if (is_int($value)) {
             return true;
         }
         
         // booleans get converted to numbers, so they would
         // actually match the regex.
-        if(is_bool($value)) {
+        if (is_bool($value)) {
             return false;
         }
         
-        if(is_string($value) && $value !== '') {
+        if (is_string($value) && $value !== '') {
             return preg_match('/\A-?\d+\z/', $value) === 1;
         }
         
@@ -1214,7 +1214,7 @@ 
      * @param bool $keepKeys
      * @return array<number|string,mixed>
      */
-    public static function arrayRemoveValues(array $sourceArray, array $values, bool $keepKeys=false) : array
+    public static function arrayRemoveValues(array $sourceArray, array $values, bool $keepKeys = false) : array
     {
         return ConvertHelper_Array::removeValues($sourceArray, $values, $keepKeys);
     }

src/ConvertHelper/DateInterval.php

Indentation +37 added lines, -37 removed lines

@@ -41,14 +41,14 @@ 
     const TOKEN_MONTHS = 'm';
     const TOKEN_YEARS = 'y';
     
-   /**
-    * @var DateInterval
-    */
+    /**
+     * @var DateInterval
+     */
     protected $interval;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $seconds;
 
     /**
@@ -92,22 +92,22 @@ 
         return new ConvertHelper_DateInterval($seconds);
     }
     
-   /**
-    * Creates the interval from an existing regular interval instance.
-    * 
-    * @param DateInterval $interval
-    * @return ConvertHelper_DateInterval
-    */
+    /**
+     * Creates the interval from an existing regular interval instance.
+     * 
+     * @param DateInterval $interval
+     * @return ConvertHelper_DateInterval
+     */
     public static function fromInterval(DateInterval $interval)
     {
         return self::fromSeconds(ConvertHelper::interval2seconds($interval));
     }
     
-   /**
-    * Retrieves the PHP native date interval.
-    * 
-    * @return DateInterval
-    */
+    /**
+     * Retrieves the PHP native date interval.
+     * 
+     * @return DateInterval
+     */
     public function getInterval() : DateInterval
     {
         return $this->interval;
@@ -143,31 +143,31 @@ 
         return $this->getToken(self::TOKEN_YEARS);
     }
     
-   /**
-    * Retrieves a specific time token, e.g. "h" (for hours).
-    * Using the constants to specifiy the tokens is recommended.
-    * 
-    * @param string $token
-    * @return int
-    * 
-    * @see ConvertHelper_DateInterval::TOKEN_SECONDS
-    * @see ConvertHelper_DateInterval::TOKEN_MINUTES
-    * @see ConvertHelper_DateInterval::TOKEN_HOURS
-    * @see ConvertHelper_DateInterval::TOKEN_DAYS
-    * @see ConvertHelper_DateInterval::TOKEN_MONTHS
-    * @see ConvertHelper_DateInterval::TOKEN_YEARS
-    */
+    /**
+     * Retrieves a specific time token, e.g. "h" (for hours).
+     * Using the constants to specifiy the tokens is recommended.
+     * 
+     * @param string $token
+     * @return int
+     * 
+     * @see ConvertHelper_DateInterval::TOKEN_SECONDS
+     * @see ConvertHelper_DateInterval::TOKEN_MINUTES
+     * @see ConvertHelper_DateInterval::TOKEN_HOURS
+     * @see ConvertHelper_DateInterval::TOKEN_DAYS
+     * @see ConvertHelper_DateInterval::TOKEN_MONTHS
+     * @see ConvertHelper_DateInterval::TOKEN_YEARS
+     */
     public function getToken(string $token) : int
     {
         return (int)$this->interval->$token;
     }
     
-   /**
-    * The total amount of seconds in the interval (including
-    * everything, from seconds to days, months, years...).
-    * 
-    * @return int
-    */
+    /**
+     * The total amount of seconds in the interval (including
+     * everything, from seconds to days, months, years...).
+     * 
+     * @return int
+     */
     public function getTotalSeconds() : int
     {
         return $this->seconds;

Spacing +5 added lines, -5 removed lines

@@ -68,7 +68,7 @@ 
         
         $interval = $d2->diff($d1);
         
-        if(!$interval instanceof DateInterval)
+        if (!$interval instanceof DateInterval)
         {
             throw new ConvertHelper_Exception(
                 'Cannot create interval',
@@ -187,24 +187,24 @@ 
      * @see ConvertHelper::INTERVAL_HOURS
      * @see ConvertHelper::INTERVAL_DAYS
      */
-    public static function toTotal(DateInterval $interval, string $unit=ConvertHelper::INTERVAL_SECONDS) : int
+    public static function toTotal(DateInterval $interval, string $unit = ConvertHelper::INTERVAL_SECONDS) : int
     {
         $total = (int)$interval->format('%a');
         if ($unit == ConvertHelper::INTERVAL_DAYS) {
             return $total;
         }
 
-        $total = ($total * 24) + ((int)$interval->h );
+        $total = ($total * 24) + ((int)$interval->h);
         if ($unit == ConvertHelper::INTERVAL_HOURS) {
             return $total;
         }
 
-        $total = ($total * 60) + ((int)$interval->i );
+        $total = ($total * 60) + ((int)$interval->i);
         if ($unit == ConvertHelper::INTERVAL_MINUTES) {
             return $total;
         }
 
-        $total = ($total * 60) + ((int)$interval->s );
+        $total = ($total * 60) + ((int)$interval->s);
         if ($unit == ConvertHelper::INTERVAL_SECONDS) {
             return $total;
         }