Update handler response

pi-engine · Dec 15, 2024 · 31d0086 · 31d0086
1 parent 7ef5718
commit 31d0086
Show file tree

Hide file tree

Showing 43 changed files with 115 additions and 114 deletions.
diff --git a/src/Handler/Admin/Cache/DeleteHandler.php b/src/Handler/Admin/Cache/DeleteHandler.php
@@ -2,7 +2,8 @@
 
 namespace Pi\User\Handler\Admin\Cache;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\Core\Service\CacheService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -46,6 +47,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             ],
             'error'  => new \stdClass(),
         ];
-        return new JsonResponse($result);
+        return new EscapingJsonResponse($result);
     }
 }
diff --git a/src/Handler/Admin/Cache/ListHandler.php b/src/Handler/Admin/Cache/ListHandler.php
@@ -2,7 +2,7 @@
 
 namespace Pi\User\Handler\Admin\Cache;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\Core\Service\CacheService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -44,6 +44,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             ],
             'error'  => new \stdClass(),
         ];
-        return new JsonResponse($result);
+        return new EscapingJsonResponse($result);
     }
 }
diff --git a/src/Handler/Admin/Cache/PersistHandler.php b/src/Handler/Admin/Cache/PersistHandler.php
@@ -2,7 +2,7 @@
 
 namespace Pi\User\Handler\Admin\Cache;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\Core\Service\CacheService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -46,6 +46,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             ],
             'error'  => new \stdClass(),
         ];
-        return new JsonResponse($result);
+        return new EscapingJsonResponse($result);
     }
 }
diff --git a/src/Handler/Admin/Cache/ViewHandler.php b/src/Handler/Admin/Cache/ViewHandler.php
@@ -2,7 +2,7 @@
 
 namespace Pi\User\Handler\Admin\Cache;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\Core\Service\CacheService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -44,6 +44,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             'data'   => $item,
             'error'  => new \stdClass(),
         ];
-        return new JsonResponse($result);
+        return new EscapingJsonResponse($result);
     }
 }
diff --git a/src/Handler/Admin/Permission/Page/ListHandler.php b/src/Handler/Admin/Permission/Page/ListHandler.php
@@ -3,7 +3,7 @@
 namespace Pi\User\Handler\Admin\Permission\Page;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\PermissionService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -43,6 +43,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             'error'  => new \stdClass(),
         ];
 
-        return new JsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
+        return new EscapingJsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
     }
 }
diff --git a/src/Handler/Admin/Permission/Resource/ListHandler.php b/src/Handler/Admin/Permission/Resource/ListHandler.php
@@ -3,7 +3,7 @@
 namespace Pi\User\Handler\Admin\Permission\Resource;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\PermissionService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -43,6 +43,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             'error'  => new \stdClass(),
         ];
 
-        return new JsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
+        return new EscapingJsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
     }
 }
diff --git a/src/Handler/Admin/Permission/Role/ListHandler.php b/src/Handler/Admin/Permission/Role/ListHandler.php
@@ -3,7 +3,7 @@
 namespace Pi\User\Handler\Admin\Permission\Role;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\PermissionService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -43,6 +43,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             'error'  => new \stdClass(),
         ];
 
-        return new JsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
+        return new EscapingJsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
     }
 }
diff --git a/src/Handler/Admin/Profile/AddHandler.php b/src/Handler/Admin/Profile/AddHandler.php
@@ -2,7 +2,7 @@
 
 namespace Pi\User\Handler\Admin\Profile;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\AccountService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -39,10 +39,10 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         if (isset($result['id']) && !empty($result)) {
             $this->accountService->addRoleAccountByAdmin($requestBody, $result, $operator);
         } else {
-            return new JsonResponse($result);
+            return new EscapingJsonResponse($result);
         }
 
-        return new JsonResponse(
+        return new EscapingJsonResponse(
             [
                 'result' => true,
                 'data'   => $result,

diff --git a/src/Handler/Admin/Profile/CleanHandler.php b/src/Handler/Admin/Profile/CleanHandler.php
@@ -3,7 +3,7 @@
 namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\AccountService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -47,6 +47,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             'error'  => [],
         ];
 
-        return new JsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
+        return new EscapingJsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
     }
 }
diff --git a/src/Handler/Admin/Profile/DeleteHandler.php b/src/Handler/Admin/Profile/DeleteHandler.php
@@ -3,7 +3,7 @@
 namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\AccountService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -38,6 +38,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $operator    = $request->getAttribute('account');
         $result      = $this->accountService->deleteUserByAdmin($requestBody, $operator);
 
-        return new JsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
+        return new EscapingJsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
     }
 }
diff --git a/src/Handler/Admin/Profile/EditHandler.php b/src/Handler/Admin/Profile/EditHandler.php
@@ -2,7 +2,7 @@
 
 namespace Pi\User\Handler\Admin\Profile;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\AccountService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -47,7 +47,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $this->accountService->updateAccountRoles($requestBody['roles'], $updatedAccount, 'all', $operator);
         }
 
