Bläddra i källkod

chore: add missing ResponseInterface

M1Screw 2 år sedan
förälder
incheckning
a1ae617772

+ 7 - 9
src/Controllers/WebAPI/FuncController.php

@@ -16,13 +16,12 @@ final class FuncController extends BaseController
     /**
      * @param array     $args
      */
-    public function ping(Request $request, Response $response, array $args)
+    public function ping(Request $request, Response $response, array $args): ResponseInterface
     {
-        $res = [
+        return $response->withJson([
             'ret' => 1,
-            'data' => 'pong',
-        ];
-        return $response->withJson($res);
+            'data' => 'Pong? Pong!',
+        ]);
     }
 
     /**
@@ -64,12 +63,11 @@ final class FuncController extends BaseController
     /**
      * @param array     $args
      */
-    public function addBlockIp(Request $request, Response $response, array $args)
+    public function addBlockIp(Request $request, Response $response, array $args): ResponseInterface
     {
-        $res = [
+        return $response->withJson([
             'ret' => 1,
             'data' => 'ok',
-        ];
-        return $response->withJson($res);
+        ]);
     }
 }

+ 10 - 7
src/Controllers/WebAPI/NodeController.php

@@ -17,7 +17,7 @@ final class NodeController extends BaseController
     /**
      * @param array     $args
      */
-    public function saveReport(Request $request, Response $response, array $args): void
+    public function saveReport(Request $request, Response $response, array $args): ResponseInterface
     {
         $node_id = $request->getParam('node_id');
         $content = $request->getParam('content');
@@ -27,19 +27,22 @@ final class NodeController extends BaseController
         $report->result = \json_encode($result);
         $report->created_at = \time();
         $report->save();
-        die('ok');
+
+        return $response->withJson([
+            'ret' => 1,
+            'data' => 'ok',
+        ]);
     }
 
     /**
      * @param array     $args
      */
-    public function info(Request $request, Response $response, array $args)
+    public function info(Request $request, Response $response, array $args): ResponseInterface
     {
-        $res = [
+        return $response->withJson([
             'ret' => 1,
             'data' => 'ok',
-        ];
-        return $response->withJson($res);
+        ]);
     }
 
     /**
@@ -85,7 +88,7 @@ final class NodeController extends BaseController
      */
     public function getAllInfo(Request $request, Response $response, array $args): ResponseInterface
     {
-        return ResponseHelper::etagJson($request, $response, [
+        return $response->withJson([
             'ret' => 1,
             'data' => [],
         ]);

+ 4 - 4
src/Controllers/WebAPI/UserController.php

@@ -28,7 +28,7 @@ final class UserController extends BaseController
      *
      * @return ResponseInterface
      */
-    public function index($request, $response, $args): ResponseInterface
+    public function index(Request $request, Response $response, array $args): ResponseInterface
     {
         $node_id = $request->getQueryParam('node_id');
         $node = Node::find($node_id);
@@ -101,7 +101,7 @@ final class UserController extends BaseController
      *
      * @return ResponseInterface
      */
-    public function addTraffic($request, $response, $args)
+    public function addTraffic(Request $request, Response $response, array $args): ResponseInterface
     {
         $data = \json_decode($request->getBody()->__toString());
         if (!$data || !\is_array($data?->data)) {
@@ -155,7 +155,7 @@ final class UserController extends BaseController
      *
      * @return ResponseInterface
      */
-    public function addAliveIp($request, $response, $args)
+    public function addAliveIp(Request $request, Response $response, array $args): ResponseInterface
     {
         $data = \json_decode($request->getBody()->__toString());
         if (!$data || !\is_array($data?->data)) {
@@ -200,7 +200,7 @@ final class UserController extends BaseController
      *
      * @return ResponseInterface
      */
-    public function addDetectLog($request, $response, $args)
+    public function addDetectLog(Request $request, Response $response, array $args): ResponseInterface
     {
         $data = \json_decode($request->getBody()->__toString());
         if (!$data || !\is_array($data?->data)) {