ericsizemore / utility

src/Utility/Utility.php

Spacing +38 added lines, -39 removed lines

@@ -140,9 +140,9 @@ 
 
         foreach ($array AS $key => $value) {
             if (is_array($value) AND $value !== []) {
-                $result[] = static::arrayFlatten($value, $separator, $prepend . $key . $separator);
+                $result[] = static::arrayFlatten($value, $separator, $prepend.$key.$separator);
             } else {
-                $result[] = [$prepend . $key => $value];
+                $result[] = [$prepend.$key => $value];
             }
         }
 
@@ -305,7 +305,7 @@ 
      */
     public static function lcfirst(string $string): string
     {
-        return self::lower(self::substr($string, 0, 1)) . self::substr($string, 1);
+        return self::lower(self::substr($string, 0, 1)).self::substr($string, 1);
     }
 
     /**
@@ -320,7 +320,7 @@ 
      */
     public static function ucfirst(string $string): string
     {
-        return self::upper(self::substr($string, 0, 1)) . self::substr($string, 1);
+        return self::upper(self::substr($string, 0, 1)).self::substr($string, 1);
     }
 
     /**
@@ -566,22 +566,22 @@ 
         // preg_replace can return null if an error occurs. It shouldn't happen, but if it does,
         // we return what we have processed thus far
         $title = (
-            preg_replace('![' . preg_quote(($separator === '-' ? '_' : '-')) . ']+!u', $separator, $title)
+            preg_replace('!['.preg_quote(($separator === '-' ? '_' : '-')).']+!u', $separator, $title)
             ?? $title
         );
 
         // Replace @ with the word 'at'
-        $title = str_replace('@', $separator . 'at' . $separator, $title);
+        $title = str_replace('@', $separator.'at'.$separator, $title);
 
         // Remove all characters that are not the separator, letters, numbers, or whitespace.
         $title = (
-            preg_replace('![^' . preg_quote($separator) . '\pL\pN\s]+!u', '', static::lower($title))
+            preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', static::lower($title))
             ?? $title
         );
 
         // Replace all separator characters and whitespace by a single separator
         $title = (
-            preg_replace('![' . preg_quote($separator) . '\s]+!u', $separator, $title)
+            preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title)
             ?? $title
         );
 
@@ -612,7 +612,7 @@ 
             $bytes = random_bytes($length);
         } catch (RandomException | Exception $e) {
             throw new RandomException(
-                'Utility was unable to generate random bytes: ' . $e->getMessage(), $e->getCode(), $e->getPrevious()
+                'Utility was unable to generate random bytes: '.$e->getMessage(), $e->getCode(), $e->getPrevious()
             );
         }
         return $bytes;
@@ -649,7 +649,7 @@ 
             $int = random_int($min, $max);
         } catch (RandomException | Exception $e) {
             throw new RandomException(
-                'Utility was unable to generate random int: ' . $e->getMessage(), $e->getCode(), $e->getPrevious()
+                'Utility was unable to generate random int: '.$e->getMessage(), $e->getCode(), $e->getPrevious()
             );
         }
         return $int;
@@ -753,7 +753,7 @@ 
                     continue;
                 }
 
-                $content = file($val->getPath() . DIRECTORY_SEPARATOR . $val->getFilename(), $flags);
+                $content = file($val->getPath().DIRECTORY_SEPARATOR.$val->getFilename(), $flags);
 
                 if ($content === false) {
                     continue;
@@ -888,11 +888,11 @@ 
     public static function normalizeFilePath(string $path, string $separator = DIRECTORY_SEPARATOR): string
     {
         // Clean up our path
-        $path = rtrim(strtr($path, '/\\', $separator . $separator), $separator);
+        $path = rtrim(strtr($path, '/\\', $separator.$separator), $separator);
 
         if (
-            static::doesNotContain($separator . $path, "{$separator}.")
-            AND static::doesNotContain($path, $separator . $separator)
+            static::doesNotContain($separator.$path, "{$separator}.")
+            AND static::doesNotContain($path, $separator.$separator)
         ) {
             return $path;
         }
@@ -936,7 +936,7 @@ 
         // Otherwise, if on Windows...
         if (is_dir($file)) {
             // Generate random filename.
-            $file = rtrim($file, '\\/') . DIRECTORY_SEPARATOR;
+            $file = rtrim($file, '\\/').DIRECTORY_SEPARATOR;
             $file .= hash('md5', static::randomString());
 
             if (($fp = fopen($file, 'ab')) === false) {
@@ -1272,15 +1272,15 @@ 
         $bytes = floatval($bytes);
 
         return match (true) {
-            $bytes >= $pow['yotta'] => number_format(($bytes / $pow['yotta']), $decimals, '.', '') . ' YiB',
-            $bytes >= $pow['zeta']  => number_format(($bytes / $pow['zeta']), $decimals, '.', '') . ' ZiB',
-            $bytes >= $pow['exa']   => number_format(($bytes / $pow['exa']), $decimals, '.', '') . ' EiB',
-            $bytes >= $pow['peta']  => number_format(($bytes / $pow['peta']), $decimals, '.', '') . ' PiB',
-            $bytes >= $pow['tera']  => number_format(($bytes / $pow['tera']), $decimals, '.', '') . ' TiB',
-            $bytes >= $pow['giga']  => number_format(($bytes / $pow['giga']), $decimals, '.', '') . ' GiB',
-            $bytes >= $pow['mega']  => number_format(($bytes / $pow['mega']), $decimals, '.', '') . ' MiB',
-            $bytes >= $pow['kilo']  => number_format(($bytes / $pow['kilo']), $decimals, '.', '') . ' KiB',
-            default => number_format($bytes, $decimals, '.', '') . ' B'
+            $bytes >= $pow['yotta'] => number_format(($bytes / $pow['yotta']), $decimals, '.', '').' YiB',
+            $bytes >= $pow['zeta']  => number_format(($bytes / $pow['zeta']), $decimals, '.', '').' ZiB',
+            $bytes >= $pow['exa']   => number_format(($bytes / $pow['exa']), $decimals, '.', '').' EiB',
+            $bytes >= $pow['peta']  => number_format(($bytes / $pow['peta']), $decimals, '.', '').' PiB',
+            $bytes >= $pow['tera']  => number_format(($bytes / $pow['tera']), $decimals, '.', '').' TiB',
+            $bytes >= $pow['giga']  => number_format(($bytes / $pow['giga']), $decimals, '.', '').' GiB',
+            $bytes >= $pow['mega']  => number_format(($bytes / $pow['mega']), $decimals, '.', '').' MiB',
+            $bytes >= $pow['kilo']  => number_format(($bytes / $pow['kilo']), $decimals, '.', '').' KiB',
+            default => number_format($bytes, $decimals, '.', '').' B'
         };
     }
 
@@ -1336,19 +1336,19 @@ 
         $difference = $timestampFrom->diff($timestampTo);
 
         $string = match (true) {
-            $difference->y > 0 => $difference->y . ' year(s)',
-            $difference->m > 0 => $difference->m . ' month(s)',
+            $difference->y > 0 => $difference->y.' year(s)',
+            $difference->m > 0 => $difference->m.' month(s)',
             $difference->d > 0 => (
             $difference->d >= 7
-                ? ceil($difference->d / 7) . ' week(s)'
-                : $difference->d . ' day(s)'
+                ? ceil($difference->d / 7).' week(s)'
+                : $difference->d.' day(s)'
             ),
-            $difference->h > 0 => $difference->h . ' hour(s)',
-            $difference->i > 0 => $difference->i . ' minute(s)',
-            $difference->s > 0 => $difference->s . ' second(s)',
+            $difference->h > 0 => $difference->h.' hour(s)',
+            $difference->i > 0 => $difference->i.' minute(s)',
+            $difference->s > 0 => $difference->s.' second(s)',
             default => ''
         };
-        return $string . $append;
+        return $string.$append;
     }
 
     /**
@@ -1474,7 +1474,7 @@ 
         // Split and process
         $email = str_split($email);
         $email = array_map(function($char) {
-            return '&#' . ord($char) . ';';
+            return '&#'.ord($char).';';
         }, $email);
         return implode('', $email);
     }
@@ -1493,8 +1493,7 @@ 
         /** @var string $host **/
         $host = (
             ($acceptForwarded AND isset($_SERVER['HTTP_X_FORWARDED_HOST'])) ? 
-            $_SERVER['HTTP_X_FORWARDED_HOST'] : 
-            ($_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? '')
+            $_SERVER['HTTP_X_FORWARDED_HOST'] : ($_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? '')
         );
         $host = trim(strval($host));
 
