Mistralys / application-utils

src/ConvertHelper/URLFinder/DomainExtensions.php

Spacing +3 added lines, -3 removed lines

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

src/URLInfo/Parser.php

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'];
         }
         

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/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/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.',
                     '',

src/ConvertHelper/DateInterval.php

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

src/ConvertHelper/Date.php

Spacing +7 added lines, -7 removed lines

@@ -43,13 +43,13 @@ 
      * @param bool $short
      * @return string|NULL
      */
-    public static function toDayName(DateTime $date, bool $short=false) : ?string
+    public static function toDayName(DateTime $date, bool $short = false) : ?string
     {
         $day = $date->format('l');
         $invariant = self::getDayNamesInvariant();
 
         $idx = array_search($day, $invariant);
-        if($idx !== false) {
+        if ($idx !== false) {
             $localized = self::getDayNames($short);
             return $localized[$idx];
         }
@@ -72,11 +72,11 @@ 
      * @param bool $short
      * @return string[]
      */
-    public static function getDayNames(bool $short=false) : array
+    public static function getDayNames(bool $short = false) : array
     {
         self::initDays();
 
-        if($short) {
+        if ($short) {
             return self::$daysShort;
         }
 
@@ -102,13 +102,13 @@ 
     public static function toListLabel(DateTime $date, bool $includeTime = false, bool $shortMonth = false) : string
     {
         $today = new DateTime();
-        if($date->format('d.m.Y') === $today->format('d.m.Y'))
+        if ($date->format('d.m.Y') === $today->format('d.m.Y'))
         {
             $label = t('Today');
         }
         else
         {
-            $label = $date->format('d') . '. ' . self::month2string((int)$date->format('m'), $shortMonth) . ' ';
+            $label = $date->format('d').'. '.self::month2string((int)$date->format('m'), $shortMonth).' ';
 
             if ($date->format('Y') != date('Y'))
             {
@@ -213,7 +213,7 @@ 
 
     private static function initDays() : void
     {
-        if(!empty(self::$daysShort))
+        if (!empty(self::$daysShort))
         {
             return;
         }

src/ConvertHelper/URLFinder.php

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/ConvertHelper/Array.php

Spacing +14 added lines, -14 removed lines

@@ -15,9 +15,9 @@ 
      */
     public static function removeKeys(array &$sourceArray, array $keys) : void
     {
-        foreach($keys as $key)
+        foreach ($keys as $key)
         {
-            if(array_key_exists($key, $sourceArray)) {
+            if (array_key_exists($key, $sourceArray)) {
                 unset($sourceArray[$key]);
             }
         }
@@ -31,18 +31,18 @@ 
      * @param bool $keepKeys Whether to maintain index association
      * @return array<number|string,mixed>
      */
-    public static function removeValues(array $sourceArray, array $values, bool $keepKeys=false) : array
+    public static function removeValues(array $sourceArray, array $values, bool $keepKeys = false) : array
     {
         $result = array();
         $values = array_values($values);
 
-        foreach($sourceArray as $key => $value)
+        foreach ($sourceArray as $key => $value)
         {
-            if(in_array($value, $values, true)) {
+            if (in_array($value, $values, true)) {
                 continue;
             }
 
-            if($keepKeys) {
+            if ($keepKeys) {
                 $result[$key] = $value;
                 continue;
             }
@@ -75,7 +75,7 @@ 
     public static function toStyleString(array $subject) : string
     {
         $tokens = array();
-        foreach($subject as $name => $value) {
+        foreach ($subject as $name => $value) {
             $tokens[] = $name.':'.strval($value);
         }
 
@@ -104,18 +104,18 @@ 
     public static function toAttributeString(array $array) : string
     {
         $tokens = array();
-        foreach($array as $attr => $value)
+        foreach ($array as $attr => $value)
         {
             $value = strval($value);
 
-            if($value === '') {
+            if ($value === '') {
                 continue;
             }
 
             $tokens[] = $attr.'="'.htmlspecialchars($value, ENT_QUOTES, 'UTF-8').'"';
         }
 
-        if(empty($tokens)) {
+        if (empty($tokens)) {
             return '';
         }
 
@@ -136,17 +136,17 @@ 
      */
     public static function implodeWithAnd(array $list, string $sep = ', ', string $conjunction = '') : string
     {
-        if(empty($list)) {
+        if (empty($list)) {
             return '';
         }
 
-        if(empty($conjunction)) {
+        if (empty($conjunction)) {
             $conjunction = ' '.t('and').' ';
         }
 
         $last = array_pop($list);
-        if($list) {
-            return implode($sep, $list) . $conjunction . $last;
+        if ($list) {
+            return implode($sep, $list).$conjunction.$last;
         }
 
         return $last;