From d4652d09fe5d8179c166c69dd9ebb90d0821437f Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 18 Sep 2024 17:55:30 +0000 Subject: [PATCH] chore: linter --- app/controllers/api/account.php | 2 +- app/controllers/api/functions.php | 12 ++++++------ app/controllers/api/users.php | 6 +++--- app/controllers/api/vcs.php | 2 +- app/controllers/shared/api.php | 6 +++--- app/init.php | 4 ++-- src/Appwrite/Extend/Exception.php | 2 +- src/Appwrite/Platform/Workers/Builds.php | 4 ++-- src/Appwrite/Platform/Workers/Messaging.php | 2 +- src/Appwrite/Specification/Format/Swagger2.php | 2 +- src/Appwrite/Utopia/Response/Filters/V18.php | 4 ++-- src/Executor/Executor.php | 2 +- tests/e2e/Services/Functions/FunctionsBase.php | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index b69d16f6f6..803d2a2121 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -389,7 +389,7 @@ App::post('/v1/account') $existingTarget = $dbForProject->findOne('targets', [ Query::equal('identifier', [$email]), ]); - if($existingTarget) { + if ($existingTarget) { $user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND); } } diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php index 3e61810ca2..5e66432cf3 100644 --- a/app/controllers/api/functions.php +++ b/app/controllers/api/functions.php @@ -287,7 +287,7 @@ App::post('/v1/functions') if (!empty($providerRepositoryId)) { // Deploy VCS $redeployVcs($request, $function, $project, $installation, $dbForProject, $queueForBuilds, $template, $github); - } elseif(!$template->isEmpty()) { + } elseif (!$template->isEmpty()) { // Deploy non-VCS from template $deploymentId = ID::unique(); $deployment = $dbForProject->createDocument('deployments', new Document([ @@ -1512,7 +1512,7 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/build') } $path = $deployment->getAttribute('path'); - if(empty($path) || !$deviceForFunctions->exists($path)) { + if (empty($path) || !$deviceForFunctions->exists($path)) { throw new Exception(Exception::DEPLOYMENT_NOT_FOUND); } @@ -1657,7 +1657,7 @@ App::post('/v1/functions/:functionId/executions') ->inject('geodb') ->action(function (string $functionId, string $body, bool $async, string $path, string $method, mixed $headers, ?string $scheduledAt, Response $response, Request $request, Document $project, Database $dbForProject, Database $dbForConsole, Document $user, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb) { - if(!$async && !is_null($scheduledAt)) { + if (!$async && !is_null($scheduledAt)) { throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Scheduled executions must run asynchronously. Set scheduledAt to a future date, or set async to true.'); } @@ -1789,7 +1789,7 @@ App::post('/v1/functions/:functionId/executions') $status = $async ? 'waiting' : 'processing'; - if(!is_null($scheduledAt)) { + if (!is_null($scheduledAt)) { $status = 'scheduled'; } @@ -1819,7 +1819,7 @@ App::post('/v1/functions/:functionId/executions') ->setContext('function', $function); if ($async) { - if(is_null($scheduledAt)) { + if (is_null($scheduledAt)) { $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', $execution)); $queueForFunctions ->setType('http') @@ -1994,7 +1994,7 @@ App::post('/v1/functions/:functionId/executions') $acceptTypes = \explode(', ', $request->getHeader('accept')); foreach ($acceptTypes as $acceptType) { - if(\str_starts_with($acceptType, 'application/json') || \str_starts_with($acceptType, 'application/*')) { + if (\str_starts_with($acceptType, 'application/json') || \str_starts_with($acceptType, 'application/*')) { $response->setContentType(Response::CONTENT_TYPE_JSON); break; } elseif (\str_starts_with($acceptType, 'multipart/form-data') || \str_starts_with($acceptType, 'multipart/*')) { diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index 78988f525b..081e6a85bd 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -140,7 +140,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e $existingTarget = $dbForProject->findOne('targets', [ Query::equal('identifier', [$email]), ]); - if($existingTarget) { + if ($existingTarget) { $user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND); } } @@ -164,7 +164,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e $existingTarget = $dbForProject->findOne('targets', [ Query::equal('identifier', [$phone]), ]); - if($existingTarget) { + if ($existingTarget) { $user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND); } } @@ -2124,7 +2124,7 @@ App::post('/v1/users/:userId/jwts') $sessions = $user->getAttribute('sessions', []); $session = new Document(); - if($sessionId === 'recent') { + if ($sessionId === 'recent') { // Get most recent $session = \count($sessions) > 0 ? $sessions[\count($sessions) - 1] : new Document(); } else { diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php index 299e2836f7..9610f44ace 100644 --- a/app/controllers/api/vcs.php +++ b/app/controllers/api/vcs.php @@ -509,7 +509,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro $vcsContents = []; foreach ($contents as $content) { $isDirectory = false; - if($content['type'] === GitHub::CONTENTS_DIRECTORY) { + if ($content['type'] === GitHub::CONTENTS_DIRECTORY) { $isDirectory = true; } diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 81665a9a16..d7ca7400b6 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -207,14 +207,14 @@ App::init() } // Remove after migration - if(!\str_contains($apiKey, '_')) { + if (!\str_contains($apiKey, '_')) { $keyType = API_KEY_STANDARD; $authKey = $apiKey; } else { [ $keyType, $authKey ] = \explode('_', $apiKey, 2); } - if($keyType === API_KEY_DYNAMIC) { + if ($keyType === API_KEY_DYNAMIC) { // Dynamic key $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0); @@ -244,7 +244,7 @@ App::init() Authorization::setRole(Auth::USER_ROLE_APPS); Authorization::setDefaultStatus(false); // Cancel security segmentation for API keys. } - } elseif($keyType === API_KEY_STANDARD) { + } elseif ($keyType === API_KEY_STANDARD) { // No underline means no prefix. Backwards compatibility. // Regular key diff --git a/app/init.php b/app/init.php index 3d2cacd82b..15f0f50b5a 100644 --- a/app/init.php +++ b/app/init.php @@ -785,7 +785,7 @@ $register->set('logger', function () { $adapter = null; } - if($adapter === null) { + if ($adapter === null) { Console::error("Logging provider not supported. Logging is disabled"); return; } @@ -1261,7 +1261,7 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons } $jwtSessionId = $payload['sessionId'] ?? ''; - if(!empty($jwtSessionId)) { + if (!empty($jwtSessionId)) { if (empty($user->find('$id', $jwtSessionId, 'sessions'))) { // Match JWT to active token $user = new Document([]); } diff --git a/src/Appwrite/Extend/Exception.php b/src/Appwrite/Extend/Exception.php index 884296ff67..e0cf8058c9 100644 --- a/src/Appwrite/Extend/Exception.php +++ b/src/Appwrite/Extend/Exception.php @@ -313,7 +313,7 @@ class Exception extends \Exception $this->code = $code ?? $this->errors[$type]['code']; // Mark string errors like HY001 from PDO as 500 errors - if(\is_string($this->code)) { + if (\is_string($this->code)) { if (\is_numeric($this->code)) { $this->code = (int) $this->code; } else { diff --git a/src/Appwrite/Platform/Workers/Builds.php b/src/Appwrite/Platform/Workers/Builds.php index c10640d2e3..c2fc2bc0dd 100644 --- a/src/Appwrite/Platform/Workers/Builds.php +++ b/src/Appwrite/Platform/Workers/Builds.php @@ -207,7 +207,7 @@ class Builds extends Action } try { - if($isNewBuild && !$isVcsEnabled) { + if ($isNewBuild && !$isVcsEnabled) { // Non-vcs+Template $templateRepositoryName = $template->getAttribute('repositoryName', ''); @@ -283,7 +283,7 @@ class Builds extends Action $cloneVersion = $branchName; $cloneType = GitHub::CLONE_TYPE_BRANCH; - if(!empty($commitHash)) { + if (!empty($commitHash)) { $cloneVersion = $commitHash; $cloneType = GitHub::CLONE_TYPE_COMMIT; } diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php index 6f642fabb7..0f0d298e3b 100644 --- a/src/Appwrite/Platform/Workers/Messaging.php +++ b/src/Appwrite/Platform/Workers/Messaging.php @@ -669,7 +669,7 @@ class Messaging extends Action private function getLocalDevice($project): Local { - if($this->localDevice === null) { + if ($this->localDevice === null) { $this->localDevice = new Local(APP_STORAGE_UPLOADS . '/app-' . $project->getId()); } diff --git a/src/Appwrite/Specification/Format/Swagger2.php b/src/Appwrite/Specification/Format/Swagger2.php index 1aeaedc6a5..1cc33088cd 100644 --- a/src/Appwrite/Specification/Format/Swagger2.php +++ b/src/Appwrite/Specification/Format/Swagger2.php @@ -287,7 +287,7 @@ class Swagger2 extends Format } $validatorClass = (!empty($validator)) ? \get_class($validator) : ''; - if($validatorClass === 'Utopia\Validator\AnyOf') { + if ($validatorClass === 'Utopia\Validator\AnyOf') { $validator = $param['validator']->getValidators()[0]; $validatorClass = \get_class($validator); } diff --git a/src/Appwrite/Utopia/Response/Filters/V18.php b/src/Appwrite/Utopia/Response/Filters/V18.php index 6485b6f0ba..1575249b3a 100644 --- a/src/Appwrite/Utopia/Response/Filters/V18.php +++ b/src/Appwrite/Utopia/Response/Filters/V18.php @@ -24,8 +24,8 @@ class V18 extends Filter protected function parseExecution(array $content) { - if(!empty($content['status']) && !empty($content['statusCode'])) { - if($content['status'] === 'completed' && $content['statusCode'] >= 400 && $content['statusCode'] < 500) { + if (!empty($content['status']) && !empty($content['statusCode'])) { + if ($content['status'] === 'completed' && $content['statusCode'] >= 400 && $content['statusCode'] < 500) { $content['status'] = 'failed'; } } diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php index bc94353fee..9dda9556b8 100644 --- a/src/Executor/Executor.php +++ b/src/Executor/Executor.php @@ -219,7 +219,7 @@ class Executor 'restartPolicy' => 'always' // Once utopia/orchestration has it, use DockerAPI::ALWAYS (0.13+) ]; - if(!empty($body)) { + if (!empty($body)) { $params['body'] = $body; } diff --git a/tests/e2e/Services/Functions/FunctionsBase.php b/tests/e2e/Services/Functions/FunctionsBase.php index abefb5c9a3..2d94b9f0e3 100644 --- a/tests/e2e/Services/Functions/FunctionsBase.php +++ b/tests/e2e/Services/Functions/FunctionsBase.php @@ -34,7 +34,7 @@ trait FunctionsBase \sleep(1); } - if($checkForSuccess) { + if ($checkForSuccess) { $this->assertEquals(200, $deployment['headers']['status-code']); $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body'])); }