middleware keep content-type to json when return string

Author: emsifa

src/Action.php

@@ -153,9 +153,9 @@ public function run()
         $returned = call_user_func($callable);
 
         if(is_array($returned)) {
-            $app->response->json($returned);
+            $app->response->json($returned, null, $app->response->getContentType());
         } elseif(is_string($returned)) {
-            $app->response->html($returned);
+            $app->response->html($returned, null, $app->response->getContentType());
         }
 
         return $app->response->body;

src/Http/Response.php

@@ -127,7 +127,7 @@ public function isStatus($status_code)
      */
     public function setContentType($type)
     {
-        $this->header["CONTENT_TYPE"] = $type;
+        $this->headers["CONTENT_TYPE"] = $type;
         return $this;
     }
 
@@ -138,22 +138,22 @@ public function setContentType($type)
      */
     public function getContentType()
     {
-        return $this->header["CONTENT_TYPE"];
+        return $this->headers["CONTENT_TYPE"];
     }
 
-    public function json(array $data, $status = null)
+    public function json(array $data, $status = null, $content_type = null)
     {
         $json = json_encode($data);
-        $this->setContentType(static::CONTENT_TYPE_JSON);
+        $this->setContentType($content_type ? $content_type : static::CONTENT_TYPE_JSON);
         $this->setStatus($status);
         $this->body = $json;
 
         return $this;
     }
 
-    public function html($content, $status = null)
+    public function html($content, $status = null, $content_type = null)
     {
-        $this->setContentType(static::CONTENT_TYPE_HTML);
+        $this->setContentType($content_type ? $content_type : static::CONTENT_TYPE_HTML);
         $this->setStatus($status);
         $this->body = $content;
 
@@ -175,7 +175,6 @@ public function reset()
         $this->has_sent = false;
 
         return $this
-            ->setContentType(static::CONTENT_TYPE_HTML)
             ->setStatus(200)
             ->clean();
     }
@@ -228,14 +227,11 @@ public function getStatusMessage($status_code)
     protected function writeHeaders()
     {
         $headers = $this->headers->all(false);
-        $content_type = $this->getContentType();
+        $content_type = ($type = $this->getContentType()) ? $type : static::CONTENT_TYPE_HTML;
 
         // http://stackoverflow.com/questions/6163970/set-response-status-code
         header("HTTP/1.1 ".$this->getStatusMessage($this->status), true, $this->status);
-        if ($content_type) {
-            header('Content-type: '.$content_type);
-        }
-
+        header('Content-type: '.$content_type);
         foreach($headers as $key => $value) {
             $header = $this->normalizeHeaderKey($key).': '.$value;
             header($header);

tests/RunAppTests.php

@@ -273,7 +273,7 @@ public function testMultipleMiddleware()
             return $request->str."bazQux";
         })->setStr('foobar')->jsonify()->uppercase();
 
-        $this->assertResponse("GET", "/foo", '{"body":"FOOBARBAZQUX"}');
+        $this->assertResponse("GET", "/foo", '{"body":"FOOBARBAZQUX"}', 200, 'application/json');
     }
 
     /**
@@ -310,6 +310,41 @@ public function testRouteGroup()
         $this->assertResponse("GET", "/group/hello", 'IM IN GROUP');
     }
 
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState enabled
+     */
+    public function testResponseJson()
+    {
+        $this->app->get('/anything.json', function() {
+            return [
+                'message' => 'hello'
+            ];
+        });
+
+        $this->assertResponse("GET", "/anything.json", '{"message":"hello"}', 200, 'application/json');
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState enabled
+     */
+    public function testMiddlewareKeepResponseToJson()
+    {
+        $this->app->middleware('uppercase', function($req, $res, $next) {
+            $next();
+            return strtoupper($res->body);
+        });
+
+        $this->app->get('/anything.json', function() {
+            return [
+                'message' => 'hello'
+            ];
+        })->uppercase();
+
+        $this->assertResponse("GET", "/anything.json", '{"MESSAGE":"HELLO"}', 200, 'application/json');
+    }
+
     /**
      * @runInSeparateProcess
      * @preserveGlobalState enabled
@@ -427,12 +462,14 @@ protected function runAndGetResponse($method, $path)
         return [$response, $rendered];
     }
 
-    protected function assertResponse($method, $path, $assert_body, $assert_status = 200)
+    protected function assertResponse($method, $path, $assert_body, $assert_status = 200, $assert_content_type = 'text/html')
     {
+        $at = $method.' '.$path.' => '.$assert_body;
         list($response, $rendered) = $this->runAndGetResponse($method, $path);
 
-        $this->assertEquals($rendered, $assert_body);  
-        $this->assertEquals($response->getStatus(), $assert_status);
+        $this->assertEquals($rendered, $assert_body, $at);
+        $this->assertEquals($response->getStatus(), $assert_status, $at);
+        $this->assertEquals($response->getContentType(), $assert_content_type, $at);
     }
 
 }