@@ -1611,7 +1610,7 @@ 
         /** @var string $request **/
         $request = $_SERVER['REQUEST_URI'] ?? '';
         /** @var string $path **/
-        $path = ($request === '' ? $self . ($query !== '' ? '?' . $query : '') : $request);
+        $path = ($request === '' ? $self.($query !== '' ? '?'.$query : '') : $request);
 
         // Put it all together
         /** @var string $url **/
@@ -1642,7 +1641,7 @@ 
         } else {
             $suffix = $suffixes[0];
         }
-        return $number . $suffix;
+        return $number.$suffix;
     }
 
     /**
@@ -1732,7 +1731,7 @@ 
             header("Status: $code $message", $replace);
         } else {
             header(
-                ($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1') . " $code $message",
+                ($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1')." $code $message",
                 $replace,
                 $code
             );
@@ -1764,7 +1763,7 @@ 
                 static::randomInt(0, 0xffff)
             );
         } catch (RandomException | Exception $e) {
-            throw new RandomException('Unable to generate GUID: ' . $e->getMessage(), 0, $e);
+            throw new RandomException('Unable to generate GUID: '.$e->getMessage(), 0, $e);
         }
         return $guid;
     }

Braces +1 added lines, -2 removed lines

@@ -1798,8 +1798,7 @@
 
         try {
             $tz = new DateTimeZone($timezone);
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             throw new InvalidArgumentException($e->getMessage(), 0, $e);
         }