refracto; content type header

src/Utils/Controller/LuticateApplication.php

@@ -83,12 +83,8 @@ class LuticateApplication implements MessageComponentInterface
         $this->_router->setup();
     }
     
-    public function runHttp()
+    private function dispatch($httpMethod, $url, $parameters)
     {
-        $httpMethod = $_SERVER['REQUEST_METHOD'];
-        $url = $_SERVER['REQUEST_URI'];
-
-        $parameters = array_merge($_GET, $_POST);
         $r = new LuRequestDbo();
         $r->setVersion($this->getVersion());
 
@@ -109,6 +105,17 @@ class LuticateApplication implements MessageComponentInterface
             $r->setStatusCode(500);
             $r->setMessage("Internal Error");
         }
+        return $r;
+    }
+    
+    public function runHttp()
+    {
+        $httpMethod = $_SERVER['REQUEST_METHOD'];
+        $url = $_SERVER['REQUEST_URI'];
+        $parameters = array_merge($_GET, $_POST);
+        
+        $r = $this->dispatch($httpMethod, $url, $parameters);
+        header("content-type", "application/json");
         http_response_code($r->getStatusCode());
         echo $r->__toString();
     }

src/Utils/Dbo/LuRequestDbo.php

@@ -10,19 +10,13 @@ namespace Luticate\Utils\Dbo;
 
 class LuRequestDbo extends LuDbo
 {
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
     function jsonSerialize()
     {
         return array(
             "Version" => $this->_version,
             "Data" => $this->_data,
-            "Message" => $this->_message
+            "Message" => $this->_message,
+            "StatusCode" => $this->_statusCode
         );
     }
 
@@ -38,19 +32,22 @@ class LuRequestDbo extends LuDbo
         if (isset($json["Message"])) {
             $dbo->setMessage($json["Message"]);
         }
+        if (isset($json["StatusCode"])) {
+            $dbo->setStatusCode($json["StatusCode"]);
+        }
         return $dbo;
     }
 
     private $_version;
     /**
-     * @return mixed
+     * @return float
      */
     public function getVersion()
     {
         return $this->_version;
     }
     /**
-     * @param mixed $version
+     * @param float $version
      */
     public function setVersion($version)
     {
@@ -75,14 +72,14 @@ class LuRequestDbo extends LuDbo
 
     private $_message;
     /**
-     * @return mixed
+     * @return string
      */
     public function getMessage()
     {
         return $this->_message;
     }
     /**
-     * @param mixed $message
+     * @param string $message
      */
     public function setMessage($message)
     {
@@ -92,7 +89,7 @@ class LuRequestDbo extends LuDbo
     private $_statusCode;
 
     /**
-     * @return mixed
+     * @return int
      */
     public function getStatusCode()
     {
@@ -100,7 +97,7 @@ class LuRequestDbo extends LuDbo
     }
 
     /**
-     * @param mixed $statusCode
+     * @param int $statusCode
      */
     public function setStatusCode($statusCode)
     {

src/Utils/LuHandler.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Luticate\Utils;
-
-use Exception;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Laravel\Lumen\Exceptions\Handler as ExceptionHandler;
-
-class LuHandler extends ExceptionHandler {
-
-    public function render($request, Exception $e)
-    {
-        LuLog::log($e);
-        $data = "Internal error";
-        $code = 500;
-
-        if ($e instanceof HttpException)
-        {
-            $data = $e->getMessage();
-            $code = $e->getStatusCode();
-        }
-        return response(LuOutputFormatter::formatError($code, $data), $code);
-    }
-
-}

src/Utils/LuOutputFormatter.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace Luticate\Utils;
-
-
-class LuOutputFormatter
-{
-    public static $APP_VERSION = 1.0;
-
-    public static function formatSuccess($data)
-    {
-        $r = new LuRequestDbo();
-        $r->setVersion(self::$APP_VERSION);
-        $r->setData($data);
-        $r->setStatusCode(200);
-        return $r;
-    }
-
-    public static function formatError($code, $message)
-    {
-        $r = new LuRequestDbo();
-        $r->setVersion(self::$APP_VERSION);
-        $r->setMessage($message);
-        $r->setStatusCode($code);
-        return $r;
-    }
-}