Reformat various code.

app/Support/Steam.php

@@ -43,53 +43,6 @@ use Str;
 class Steam
 {
 
-    /**
-     * Returns the previous URL but refuses to send you to specific URLs.
-     *
-     * - outside domain
-     * - to JS files, API or JSON routes
-     *
-     * Uses the session's previousUrl() function as inspired by GitHub user @z1r0-
-     *
-     *  session()->previousUrl() uses getSafeUrl() so we can safely return it:
-     *
-     * @return string
-     */
-    public function getSafePreviousUrl(): string
-    {
-        //Log::debug(sprintf('getSafePreviousUrl: "%s"', session()->previousUrl()));
-        return session()->previousUrl() ?? route('index');
-    }
-
-    /**
-     * Make sure URL is safe.
-     *
-     * @param string $unknownUrl
-     * @param string $safeUrl
-     *
-     * @return string
-     */
-    public function getSafeUrl(string $unknownUrl, string $safeUrl): string
-    {
-        //Log::debug(sprintf('getSafeUrl(%s, %s)', $unknownUrl, $safeUrl));
-        $returnUrl   = $safeUrl;
-        $unknownHost = parse_url($unknownUrl, PHP_URL_HOST);
-        $safeHost    = parse_url($safeUrl, PHP_URL_HOST);
-
-        if (null !== $unknownHost && $unknownHost === $safeHost) {
-            $returnUrl = $unknownUrl;
-        }
-
-        // URL must not lead to weird pages
-        $forbiddenWords = ['jscript', 'json', 'debug', 'serviceworker', 'offline', 'delete', '/login', '/attachments/view'];
-        if (Str::contains($returnUrl, $forbiddenWords)) {
-            $returnUrl = $safeUrl;
-        }
-
-        return $returnUrl;
-    }
-
-
     /**
      * @param Account $account
      * @param Carbon  $date
@@ -391,6 +344,65 @@ class Steam
         return $return;
     }
 
+    /**
+     * @param string $string
+     *
+     * @return string
+     */
+    public function filterSpaces(string $string): string
+    {
+        $search = [
+            "\u{0001}", // start of heading
+            "\u{0002}", // start of text
+            "\u{0003}", // end of text
+            "\u{0004}", // end of transmission
+            "\u{0005}", // enquiry
+            "\u{0006}", // ACK
+            "\u{0007}", // BEL
+            "\u{0008}", // backspace
+            "\u{000E}", // shift out
+            "\u{000F}", // shift in
+            "\u{0010}", // data link escape
+            "\u{0011}", // DC1
+            "\u{0012}", // DC2
+            "\u{0013}", // DC3
+            "\u{0014}", // DC4
+            "\u{0015}", // NAK
+            "\u{0016}", // SYN
+            "\u{0017}", // ETB
+            "\u{0018}", // CAN
+            "\u{0019}", // EM
+            "\u{001A}", // SUB
+            "\u{001B}", // escape
+            "\u{001C}", // file separator
+            "\u{001D}", // group separator
+            "\u{001E}", // record separator
+            "\u{001F}", // unit separator
+            "\u{007F}", // DEL
+            "\u{00A0}", // non-breaking space
+            "\u{1680}", // ogham space mark
+            "\u{180E}", // mongolian vowel separator
+            "\u{2000}", // en quad
+            "\u{2001}", // em quad
+            "\u{2002}", // en space
+            "\u{2003}", // em space
+            "\u{2004}", // three-per-em space
+            "\u{2005}", // four-per-em space
+            "\u{2006}", // six-per-em space
+            "\u{2007}", // figure space
+            "\u{2008}", // punctuation space
+            "\u{2009}", // thin space
+            "\u{200A}", // hair space
+            "\u{200B}", // zero width space
+            "\u{202F}", // narrow no-break space
+            "\u{3000}", // ideographic space
+            "\u{FEFF}", // zero width no -break space
+            "\x20", // plain old normal space
+        ];
+
+        return str_replace($search, '', $string);
+    }
+
     /**
      * @param array $accounts
      *
@@ -463,6 +475,52 @@ class Steam
         ];
     }
 
+    /**
+     * Returns the previous URL but refuses to send you to specific URLs.
+     *
+     * - outside domain
+     * - to JS files, API or JSON routes
+     *
+     * Uses the session's previousUrl() function as inspired by GitHub user @z1r0-
+     *
+     *  session()->previousUrl() uses getSafeUrl() so we can safely return it:
+     *
+     * @return string
+     */
+    public function getSafePreviousUrl(): string
+    {
+        //Log::debug(sprintf('getSafePreviousUrl: "%s"', session()->previousUrl()));
+        return session()->previousUrl() ?? route('index');
+    }
+
+    /**
+     * Make sure URL is safe.
+     *
+     * @param string $unknownUrl
+     * @param string $safeUrl
+     *
+     * @return string
+     */
+    public function getSafeUrl(string $unknownUrl, string $safeUrl): string
+    {
+        //Log::debug(sprintf('getSafeUrl(%s, %s)', $unknownUrl, $safeUrl));
+        $returnUrl   = $safeUrl;
+        $unknownHost = parse_url($unknownUrl, PHP_URL_HOST);
+        $safeHost    = parse_url($safeUrl, PHP_URL_HOST);
+
+        if (null !== $unknownHost && $unknownHost === $safeHost) {
+            $returnUrl = $unknownUrl;
+        }
+
+        // URL must not lead to weird pages
+        $forbiddenWords = ['jscript', 'json', 'debug', 'serviceworker', 'offline', 'delete', '/login', '/attachments/view'];
+        if (Str::contains($returnUrl, $forbiddenWords)) {
+            $returnUrl = $safeUrl;
+        }
+
+        return $returnUrl;
+    }
+
     /**
      * @param string $amount
      *
@@ -505,9 +563,9 @@ class Steam
             if ($mantis < 0) {
                 $post += abs((int) $mantis);
             }
-            return number_format((float)$value, $post, '.', '');
+            return number_format((float) $value, $post, '.', '');
         }
-        return number_format((float)$value, 0, '.', '');
+        return number_format((float) $value, 0, '.', '');
     }
 
     /**
@@ -573,63 +631,4 @@ class Steam
 
         return $amount;
     }
-
-    /**
-     * @param string $string
-     *
-     * @return string
-     */
-    public function filterSpaces(string $string): string
-    {
-        $search = [
-            "\u{0001}", // start of heading
-            "\u{0002}", // start of text
-            "\u{0003}", // end of text
-            "\u{0004}", // end of transmission
-            "\u{0005}", // enquiry
-            "\u{0006}", // ACK
-            "\u{0007}", // BEL
-            "\u{0008}", // backspace
-            "\u{000E}", // shift out
-            "\u{000F}", // shift in
-            "\u{0010}", // data link escape
-            "\u{0011}", // DC1
-            "\u{0012}", // DC2
-            "\u{0013}", // DC3
-            "\u{0014}", // DC4
-            "\u{0015}", // NAK
-            "\u{0016}", // SYN
-            "\u{0017}", // ETB
-            "\u{0018}", // CAN
-            "\u{0019}", // EM
-            "\u{001A}", // SUB
-            "\u{001B}", // escape
-            "\u{001C}", // file separator
-            "\u{001D}", // group separator
-            "\u{001E}", // record separator
-            "\u{001F}", // unit separator
-            "\u{007F}", // DEL
-            "\u{00A0}", // non-breaking space
-            "\u{1680}", // ogham space mark
-            "\u{180E}", // mongolian vowel separator
-            "\u{2000}", // en quad
-            "\u{2001}", // em quad
-            "\u{2002}", // en space
-            "\u{2003}", // em space
-            "\u{2004}", // three-per-em space
-            "\u{2005}", // four-per-em space
-            "\u{2006}", // six-per-em space
-            "\u{2007}", // figure space
-            "\u{2008}", // punctuation space
-            "\u{2009}", // thin space
-            "\u{200A}", // hair space
-            "\u{200B}", // zero width space
-            "\u{202F}", // narrow no-break space
-            "\u{3000}", // ideographic space
-            "\u{FEFF}", // zero width no -break space
-            "\x20", // plain old normal space
-        ];
-
-        return str_replace($search, '', $string);
-    }
 }