BBCode - fixed syntax error

[friendica.git] / src / Core / System.php

diff --git a/src/Core/System.php b/src/Core/System.php
index 3bd06bc1919524e48c1c63fb0fdfab3244caa578..ba3d03e6229f283e3d0d7250366869f144e8caeb 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -5,8 +5,6 @@
 namespace Friendica\Core;
 
 use Friendica\BaseObject;
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\XML;
 
@@ -27,6 +25,7 @@ class System extends BaseObject
         *
         * @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN
         * @return string Friendica server base URL
+        * @throws InternalServerErrorException
         */
        public static function baseUrl($ssl = false)
        {
@@ -39,6 +38,7 @@ class System extends BaseObject
         * @param string $orig_url The url to be cleaned
         *
         * @return string The cleaned url
+        * @throws \Exception
         */
        public static function removedBaseUrl($orig_url)
        {
@@ -59,7 +59,6 @@ class System extends BaseObject
                array_shift($trace);
 
                $callstack = [];
-               $counter = 0;
                $previous = ['class' => '', 'function' => ''];
 
                // The ignore list contains all functions that are only wrapper functions
@@ -92,6 +91,10 @@ class System extends BaseObject
         * Generic XML return
         * Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable
         * of $st and an optional text <message> of $message and terminates the current process.
+        *
+        * @param        $st
+        * @param string $message
+        * @throws \Exception
         */
        public static function xmlExit($st, $message = '')
        {
@@ -111,7 +114,7 @@ class System extends BaseObject
 
                echo XML::fromArray($xmldata, $xml);
 
-               killme();
+               exit();
        }
 
        /**
@@ -121,6 +124,7 @@ class System extends BaseObject
         * @param array   $description optional message
         *                             'title' => header title
         *                             'description' => optional message
+        * @throws InternalServerErrorException
         */
        public static function httpExit($val, $description = [])
        {
@@ -185,27 +189,29 @@ class System extends BaseObject
        public static function jsonExit($x, $content_type = 'application/json') {
                header("Content-type: $content_type");
                echo json_encode($x);
-               killme();
+               exit();
        }
 
        /**
         * Generates a random string in the UUID format
         *
-        * @param bool|string  $prefix   A given prefix (default is empty)
+        * @param bool|string $prefix A given prefix (default is empty)
         * @return string a generated UUID
+        * @throws \Exception
         */
        public static function createUUID($prefix = '')
        {
                $guid = System::createGUID(32, $prefix);
-               return substr($guid, 0, 8). '-' . substr($guid, 8, 4) . '-' . substr($guid, 12, 4) . '-' . substr($guid, 16, 4) . '-' . substr($guid, 20, 12);
+               return substr($guid, 0, 8) . '-' . substr($guid, 8, 4) . '-' . substr($guid, 12, 4) . '-' . substr($guid, 16, 4) . '-' . substr($guid, 20, 12);
        }
 
        /**
         * Generates a GUID with the given parameters
         *
-        * @param int          $size     The size of the GUID (default is 16)
-        * @param bool|string  $prefix   A given prefix (default is empty)
+        * @param int         $size   The size of the GUID (default is 16)
+        * @param bool|string $prefix A given prefix (default is empty)
         * @return string a generated GUID
+        * @throws \Exception
         */
        public static function createGUID($size = 16, $prefix = '')
        {