Merge pull request #9 from maurobonfietti/0.10.0

Version 0.10.0
maurobonfietti · May 30, 2020 · f505f4d · f505f4d
2 parents 2845733 + bea7079
commit f505f4d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/src/Command/CrudGeneratorCommand.php b/src/Command/CrudGeneratorCommand.php
@@ -11,7 +11,7 @@
 
 class CrudGeneratorCommand extends Command
 {
-    const COMMAND_VERSION = '0.9.0';
+    const COMMAND_VERSION = '0.10.0';
 
     public function __construct($app)
     {

diff --git a/src/Command/TemplateBase/Objectbase/Create.php b/src/Command/TemplateBase/Objectbase/Create.php
@@ -4,6 +4,7 @@
 
 namespace App\Controller\Objectbase;
 
+use App\Lib\JsonResponse;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
@@ -14,8 +15,6 @@ public function __invoke(Request $request, Response $response): Response
         $input = $request->getParsedBody();
         $objectbase = $this->getObjectbaseService()->create($input);
 
-        $payload = json_encode($objectbase);
-        $response->getBody()->write($payload);
-        return $response->withHeader('Content-Type', 'application/json')->withStatus(201);
+        return JsonResponse::withJson($response, json_encode($objectbase), 201);
     }
 }
diff --git a/src/Command/TemplateBase/Objectbase/Delete.php b/src/Command/TemplateBase/Objectbase/Delete.php
@@ -4,6 +4,7 @@
 
 namespace App\Controller\Objectbase;
 
+use App\Lib\JsonResponse;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
@@ -13,6 +14,6 @@ public function __invoke(Request $request, Response $response, array $args): Res
     {
         $this->getObjectbaseService()->delete((int) $args['id']);
 
-        return $response->withHeader('Content-Type', 'application/json')->withStatus(204);
+        return JsonResponse::withJson($response, '', 204);
     }
 }
diff --git a/src/Command/TemplateBase/Objectbase/GetAll.php b/src/Command/TemplateBase/Objectbase/GetAll.php
@@ -4,6 +4,7 @@
 
 namespace App\Controller\Objectbase;
 
+use App\Lib\JsonResponse;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
@@ -13,8 +14,6 @@ public function __invoke(Request $request, Response $response): Response
     {
         $objectbases = $this->getObjectbaseService()->getAll();
 
-        $payload = json_encode($objectbases);
-        $response->getBody()->write($payload);
-        return $response->withHeader('Content-Type', 'application/json')->withStatus(200);
+        return JsonResponse::withJson($response, json_encode($objectbases));
     }
 }
diff --git a/src/Command/TemplateBase/Objectbase/GetOne.php b/src/Command/TemplateBase/Objectbase/GetOne.php
@@ -4,6 +4,7 @@
 
 namespace App\Controller\Objectbase;
 
+use App\Lib\JsonResponse;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
@@ -13,8 +14,6 @@ public function __invoke(Request $request, Response $response, array $args): Res
     {
         $objectbase = $this->getObjectbaseService()->getOne((int) $args['id']);
 
-        $payload = json_encode($objectbase);
-        $response->getBody()->write($payload);
-        return $response->withHeader('Content-Type', 'application/json')->withStatus(200);
+        return JsonResponse::withJson($response, json_encode($objectbase));
     }
 }
diff --git a/src/Command/TemplateBase/Objectbase/Update.php b/src/Command/TemplateBase/Objectbase/Update.php
@@ -4,6 +4,7 @@
 
 namespace App\Controller\Objectbase;
 
+use App\Lib\JsonResponse;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
@@ -14,8 +15,6 @@ public function __invoke(Request $request, Response $response, array $args): Res
         $input = $request->getParsedBody();
         $objectbase = $this->getObjectbaseService()->update($input, (int) $args['id']);
 
-        $payload = json_encode($objectbase);
-        $response->getBody()->write($payload);
-        return $response->withHeader('Content-Type', 'application/json')->withStatus(200);
+        return JsonResponse::withJson($response, json_encode($objectbase));
     }
 }