-        return new JsonResponse(
+        return new EscapingJsonResponse(
             [
                 'result' => true,
                 'data'   => $updatedAccount,

diff --git a/src/Handler/Admin/Profile/ExportHandler.php b/src/Handler/Admin/Profile/ExportHandler.php
@@ -3,7 +3,7 @@
 namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\Media\Service\MediaService;
 use Pi\User\Service\AccountService;
 use Pi\User\Service\ExportService;
@@ -51,6 +51,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $account = $this->accountService->getAccountList($params);
         $export  = $this->exportService->exportData($account);
         $result  = $this->mediaService->streamFile($export);
-        return new JsonResponse($result, StatusCodeInterface::STATUS_OK);
+        return new EscapingJsonResponse($result, StatusCodeInterface::STATUS_OK);
     }
 }
diff --git a/src/Handler/Admin/Profile/ListHandler.php b/src/Handler/Admin/Profile/ListHandler.php
@@ -2,7 +2,7 @@
 
 namespace Pi\User\Handler\Admin\Profile;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\AccountService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -36,7 +36,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $requestBody = $request->getParsedBody();
         $result      = $this->accountService->getAccountProfileList($requestBody);
 
-        return new JsonResponse(
+        return new EscapingJsonResponse(
             [
                 'result' => true,
                 'data'   => $result,

diff --git a/src/Handler/Admin/Profile/PasswordHandler.php b/src/Handler/Admin/Profile/PasswordHandler.php
@@ -3,13 +3,13 @@
 namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
+use Pi\User\Service\AccountService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Pi\User\Service\AccountService;
 
 class PasswordHandler implements RequestHandlerInterface
 {
@@ -37,6 +37,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $requestBody = $request->getParsedBody();
         $operator    = $request->getAttribute('account');
         $result      = $this->accountService->updatePasswordByAdmin($requestBody, $operator);
-        return new JsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
+        return new EscapingJsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
     }
 }
diff --git a/src/Handler/Admin/Profile/StatusHandler.php b/src/Handler/Admin/Profile/StatusHandler.php
@@ -3,13 +3,13 @@
 namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
+use Pi\User\Service\AccountService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Pi\User\Service\AccountService;
 
 class StatusHandler implements RequestHandlerInterface
 {
@@ -38,6 +38,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $operator    = $request->getAttribute('account');
         $result      = $this->accountService->updateStatusByAdmin($requestBody, $operator);
 
-        return new JsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
+        return new EscapingJsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
     }
 }
diff --git a/src/Handler/Admin/Profile/ViewHandler.php b/src/Handler/Admin/Profile/ViewHandler.php
@@ -3,13 +3,13 @@
 namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
+use Pi\User\Service\AccountService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Pi\User\Service\AccountService;
 
 class ViewHandler implements RequestHandlerInterface
 {
@@ -46,6 +46,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             'error'  => [],
         ];
 
-        return new JsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
+        return new EscapingJsonResponse($result, $result['status'] ?? StatusCodeInterface::STATUS_OK);
     }
 }
diff --git a/src/Handler/Admin/Role/AddHandler.php b/src/Handler/Admin/Role/AddHandler.php
@@ -2,7 +2,7 @@
 
 namespace Pi\User\Handler\Admin\Role;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\RoleService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -53,7 +53,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
 
         if ($isDuplicate || !isset($requestBody['name']) || empty($requestBody['name'])) {
-            return new JsonResponse(
+            return new EscapingJsonResponse(
                 [
                     'result' => false,
                     'data'   => new stdClass(),
@@ -68,7 +68,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         // Add role
         $result = $this->roleService->addRoleResource($requestBody, $operator);
 
-        return new JsonResponse(
+        return new EscapingJsonResponse(
             [
                 'result' => true,
                 'data'   => $result,

diff --git a/src/Handler/Admin/Role/DeleteHandler.php b/src/Handler/Admin/Role/DeleteHandler.php
@@ -2,7 +2,7 @@
 
 namespace Pi\User\Handler\Admin\Role;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\RoleService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -40,7 +40,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         // Delete
         $this->roleService->deleteRoleResource($requestBody, $operator);
 
-        return new JsonResponse(
+        return new EscapingJsonResponse(
             [
                 'result' => true,
                 'data'   => new stdClass(),

diff --git a/src/Handler/Admin/Role/EditHandler.php b/src/Handler/Admin/Role/EditHandler.php
@@ -2,7 +2,7 @@
 
 namespace Pi\User\Handler\Admin\Role;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\RoleService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -40,7 +40,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         // Update
         $this->roleService->updateRoleResource($requestBody, $operator);
 
-        return new JsonResponse(
+        return new EscapingJsonResponse(
             [
                 'result' => true,
                 'data'   => new stdClass(),

diff --git a/src/Handler/Admin/Role/ListHandler.php b/src/Handler/Admin/Role/ListHandler.php
@@ -2,7 +2,7 @@
 
 namespace Pi\User\Handler\Admin\Role;
 
-use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Response\EscapingJsonResponse;
 use Pi\User\Service\RoleService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -49,6 +49,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             ],
             'error'  => new \stdClass(),
         ];
-        return new JsonResponse($result);
+        return new EscapingJsonResponse($result);
     }
 }