json response service

Author: devosc

src/Api/Controller.php

@@ -4,25 +4,32 @@
  */
 namespace Api;
 
-use Mvc5\Http\Response;
+use Mvc5\Http;
+use Mvc5\Plugins\Response;
+use Mvc5\Plugins\Service;
 use Mvc5\Request\Request;
-use Mvc5\Response\JsonResponse;
 
 class Controller
 {
+    /**
+     *
+     */
+    use Response;
+    use Service;
+
     /**
      * @param Request $request
-     * @return Response
+     * @return Http\Response
      * @throws \Throwable
      */
-    function __invoke(Request $request) : Response
+    function __invoke(Request $request) : Http\Response
     {
         $data = $request->data();
 
         if (!$request->isPost()) {
             throw new \Exception('foo bar');
         }
 
-        return new JsonResponse(['foo' => $data['foo'], 'baz' => $data['baz']]);
+        return $this->json(['foo' => $data['foo'], 'baz' => $data['baz']]);
     }
 }

tests/Api/ControllerTest.php

@@ -16,7 +16,6 @@
 class ControllerTest
     extends TestCase
 {
-
     /**
      * @runInSeparateProcess
      * @throws \Throwable
@@ -33,11 +32,11 @@ function test_error()
 
         $response = (new App($config))->call('web');
 
-        $result = json_decode($response->body);
+        $result = json_decode((string) $response->body);
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertEquals(404, $response->status);
-        $this->assertEquals('application/json', $response->header('content-type'));
+        $this->assertEquals('application/json', $response->headers['content-type']);
         $this->assertEquals('Not Found', $response->reason);
         $this->assertEquals('Not Found', $result->message);
         $this->assertEquals('The server can not find the requested resource.', $result->description);
@@ -60,7 +59,7 @@ function test_exception()
 
         $response = (new App($config))->call('exception\response', ['exception' => new \Exception('foobar')]);
 
-        $result = json_decode($response->body);
+        $result = json_decode((string) $response->body);
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertEquals(500, $response->status);
@@ -84,15 +83,15 @@ function test_exception_trace()
 
         $response = (new App($config))->call('exception\response', ['exception' => new \Exception('foobar', 900)]);
 
-        $result = json_decode($response->body);
+        $result = json_decode((string) $response->body);
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertEquals(500, $response->status);
         $this->assertEquals('application/json', $response->headers['content-type']);
         $this->assertEquals('Internal Server Error', $response->reason);
         $this->assertEquals(900, $result->code);
         $this->assertEquals('foobar', $result->message);
-        $this->assertEquals(85, $result->line);
+        $this->assertEquals(84, $result->line);
         $this->assertEquals(__FILE__, $result->file);
         $this->assertInternalType('array', $result->trace);
         $this->assertNotEmpty($result->trace);
@@ -116,7 +115,7 @@ function test_post_form()
 
         $response = (new App($config))->call('web');
 
-        $result = json_decode($response->body);
+        $result = json_decode((string) $response->body);
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertEquals(200, $response->status);
@@ -144,7 +143,7 @@ function test_post_json()
 
         $response = (new App($config))->call('web');
 
-        $result = json_decode($response->body);
+        $result = json_decode((string) $response->body);
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertEquals(200, $response->status);