From 98711549fb2536d8cc9ff2e47af861ad11c10716 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 14 Aug 2021 17:33:58 +0300 Subject: [PATCH] feat(endpoints): code styles and format updates #565 --- src/flextype/core/Endpoints/Api.php | 46 ++++++++++++++---------- src/flextype/core/Endpoints/Content.php | 11 +++--- src/flextype/core/Endpoints/Images.php | 6 +++- src/flextype/core/Endpoints/Media.php | 12 +++---- src/flextype/core/Endpoints/Registry.php | 2 -- src/flextype/core/Endpoints/Tokens.php | 12 +++---- src/flextype/core/Endpoints/Utils.php | 4 +-- 7 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/flextype/core/Endpoints/Api.php b/src/flextype/core/Endpoints/Api.php index ce63bd8e..80c574e2 100644 --- a/src/flextype/core/Endpoints/Api.php +++ b/src/flextype/core/Endpoints/Api.php @@ -10,14 +10,18 @@ declare(strict_types=1); namespace Flextype\Endpoints; use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\ServerRequestInterface; -use Slim\Psr7\Response; +use function array_keys; +use function array_merge; use function count; +use function in_array; +use function is_string; +use function password_verify; use function registry; use function serializers; +use function tokens; -class Api +class Api { /** * Status code messages. @@ -29,17 +33,17 @@ class Api 400 => [ 'title' => 'Bad Request', 'message' => 'Validation for this particular item failed', - 'http_status_code' => 400 + 'http_status_code' => 400, ], 401 => [ 'title' => 'Unauthorized', 'message' => 'Token is wrong', - 'http_status_code' => 401 + 'http_status_code' => 401, ], 404 => [ 'title' => 'Not Found', 'message' => 'Not Found', - 'http_status_code' => 404 + 'http_status_code' => 404, ], ]; @@ -55,18 +59,18 @@ class Api return $this->statusCodeMessages[$status]; } - /** + /** * Validate Api Request. */ public function validateApiRequest(array $options) { if (! isset($options['api']) && ! is_string($options['api'])) { return $this->getStatusCodeMessage(400); - } + } if (! isset($options['request'])) { return $this->getStatusCodeMessage(400); - } + } if (! isset($options['params'])) { return $this->getStatusCodeMessage(400); @@ -79,9 +83,11 @@ class Api $dataTest = true; foreach ($options['params'] as $key => $value) { - if (! in_array($value, array_keys($data))) { - $dataTest = false; + if (in_array($value, array_keys($data))) { + continue; } + + $dataTest = false; } if (! $dataTest) { @@ -90,7 +96,7 @@ class Api // Check is api enabled if (! registry()->get('flextype.settings.api.' . $options['api'] . '.enabled')) { - return $this->getStatusCodeMessage(400); + return $this->getStatusCodeMessage(400); } if (! tokens()->has($data['token'])) { @@ -100,11 +106,13 @@ class Api // Fetch token $tokenData = tokens()->fetch($data['token']); - if (! isset($tokenData['state']) || - ! isset($tokenData['limit_calls']) || - ! isset($tokenData['calls'])) { + if ( + ! isset($tokenData['state']) || + ! isset($tokenData['limit_calls']) || + ! isset($tokenData['calls']) + ) { return $this->getStatusCodeMessage(400); - } + } if ( $tokenData['state'] === 'disabled' || @@ -132,12 +140,12 @@ class Api /** * Get API response. * - * @param array $body Response body. - * @param int $status Status code. + * @param array $body Response body. + * @param int $status Status code. * * @return ResponseInterface Response. */ - public function getApiResponse($response, array $body = [], int $status = 200) + public function getApiResponse($response, array $body = [], int $status = 200): ResponseInterface { if (count($body) > 0) { $response->getBody()->write(serializers()->json()->encode($body)); diff --git a/src/flextype/core/Endpoints/Content.php b/src/flextype/core/Endpoints/Content.php index 51a9f538..86462109 100644 --- a/src/flextype/core/Endpoints/Content.php +++ b/src/flextype/core/Endpoints/Content.php @@ -14,9 +14,6 @@ use Psr\Http\Message\ServerRequestInterface; use function content; use function count; -use function password_verify; -use function registry; -use function tokens; class Content extends Api { @@ -50,7 +47,7 @@ class Content extends Api if (count($contentData) > 0) { return $this->getApiResponse($response, $contentData, 200); } - + return $this->getApiResponse($response, $this->getStatusCodeMessage(404), 404); } @@ -66,7 +63,7 @@ class Content extends Api { // Get Request Parsed Body $requestParsedBody = $request->getParsedBody(); - + // Validate Api Request if ( count($result = $this->validateApiRequest([ @@ -104,7 +101,7 @@ class Content extends Api { // Get Request Parsed Body $requestParsedBody = $request->getParsedBody(); - + // Validate Api Request if ( count($result = $this->validateApiRequest([ @@ -142,7 +139,7 @@ class Content extends Api { // Get Request Parsed Body $requestParsedBody = $request->getParsedBody(); - + // Validate Api Request if ( count($result = $this->validateApiRequest([ diff --git a/src/flextype/core/Endpoints/Images.php b/src/flextype/core/Endpoints/Images.php index 0ec86bbb..b9f0820f 100644 --- a/src/flextype/core/Endpoints/Images.php +++ b/src/flextype/core/Endpoints/Images.php @@ -12,6 +12,10 @@ namespace Flextype\Endpoints; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use function container; +use function count; +use function filesystem; + class Images extends Api { /** @@ -35,7 +39,7 @@ class Images extends Api ) { return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']); } - + // Check is file exists if (! filesystem()->file(PATH['project'] . '/uploads/' . $path)->exists()) { return $this->getApiResponse($response, $this->getStatusCodeMessage(404), 404); diff --git a/src/flextype/core/Endpoints/Media.php b/src/flextype/core/Endpoints/Media.php index 7c41639e..01492205 100644 --- a/src/flextype/core/Endpoints/Media.php +++ b/src/flextype/core/Endpoints/Media.php @@ -12,10 +12,8 @@ namespace Flextype\Endpoints; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; -use function media; use function count; -use function password_verify; -use function registry; +use function media; class Media extends Api { @@ -49,7 +47,7 @@ class Media extends Api if (count($contentData) > 0) { return $this->getApiResponse($response, $contentData, 200); } - + return $this->getApiResponse($response, $this->getStatusCodeMessage(404), 404); } @@ -65,7 +63,7 @@ class Media extends Api { // Get Request Parsed Body $requestParsedBody = $request->getParsedBody(); - + // Validate Api Request if ( count($result = $this->validateApiRequest([ @@ -103,7 +101,7 @@ class Media extends Api { // Get Request Parsed Body $requestParsedBody = $request->getParsedBody(); - + // Validate Api Request if ( count($result = $this->validateApiRequest([ @@ -141,7 +139,7 @@ class Media extends Api { // Get Request Parsed Body $requestParsedBody = $request->getParsedBody(); - + // Validate Api Request if ( count($result = $this->validateApiRequest([ diff --git a/src/flextype/core/Endpoints/Registry.php b/src/flextype/core/Endpoints/Registry.php index db527924..90f37255 100644 --- a/src/flextype/core/Endpoints/Registry.php +++ b/src/flextype/core/Endpoints/Registry.php @@ -13,9 +13,7 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use function count; -use function password_verify; use function registry; -use function tokens; class Registry extends Api { diff --git a/src/flextype/core/Endpoints/Tokens.php b/src/flextype/core/Endpoints/Tokens.php index 0bfefa0d..85aeb258 100644 --- a/src/flextype/core/Endpoints/Tokens.php +++ b/src/flextype/core/Endpoints/Tokens.php @@ -12,10 +12,8 @@ namespace Flextype\Endpoints; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; -use function tokens; use function count; -use function password_verify; -use function registry; +use function tokens; class Tokens extends Api { @@ -49,7 +47,7 @@ class Tokens extends Api if (count($contentData) > 0) { return $this->getApiResponse($response, $contentData, 200); } - + return $this->getApiResponse($response, $this->getStatusCodeMessage(404), 404); } @@ -65,7 +63,7 @@ class Tokens extends Api { // Get Request Parsed Body $requestParsedBody = $request->getParsedBody(); - + // Validate Api Request if ( count($result = $this->validateApiRequest([ @@ -103,7 +101,7 @@ class Tokens extends Api { // Get Request Parsed Body $requestParsedBody = $request->getParsedBody(); - + // Validate Api Request if ( count($result = $this->validateApiRequest([ @@ -141,7 +139,7 @@ class Tokens extends Api { // Get Request Parsed Body $requestParsedBody = $request->getParsedBody(); - + // Validate Api Request if ( count($result = $this->validateApiRequest([ diff --git a/src/flextype/core/Endpoints/Utils.php b/src/flextype/core/Endpoints/Utils.php index d994fa39..ec9fd3af 100644 --- a/src/flextype/core/Endpoints/Utils.php +++ b/src/flextype/core/Endpoints/Utils.php @@ -12,10 +12,8 @@ namespace Flextype\Endpoints; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use function count; use function filesystem; -use function password_verify; -use function registry; -use function tokens; class Utils extends Api {