refactored

Author: vijinho

src/App.php

@@ -142,7 +142,7 @@ public static function start()
         // fix for f3 not populating $_GET when run on the command line
         $uri         = $f3->get('SERVER.REQUEST_URI');
         $querystring = preg_split('/&/', \UTF::instance()->substr($uri, 1 + \UTF::instance()->strpos($uri . '&', '?')));
-        $get = [];
+        $get         = [];
         if (!empty($querystring) && count($querystring)) {
             foreach ($querystring as $pair) {
                 if (0 == count($pair)) {
@@ -175,6 +175,8 @@ public static function finish()
 
         if (\Registry::exists('logger')) {
             $logger = \Registry::get('logger');
+        } else {
+            $logger = null;
         }
 
         if (!empty($logger) && is_object($logger) && $debug || 'production' !== $f3->get('app.env')) {

src/Helpers/Response.php

@@ -43,41 +43,33 @@ public static function json(array $data, array $params = [], bool $output = true
         $headers['Access-Control-Allow-Credentials'] = array_key_exists('acl_credentials', $params) ? $params['credentials'] : 'false';
 
         $body = json_encode($data, JSON_PRETTY_PRINT);
-        if (!empty($output)) {
-            $headers['Content-Length'] = \UTF::instance()->strlen($body);
-        }
-
         $headers['ETag'] = array_key_exists('etag', $params) ? $params['etag'] : md5($body);
+        $headers['Content-Length'] = \UTF::instance()->strlen($body);
 
+        // if returning output data or sending a HEAD request...
         if (empty($output)) {
+            if ('HEAD' == $f3->get('VERB')) {
+                $body = null;
+            }
             return ['headers' => $headers, 'body' => $body];
-        } else {
+        }
 
-                // send the headers + data
-            foreach ($headers as $header => $value) {
-                if (is_string($value) && empty($value)) {
-                    continue;
-                }
-                header($header.': '.$value);
-            }
-            if (!array_key_exists('cookie', $params)) {
-                header_remove('Set-Cookie'); // prevent php session
-            }
-            // default status is 200 - OK
-            $f3->status(array_key_exists('http_status', $params) ? $params['http_status'] : 200);
+        // do not send session cookie
+        if (!array_key_exists('cookie', $params)) {
+            header_remove('Set-Cookie'); // prevent php session
+        }
 
-            $method = $f3->get('VERB');
+        // default status is 200 - OK
+        $f3->status(array_key_exists('http_status', $params) ? $params['http_status'] : 200);
 
-            switch ($method) {
-                case 'HEAD':
-                    break;
-                default:
-                case 'GET':
-                case 'PUT':
-                case 'POST':
-                case 'DELETE':
-                    echo $body;
-            }
+        // send the headers + data
+        foreach ($headers as $header => $value) {
+            header($header.': '.$value);
+        }
+
+        // HEAD request should be identical headers to GET request but no body
+        if ('HEAD' !== $f3->get('VERB')) {
+            echo $body;
         }
     }
 }

src/Helpers/Time.php

@@ -47,8 +47,6 @@ public static function database(int $unixtime = null, string $dbms = null): stri
      */
     public static function HTTP(int $unixtime = null, string $zone = ''): string
     {
-        $f3 = \Base::instance();
-
         // use current time if bad time value or unset
         $unixtime = (int) $unixtime;
 

src/Helpers/Url.php

@@ -23,8 +23,6 @@ class Url extends \Prefab
      */
     public static function external(string $url, $params = null, bool $https = true): string
     {
-        $f3 = \Base::instance();
-
         if (!empty($params)) {
 
             if (is_array($params)) {
@@ -53,7 +51,7 @@ public static function external(string $url, $params = null, bool $https = true)
      * converting 2nd argument $params to querystring if array
      *
      * @param string $url name of the url alias if beginning with @ or relative
-     * 
+     *
      * @param mixed $params url params as string or array
      * @param boolean $full default true
      * @return string