*/
public function headers(string $origin): array
{
diff --git a/src/Appwrite/OpenSSL/OpenSSL.php b/src/Appwrite/OpenSSL/OpenSSL.php
index 1965a3c858..787feb0904 100644
--- a/src/Appwrite/OpenSSL/OpenSSL.php
+++ b/src/Appwrite/OpenSSL/OpenSSL.php
@@ -18,7 +18,7 @@ class OpenSSL
*
* @return string
*/
- public static function encrypt($data, $method, $key, $options = 0, $iv = '', &$tag = null, $aad = '', $tag_length = 16)
+ public static function encrypt($data, $method, $key, $options = 0, $iv = '', ?string &$tag = null, $aad = '', $tag_length = 16)
{
return \openssl_encrypt($data, $method, $key, $options, $iv, $tag, $aad, $tag_length);
}
diff --git a/src/Appwrite/Platform/Action.php b/src/Appwrite/Platform/Action.php
index 01ac92a45c..0aa0da7149 100644
--- a/src/Appwrite/Platform/Action.php
+++ b/src/Appwrite/Platform/Action.php
@@ -37,7 +37,7 @@ class Action extends UtopiaAction
* Foreach Document
* Call provided callback for each document in the collection
*
- * @param string $projectId
+ * @param Database $database
* @param string $collection
* @param array $queries
* @param callable $callback
diff --git a/src/Appwrite/Platform/Modules/Avatars/Http/Action.php b/src/Appwrite/Platform/Modules/Avatars/Http/Action.php
index bf7d01764f..d6b58b33dd 100644
--- a/src/Appwrite/Platform/Modules/Avatars/Http/Action.php
+++ b/src/Appwrite/Platform/Modules/Avatars/Http/Action.php
@@ -49,7 +49,6 @@ class Action extends PlatformAction
$image = new Image(\file_get_contents($path));
$image->crop((int) $width, (int) $height);
- $output = (empty($output)) ? $type : $output;
$data = $image->output($output, $quality);
$response
->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
diff --git a/src/Appwrite/Platform/Modules/Avatars/Http/Favicon/Get.php b/src/Appwrite/Platform/Modules/Avatars/Http/Favicon/Get.php
index 0a4d652d0e..b6cc408dde 100644
--- a/src/Appwrite/Platform/Modules/Avatars/Http/Favicon/Get.php
+++ b/src/Appwrite/Platform/Modules/Avatars/Http/Favicon/Get.php
@@ -204,7 +204,6 @@ class Get extends Action
$image = new Image($data);
$image->crop((int) $width, (int) $height);
- $output = (empty($output)) ? $type : $output;
$data = $image->output($output, $quality);
$response
diff --git a/src/Appwrite/Platform/Modules/Avatars/Http/Image/Get.php b/src/Appwrite/Platform/Modules/Avatars/Http/Image/Get.php
index eb56ddf0b2..77ff9dd8ce 100644
--- a/src/Appwrite/Platform/Modules/Avatars/Http/Image/Get.php
+++ b/src/Appwrite/Platform/Modules/Avatars/Http/Image/Get.php
@@ -95,7 +95,6 @@ class Get extends Action
}
$image->crop((int) $width, (int) $height);
- $output = (empty($output)) ? $type : $output;
$data = $image->output($output, $quality);
$response
diff --git a/src/Appwrite/Platform/Modules/Avatars/Http/Initials/Get.php b/src/Appwrite/Platform/Modules/Avatars/Http/Initials/Get.php
index 8278a43ea3..c73d20fb0c 100644
--- a/src/Appwrite/Platform/Modules/Avatars/Http/Initials/Get.php
+++ b/src/Appwrite/Platform/Modules/Avatars/Http/Initials/Get.php
@@ -90,7 +90,7 @@ class Get extends Action
}
}
- $rand = \substr($code, -1);
+ $rand = (int) \substr((string) $code, -1);
$rand = ($rand > \count($themes) - 1) ? $rand % \count($themes) : $rand;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Action.php
index b2417871ed..60449aeab6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Action.php
@@ -17,7 +17,7 @@ class Action extends AppwriteAction
return $this->context;
}
- public function setHttpPath(string $path): AppwriteAction
+ public function setHttpPath(string $path): self
{
if (\str_contains($path, '/tablesdb')) {
$this->context = DATABASE_TYPE_TABLESDB;
@@ -28,7 +28,8 @@ class Action extends AppwriteAction
if (\str_contains($path, '/vectorsdb')) {
$this->context = DATABASE_TYPE_VECTORSDB;
}
- return parent::setHttpPath($path);
+ parent::setHttpPath($path);
+ return $this;
}
/**
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
index 0bd4a2e080..91dd9c603c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
@@ -24,7 +24,7 @@ abstract class Action extends DatabasesAction
*/
abstract protected function getResponseModel(): string;
- public function setHttpPath(string $path): DatabasesAction
+ public function setHttpPath(string $path): self
{
if (str_contains($path, '/tablesdb/')) {
$this->context = ROWS;
@@ -47,7 +47,8 @@ abstract class Action extends DatabasesAction
],
];
- return parent::setHttpPath($path);
+ parent::setHttpPath($path);
+ return $this;
}
protected function getDatabasesOperationReadMetric(): string
@@ -406,8 +407,6 @@ abstract class Action extends DatabasesAction
if (\is_array($related)) {
$document->setAttribute($relationship->getAttribute('key'), \array_values($relations));
- } elseif (empty($relations)) {
- $document->setAttribute($relationship->getAttribute('key'), null);
}
}
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
index 7f2e895228..38c84c4ae1 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
@@ -209,7 +209,7 @@ class Create extends Action
throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk create is not supported for ' . $this->getSDKNamespace() . ' with relationship ' . $this->getStructureContext());
}
- $setPermissions = function (Document $document, ?array $permissions) use ($user, $isAPIKey, $isPrivilegedUser, $isBulk, $dbForProject, $authorization) {
+ $setPermissions = function (Document $document, ?array $permissions) use ($user, $isAPIKey, $isPrivilegedUser, $isBulk, $authorization) {
$allowedPermissions = [
Database::PERMISSION_READ,
Database::PERMISSION_UPDATE,
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
index 27ccaafc71..b86d934ffb 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
@@ -122,7 +122,6 @@ class Update extends Action
$dbForDatabases = $getDatabasesDB($database);
// Read permission should not be required for update
- /** @var Document $document */
$collectionTableId = 'database_' . $database->getSequence() . '_collection_' . $collection->getSequence();
if ($transactionId !== null) {
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
index 744a4fd922..b3046fe22d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
@@ -147,7 +147,7 @@ class XList extends Action
$cacheKeyBase = \sprintf(
'%s-cache-%s:%s:%s:collection:%s:%s:user:%s:%s',
$dbForProject->getCacheName(),
- $hostname ?? '',
+ $hostname,
$dbForProject->getNamespace(),
$dbForProject->getTenant(),
$collectionId,
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
index 5d9d425d71..1142f38aa9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
@@ -99,8 +99,6 @@ class Update extends Action
// Map aggregate permissions into the multiple permissions they represent.
$permissions = Permission::aggregate($permissions);
- $enabled ??= $collection->getAttribute('enabled', true);
-
$collection = $dbForProject->updateDocument(
'database_' . $database->getSequence(),
$collectionId,
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
index 0c0f5f1273..4763a1611d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
@@ -103,6 +103,9 @@ class XList extends Action
$os = $detector->getOS();
$client = $detector->getClient();
$device = $detector->getDevice();
+ $deviceName = \is_array($device) ? ($device['deviceName'] ?? '') : '';
+ $deviceBrand = \is_array($device) ? ($device['deviceBrand'] ?? '') : '';
+ $deviceModel = \is_array($device) ? ($device['deviceModel'] ?? '') : '';
$output[$i] = new Document([
'event' => $log['event'],
@@ -121,9 +124,9 @@ class XList extends Action
'clientVersion' => $client['clientVersion'],
'clientEngine' => $client['clientEngine'],
'clientEngineVersion' => $client['clientEngineVersion'],
- 'deviceName' => $device['deviceName'],
- 'deviceBrand' => $device['deviceBrand'],
- 'deviceModel' => $device['deviceModel'],
+ 'deviceName' => $deviceName,
+ 'deviceBrand' => $deviceBrand,
+ 'deviceModel' => $deviceModel,
]);
$record = $geodb->get($log['ip']);
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php
index f3edf010d4..91bc1a3ccf 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php
@@ -33,7 +33,7 @@ abstract class Action extends DatabasesAction
return $this->databaseType.'.'.METRIC_DATABASE_ID_OPERATIONS_WRITES;
}
- public function setHttpPath(string $path): DatabasesAction
+ public function setHttpPath(string $path): self
{
switch (true) {
case str_contains($path, '/tablesdb'):
@@ -50,7 +50,8 @@ abstract class Action extends DatabasesAction
$this->databaseType = VECTORSDB;
break;
}
- return parent::setHttpPath($path);
+ parent::setHttpPath($path);
+ return $this;
}
/**
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php
index 30c9b7cb30..f06feccdee 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php
@@ -239,7 +239,7 @@ class Create extends Action
}
}
- $transaction = $authorization->skip(fn () => $dbForProject->withTransaction(function () use ($dbForProject, $transactionId, $staged, $existing, $operations) {
+ $transaction = $authorization->skip(fn () => $dbForProject->withTransaction(function () use ($dbForProject, $transactionId, $staged, $operations) {
$dbForProject->createDocuments('transactionLogs', $staged);
return $dbForProject->increaseDocumentAttribute(
'transactions',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
index a5d96d5768..0c8c6a8520 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
@@ -105,8 +105,7 @@ class Update extends Action
* @throws Exception
* @throws \Throwable
* @throws \Utopia\Database\Exception
- * @throws Authorization
- * @throws Structure
+ * @throws StructureException
* @throws \Utopia\Http\Exception
*/
public function action(string $transactionId, bool $commit, bool $rollback, Document $project, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, User $user, TransactionState $transactionState, Delete $queueForDeletes, Event $queueForEvents, Context $usage, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, Authorization $authorization, EventProcessor $eventProcessor): void
@@ -183,7 +182,7 @@ class Update extends Action
$dbForDatabases = $getDatabasesDB($databaseDoc);
try {
- $dbForDatabases->withTransaction(function () use ($dbForDatabases, $dbForProject, $transactionState, $queueForDeletes, $transactionId, &$transaction, &$operations, &$totalOperations, &$databaseOperations, &$currentDocumentId, $queueForEvents, $usage, $queueForRealtime, $queueForFunctions, $queueForWebhooks, $authorization) {
+ $dbForDatabases->withTransaction(function () use ($dbForDatabases, $dbForProject, $transactionState, $queueForDeletes, $transactionId, &$transaction, &$operations, &$totalOperations, &$databaseOperations, &$currentDocumentId, $authorization) {
$authorization->skip(fn () => $dbForProject->updateDocument('transactions', $transactionId, new Document([
'status' => 'committing',
])));
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
index 6754179425..23541db146 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
@@ -97,6 +97,9 @@ class XList extends Action
$os = $detector->getOS();
$client = $detector->getClient();
$device = $detector->getDevice();
+ $deviceName = \is_array($device) ? ($device['deviceName'] ?? '') : '';
+ $deviceBrand = \is_array($device) ? ($device['deviceBrand'] ?? '') : '';
+ $deviceModel = \is_array($device) ? ($device['deviceModel'] ?? '') : '';
$output[$i] = new Document([
'event' => $log['event'],
@@ -115,9 +118,9 @@ class XList extends Action
'clientVersion' => $client['clientVersion'],
'clientEngine' => $client['clientEngine'],
'clientEngineVersion' => $client['clientEngineVersion'],
- 'deviceName' => $device['deviceName'],
- 'deviceBrand' => $device['deviceBrand'],
- 'deviceModel' => $device['deviceModel'],
+ 'deviceName' => $deviceName,
+ 'deviceBrand' => $deviceBrand,
+ 'deviceModel' => $deviceModel,
]);
$record = $geodb->get($log['ip']);
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php
index b85a8b30b4..58433c7deb 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php
@@ -130,9 +130,26 @@ class Create extends CollectionAction
$indexes[] = new Document($index);
}
try {
- // passing null in creates only creates the metadata collection
- if (!$dbForDatabases->exists(null, Database::METADATA)) {
- $dbForDatabases->create();
+ // Bootstrap the database metadata without a separate existence
+ // check to avoid races when multiple first collections are created
+ // concurrently for the same VectorsDB database.
+ for ($attempt = 0; $attempt < 5; $attempt++) {
+ try {
+ $dbForDatabases->create();
+ break;
+ } catch (DuplicateException) {
+ break;
+ } catch (\Throwable $e) {
+ if ($dbForDatabases->exists(null, Database::METADATA)) {
+ break;
+ }
+
+ if ($attempt === 4) {
+ throw $e;
+ }
+
+ \usleep(100_000);
+ }
}
$dbForDatabases->createCollection(
id: 'database_' . $database->getSequence() . '_collection_' . $collection->getSequence(),
diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Download/Get.php b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Download/Get.php
index e9c665ea4b..50c901e4c8 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Download/Get.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Download/Get.php
@@ -88,16 +88,11 @@ class Get extends Action
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
- switch ($type) {
- case 'output':
- $path = $deployment->getAttribute('buildPath', '');
- $device = $deviceForBuilds;
- break;
- case 'source':
- $path = $deployment->getAttribute('sourcePath', '');
- $device = $deviceForFunctions;
- break;
- }
+ [$path, $device] = match ($type) {
+ 'output' => [$deployment->getAttribute('buildPath', ''), $deviceForBuilds],
+ 'source' => [$deployment->getAttribute('sourcePath', ''), $deviceForFunctions],
+ default => throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid deployment download type.'),
+ };
if (!$device->exists($path)) {
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
index c6d25a15fc..37292ce984 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
@@ -213,7 +213,10 @@ class Create extends Base
$current = new Document();
foreach ($sessions as $session) {
- /** @var Utopia\Database\Document $session */
+ if (!$session instanceof Document) {
+ continue;
+ }
+
if ($proofForToken->verify($store->getProperty('secret', ''), $session->getAttribute('secret'))) { // Find most recent active session for user ID and JWT headers
$current = $session;
}
@@ -237,11 +240,11 @@ class Create extends Base
]);
$executionId = ID::unique();
- $headers['x-appwrite-execution-id'] = $executionId ?? '';
+ $headers['x-appwrite-execution-id'] = $executionId;
$headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
$headers['x-appwrite-trigger'] = 'http';
- $headers['x-appwrite-user-id'] = $user->getId() ?? '';
- $headers['x-appwrite-user-jwt'] = $jwt ?? '';
+ $headers['x-appwrite-user-id'] = $user->getId();
+ $headers['x-appwrite-user-jwt'] = $jwt;
$headers['x-appwrite-country-code'] = '';
$headers['x-appwrite-continent-code'] = '';
$headers['x-appwrite-continent-eu'] = 'false';
@@ -350,16 +353,18 @@ class Create extends Base
}
}
- $this->enqueueDeletes(
- $project,
- $function->getSequence(),
- $executionsRetentionCount,
+ if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
$queueForDeletes
- );
+ ->setProject($project)
+ ->setResource($function->getSequence())
+ ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
+ ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
+ ->trigger();
+ }
- return $response
- ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
- ->dynamic($execution, Response::MODEL_EXECUTION);
+ $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
+ $response->dynamic($execution, Response::MODEL_EXECUTION);
+ return;
}
$durationStart = \microtime(true);
@@ -370,7 +375,7 @@ class Create extends Base
if ($version === 'v2') {
$vars = \array_merge($vars, [
'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
- 'APPWRITE_FUNCTION_DATA' => $body ?? '',
+ 'APPWRITE_FUNCTION_DATA' => $body,
'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
]);
@@ -537,32 +542,18 @@ class Create extends Base
}
}
- $this->enqueueDeletes(
- $project,
- $function->getSequence(),
- $executionsRetentionCount,
+ if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
$queueForDeletes
- );
+ ->setProject($project)
+ ->setResource($function->getSequence())
+ ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
+ ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
+ ->trigger();
+ }
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($execution, Response::MODEL_EXECUTION);
}
- private function enqueueDeletes(
- Document $project,
- string $resourceId,
- int $executionsRetentionCount,
- DeleteEvent $queueForDeletes
- ): void {
- /* cleanup */
- if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
- $queueForDeletes
- ->setProject($project)
- ->setResource($resourceId)
- ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
- ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
- ->trigger();
- }
- }
}
diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
index d281c64414..8d4ad5d403 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
@@ -424,8 +424,8 @@ class Create extends Base
/** Trigger Realtime Events */
$queueForRealtime
- ->from($ruleCreate)
->setSubscribers(['console', $project->getId()])
+ ->from($ruleCreate)
->trigger();
}
}
diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php
index a627bae9dd..71fc99a30e 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php
@@ -170,8 +170,6 @@ class Update extends Base
$runtime = $function->getAttribute('runtime');
}
- $enabled ??= $function->getAttribute('enabled', true);
-
$repositoryId = $function->getAttribute('repositoryId', '');
$repositoryInternalId = $function->getAttribute('repositoryInternalId', '');
diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
index bcedeee764..c6c4a0b38c 100644
--- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
@@ -450,7 +450,7 @@ class Builds extends Action
$providerCommitHash = \trim($stdout);
- $deployment->setAttribute('providerCommitHash', $providerCommitHash ?? '');
+ $deployment->setAttribute('providerCommitHash', $providerCommitHash);
$deployment->setAttribute('providerCommitAuthorUrl', APP_VCS_GITHUB_URL);
$deployment->setAttribute('providerCommitAuthor', APP_VCS_GITHUB_USERNAME);
$deployment->setAttribute('providerCommitMessage', "Create '" . $resource->getAttribute('name', '') . "' function");
@@ -862,7 +862,7 @@ class Builds extends Action
if (\str_contains($logs, '{APPWRITE_DETECTION_SEPARATOR_START}')) {
[$logsBefore, $detectionLogsStart] = \explode('{APPWRITE_DETECTION_SEPARATOR_START}', $logs, 2);
[$detectionLogs, $logsAfter] = \explode('{APPWRITE_DETECTION_SEPARATOR_END}', $detectionLogsStart, 2);
- $logs = ($logsBefore ?? '') . ($logsAfter ?? '');
+ $logs = $logsBefore . $logsAfter;
}
$deployment->setAttribute('buildLogs', $logs);
@@ -1203,6 +1203,8 @@ class Builds extends Action
protected function sendUsage(Document $resource, Document $deployment, Document $project, Context $usage, UsagePublisher $publisherForUsage): void
{
$spec = Config::getParam('specifications')[$resource->getAttribute('buildSpecification', APP_COMPUTE_SPECIFICATION_DEFAULT)];
+ $cpus = (int) ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT);
+ $memory = (int) ($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT);
switch ($deployment->getAttribute('status')) {
case 'ready':
@@ -1364,6 +1366,8 @@ class Builds extends Action
Realtime $queueForRealtime,
array $platform
): void {
+ $deployment = new Document();
+
try {
if ($resource->getAttribute('providerSilentMode', false) === true) {
return;
@@ -1444,7 +1448,7 @@ class Builds extends Action
$protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
$previewUrl = match ($resource->getCollection()) {
'functions' => '',
- 'sites' => ! empty($rule) ? ("{$protocol}://" . $rule->getAttribute('domain', '')) : '',
+ 'sites' => !$rule->isEmpty() ? ("{$protocol}://" . $rule->getAttribute('domain', '')) : '',
default => throw new \Exception('Invalid resource type')
};
diff --git a/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php b/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php
index eb71e5a02f..9070962e7d 100644
--- a/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php
+++ b/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php
@@ -114,6 +114,9 @@ class Create extends Action
'passwordDictionary' => false,
'duration' => TOKEN_EXPIRATION_LOGIN_LONG,
'personalDataCheck' => false,
+ 'disposableEmails' => false,
+ 'canonicalEmails' => false,
+ 'freeEmails' => false,
'mockNumbers' => [],
'sessionAlerts' => false,
'membershipsUserName' => false,
diff --git a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php
index fb83cb34c5..8a0d341132 100644
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php
@@ -83,7 +83,8 @@ class Update extends Action
// If rule is already verified or in certificate generation state, don't queue for verification again
if ($rule->getAttribute('status') === RULE_STATUS_VERIFIED || $rule->getAttribute('status') === RULE_STATUS_CERTIFICATE_GENERATING) {
- return $response->dynamic($rule, Response::MODEL_PROXY_RULE);
+ $response->dynamic($rule, Response::MODEL_PROXY_RULE);
+ return;
}
try {
diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Download/Get.php b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Download/Get.php
index 600135e152..339d059365 100644
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Download/Get.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Download/Get.php
@@ -87,16 +87,11 @@ class Get extends Action
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
- switch ($type) {
- case 'output':
- $path = $deployment->getAttribute('buildPath', '');
- $device = $deviceForBuilds;
- break;
- case 'source':
- $path = $deployment->getAttribute('sourcePath', '');
- $device = $deviceForSites;
- break;
- }
+ [$path, $device] = match ($type) {
+ 'output' => [$deployment->getAttribute('buildPath', ''), $deviceForBuilds],
+ 'source' => [$deployment->getAttribute('sourcePath', ''), $deviceForSites],
+ default => throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid deployment download type.'),
+ };
if (!$device->exists($path)) {
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php
index 6510e505ae..dd9bedffb5 100644
--- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php
@@ -172,8 +172,6 @@ class Update extends Base
$framework = $site->getAttribute('framework');
}
- $enabled ??= $site->getAttribute('enabled', true);
-
$repositoryId = $site->getAttribute('repositoryId', '');
$repositoryInternalId = $site->getAttribute('repositoryInternalId', '');
diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php b/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php
index c67601dae9..c5f4f3dccd 100644
--- a/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php
+++ b/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php
@@ -286,6 +286,8 @@ class Create extends Action
$mimeType = $deviceForFiles->getFileMimeType($path); // Get mime-type before compression and encryption
$fileHash = $deviceForFiles->getFileHash($path); // Get file hash before compression and encryption
$data = '';
+ $iv = '';
+ $tag = null;
// Compression
$algorithm = $bucket->getAttribute('compression', Compression::NONE);
if ($fileSize <= APP_STORAGE_READ_BUFFER && $algorithm != Compression::NONE) {
diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Update.php b/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Update.php
index e4827a6354..406f8e4f49 100644
--- a/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Update.php
+++ b/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Update.php
@@ -99,12 +99,8 @@ class Update extends Action
$permissions ??= $bucket->getPermissions();
$maximumFileSize ??= $bucket->getAttribute('maximumFileSize', (int) System::getEnv('_APP_STORAGE_LIMIT', 0));
- $allowedFileExtensions ??= $bucket->getAttribute('allowedFileExtensions', []);
- $enabled ??= $bucket->getAttribute('enabled', true);
$encryption ??= $bucket->getAttribute('encryption', true);
- $antivirus ??= $bucket->getAttribute('antivirus', true);
$compression ??= $bucket->getAttribute('compression', Compression::NONE);
- $transformations ??= $bucket->getAttribute('transformations', true);
// Map aggregate permissions into the multiple permissions they represent.
$permissions = Permission::aggregate($permissions);
diff --git a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
index 777184f2f2..5edc69f445 100644
--- a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
+++ b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
@@ -102,6 +102,8 @@ class Create extends Action
{
$isAppUser = $user->isApp($authorization->getRoles());
$isPrivilegedUser = $user->isPrivileged($authorization->getRoles());
+ $invitee = new Document();
+ $hash = '';
if (empty($url)) {
if (! $isAppUser && ! $isPrivilegedUser) {
@@ -145,9 +147,6 @@ class Create extends Action
}
} elseif (! empty($phone)) {
$invitee = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
- if (! $invitee->isEmpty() && ! empty($email) && $invitee->getAttribute('email', '') !== $email) {
- throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given phone and email doesn\'t match', 409);
- }
}
if ($invitee->isEmpty()) { // Create new user if no user with same email found
@@ -169,14 +168,41 @@ class Create extends Action
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
}
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
+
try {
- $userId = ID::unique();
- $hash = $proofForPassword->hash($proofForPassword->generate());
- $emailCanonical = new Email($email);
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email);
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
}
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_FREE);
+ }
+
+ $hash = $proofForPassword->hash($proofForPassword->generate());
+
$userId = ID::unique();
$userDocument = new Document([
@@ -209,11 +235,11 @@ class Create extends Action
'tokens' => null,
'memberships' => null,
'search' => implode(' ', [$userId, $email, $name]),
- 'emailCanonical' => $emailCanonical?->getCanonical(),
- 'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
- 'emailIsCorporate' => $emailCanonical?->isCorporate(),
- 'emailIsDisposable' => $emailCanonical?->isDisposable(),
- 'emailIsFree' => $emailCanonical?->isFree(),
+ 'emailCanonical' => $emailMetadata['emailCanonical'],
+ 'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+ 'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+ 'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+ 'emailIsFree' => $emailMetadata['emailIsFree'],
]);
try {
diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php
index 4a34ffd36a..8b320535e9 100644
--- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php
+++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Authorize/External/Update.php
@@ -110,10 +110,7 @@ class Update extends Action
$providerRepositoryId = $repository->getAttribute('providerRepositoryId');
try {
- $providerRepositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
- if (empty($providerRepositoryName)) {
- throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
- }
+ $providerRepositoryName = $github->getRepositoryName($providerRepositoryId);
} catch (RepositoryNotFound $e) {
throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
}
diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Callback/Get.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Callback/Get.php
index 914bcaa93e..69da270e19 100644
--- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Callback/Get.php
+++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Callback/Get.php
@@ -65,6 +65,7 @@ class Get extends Action
}
$state = \json_decode($state, true);
+ $redirectFailure = $state['failure'] ?? '';
$projectId = $state['projectId'] ?? '';
$project = $dbForPlatform->getDocument('projects', $projectId);
@@ -74,10 +75,11 @@ class Get extends Action
if (!empty($redirectFailure)) {
$separator = \str_contains($redirectFailure, '?') ? '&' : ':';
- return $response
+ $response
->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
->addHeader('Pragma', 'no-cache')
->redirect($redirectFailure . $separator . \http_build_query(['error' => $error]));
+ return;
}
throw new Exception(Exception::PROJECT_NOT_FOUND, $error);
@@ -165,10 +167,11 @@ class Get extends Action
if (!empty($redirectFailure)) {
$separator = \str_contains($redirectFailure, '?') ? '&' : ':';
- return $response
+ $response
->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
->addHeader('Pragma', 'no-cache')
->redirect($redirectFailure . $separator . \http_build_query(['error' => $error]));
+ return;
}
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $error);
diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php
index 04e2dbd406..6e1db12c28 100644
--- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php
+++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php
@@ -49,6 +49,8 @@ trait Deployment
) {
$errors = [];
foreach ($repositories as $repository) {
+ $logBase = 'vcs.github.event.repo.unknown';
+
try {
$repositoryId = $repository->getId();
$projectId = $repository->getAttribute('projectId');
@@ -70,6 +72,8 @@ trait Deployment
throw new Exception(Exception::PROJECT_NOT_FOUND, 'Repository references non-existent project');
}
+ $this->beforeCreateGitDeployment($project, $repository, $dbForPlatform, $authorization);
+
try {
$dsn = new DSN($project->getAttribute('database'));
$databaseName = $dsn->getHost();
@@ -105,18 +109,11 @@ trait Deployment
$owner = $github->getOwnerName($providerInstallationId) ?? '';
try {
- $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
- if (empty($repositoryName)) {
- throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
- }
+ $repositoryName = $github->getRepositoryName($providerRepositoryId);
} catch (RepositoryNotFound $e) {
throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
}
- if (empty($repositoryName)) {
- throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
- }
-
$isAuthorized = !$external;
if (!$isAuthorized && !empty($providerPullRequestId)) {
@@ -289,10 +286,7 @@ trait Deployment
$providerRepositoryId = $repository->getAttribute('providerRepositoryId');
try {
- $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
- if (empty($repositoryName)) {
- throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
- }
+ $repositoryName = $github->getRepositoryName($providerRepositoryId);
} catch (RepositoryNotFound $e) {
throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
}
@@ -499,7 +493,7 @@ trait Deployment
$rule = $authorization->skip(fn () => $dbForPlatform->getDocument('rules', $previewRuleId));
$protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
- $previewUrl = !empty($rule) ? ("{$protocol}://" . $rule->getAttribute('domain', '')) : '';
+ $previewUrl = !$rule->isEmpty() ? ("{$protocol}://" . $rule->getAttribute('domain', '')) : '';
if (!empty($previewUrl)) {
$comment = new Comment($platform);
@@ -522,10 +516,7 @@ trait Deployment
$providerRepositoryId = $repository->getAttribute('providerRepositoryId');
try {
- $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
- if (empty($repositoryName)) {
- throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
- }
+ $repositoryName = $github->getRepositoryName($providerRepositoryId);
} catch (RepositoryNotFound $e) {
throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
}
@@ -561,6 +552,10 @@ trait Deployment
}
}
+ protected function beforeCreateGitDeployment(Document $project, Document $repository, Database $dbForPlatform, Authorization $authorization): void
+ {
+ }
+
protected function getBuildQueueName(Document $project, Database $dbForPlatform, Authorization $authorization): string
{
return System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME);
diff --git a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php
index a2fa44c613..e3dbcfa0e9 100644
--- a/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php
+++ b/src/Appwrite/Platform/Modules/VCS/Http/GitHub/Events/Create.php
@@ -83,7 +83,7 @@ class Create extends Action
default => null,
};
- return $response->json($parsedPayload);
+ $response->json($parsedPayload);
}
protected function preprocessEvent(Request $request)
diff --git a/src/Appwrite/Platform/Tasks/Doctor.php b/src/Appwrite/Platform/Tasks/Doctor.php
index 9a9c2fdf73..3eeaa95e64 100644
--- a/src/Appwrite/Platform/Tasks/Doctor.php
+++ b/src/Appwrite/Platform/Tasks/Doctor.php
@@ -4,7 +4,6 @@ namespace Appwrite\Platform\Tasks;
use Appwrite\ClamAV\Network;
use Appwrite\PubSub\Adapter\Pool as PubSubPool;
-use PHPMailer\PHPMailer\PHPMailer;
use Utopia\Cache\Adapter\Pool as CachePool;
use Utopia\Config\Config;
use Utopia\Console;
@@ -13,6 +12,8 @@ use Utopia\Domains\Domain;
use Utopia\DSN\DSN;
use Utopia\Http\Http;
use Utopia\Logger\Logger;
+use Utopia\Messaging\Adapter\Email as EmailAdapter;
+use Utopia\Messaging\Messages\Email as EmailMessage;
use Utopia\Platform\Action;
use Utopia\Pools\Group;
use Utopia\Queue\Broker\Pool as BrokerPool;
@@ -124,7 +125,7 @@ class Doctor extends Action
$providerConfig = System::getEnv('_APP_LOGGING_CONFIG', '');
try {
- $loggingProvider = new DSN($providerConfig ?? '');
+ $loggingProvider = new DSN($providerConfig);
$providerName = $loggingProvider->getScheme();
@@ -212,15 +213,18 @@ class Doctor extends Action
}
try {
- /* @var PHPMailer $mail */
- $mail = $register->get('smtp');
+ /** @var EmailAdapter $smtp */
+ $smtp = $register->get('smtp');
- $mail->addAddress('demo@example.com', 'Example.com');
- $mail->Subject = 'Test SMTP Connection';
- $mail->Body = 'Hello World';
- $mail->AltBody = 'Hello World';
+ $emailMessage = new EmailMessage(
+ to: ['demo@example.com'],
+ subject: 'Test SMTP Connection',
+ content: 'Hello World',
+ fromName: \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server')),
+ fromEmail: System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM),
+ );
- $mail->send();
+ $smtp->send($emailMessage);
Console::success('🟢 ' . str_pad("SMTP", 50, '.') . 'connected');
} catch (\Throwable) {
Console::error('🔴 ' . str_pad("SMTP", 47, '.') . 'disconnected');
diff --git a/src/Appwrite/Platform/Tasks/Install.php b/src/Appwrite/Platform/Tasks/Install.php
index 1be10f537f..dd7bed0137 100644
--- a/src/Appwrite/Platform/Tasks/Install.php
+++ b/src/Appwrite/Platform/Tasks/Install.php
@@ -227,7 +227,7 @@ class Install extends Action
// Fall back to CLI mode
$enableAssistant = false;
$assistantExistsInOldCompose = false;
- if ($existingInstallation && isset($compose)) {
+ if ($existingInstallation) {
try {
$assistantService = $compose->getService('appwrite-assistant');
$assistantExistsInOldCompose = $assistantService !== null;
@@ -1343,7 +1343,7 @@ class Install extends Action
{
$argv = $_SERVER['argv'] ?? [];
foreach ($argv as $arg) {
- if (\str_starts_with($arg, '--') && !\str_starts_with($arg, '--interactive')) {
+ if (\str_starts_with($arg, '--')) {
return true;
}
}
diff --git a/src/Appwrite/Platform/Tasks/SDKs.php b/src/Appwrite/Platform/Tasks/SDKs.php
index a36959af33..e8a69afddb 100644
--- a/src/Appwrite/Platform/Tasks/SDKs.php
+++ b/src/Appwrite/Platform/Tasks/SDKs.php
@@ -566,6 +566,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
$repoBranch = $language['repoBranch'] ?? 'main';
if ($git && !empty($gitUrl)) {
+ $prUrls = [];
+
// Generate commit message: use provided message, AI changelog, or fallback
if (! empty($message)) {
$commitMessage = $message;
diff --git a/src/Appwrite/Platform/Tasks/ScheduleFunctions.php b/src/Appwrite/Platform/Tasks/ScheduleFunctions.php
index 88725a190a..69f105652c 100644
--- a/src/Appwrite/Platform/Tasks/ScheduleFunctions.php
+++ b/src/Appwrite/Platform/Tasks/ScheduleFunctions.php
@@ -61,7 +61,7 @@ class ScheduleFunctions extends ScheduleBase
$nextDate = $cron->getNextRunDate();
$next = DateTime::format($nextDate);
- $currentTick = $next < $timeFrame;
+ $currentTick = $next <= $timeFrame;
if (!$currentTick) {
continue;
@@ -88,7 +88,7 @@ class ScheduleFunctions extends ScheduleBase
$scheduleKey = $delayConfig['key'];
// Ensure schedule was not deleted
if (!\array_key_exists($scheduleKey, $this->schedules)) {
- return;
+ continue;
}
$schedule = $this->schedules[$scheduleKey];
diff --git a/src/Appwrite/Platform/Tasks/StatsResources.php b/src/Appwrite/Platform/Tasks/StatsResources.php
index 6c0e8da48b..220e377619 100644
--- a/src/Appwrite/Platform/Tasks/StatsResources.php
+++ b/src/Appwrite/Platform/Tasks/StatsResources.php
@@ -60,7 +60,7 @@ class StatsResources extends Action
$interval = (int) System::getEnv('_APP_STATS_RESOURCES_INTERVAL', '3600');
- Console::loop(function () use ($queueForStatsResources, $dbForPlatform) {
+ Console::loop(function () use ($queueForStatsResources) {
$last24Hours = (new \DateTime())->sub(\DateInterval::createFromDateString('24 hours'));
/**
diff --git a/src/Appwrite/Platform/Tasks/Upgrade.php b/src/Appwrite/Platform/Tasks/Upgrade.php
index 6ef9c7134d..f49674896e 100644
--- a/src/Appwrite/Platform/Tasks/Upgrade.php
+++ b/src/Appwrite/Platform/Tasks/Upgrade.php
@@ -30,7 +30,7 @@ class Upgrade extends Install
->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
->param('no-start', false, new Boolean(true), 'Run an interactive session', true)
->param('database', 'mongodb', new Text(length: 0), 'Database to use (mongodb|mariadb|postgresql)', true)
- ->param('migrate', true, new Boolean(true), 'Run database migration after upgrade', true)
+ ->param('migrate', false, new Boolean(true), 'Run database migration after upgrade', true)
->callback($this->action(...));
}
@@ -42,7 +42,7 @@ class Upgrade extends Install
string $interactive,
bool $noStart,
string $database,
- bool $migrate = true,
+ bool $migrate = false,
): void {
$this->isUpgrade = true;
$this->migrate = $migrate;
diff --git a/src/Appwrite/Platform/Workers/Audits.php b/src/Appwrite/Platform/Workers/Audits.php
index 55ec39026b..6bcc85bc36 100644
--- a/src/Appwrite/Platform/Workers/Audits.php
+++ b/src/Appwrite/Platform/Workers/Audits.php
@@ -6,7 +6,6 @@ use Exception;
use Throwable;
use Utopia\Console;
use Utopia\Database\Document;
-use Utopia\Database\Exception\Authorization;
use Utopia\Database\Exception\Structure;
use Utopia\Platform\Action;
use Utopia\Queue\Message;
@@ -51,13 +50,11 @@ class Audits extends Action
/**
* @param Message $message
- * @param callable $getProjectDB
* @param Document $project
- * @param callable $getAudit
+ * @param callable(Document): \Utopia\Audit\Audit $getAudit
* @return Commit|NoCommit
* @throws Throwable
* @throws \Utopia\Database\Exception
- * @throws Authorization
* @throws Structure
*/
public function action(Message $message, Document $project, callable $getAudit): Commit|NoCommit
diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index 716969e67a..c420444112 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -24,7 +24,6 @@ use Utopia\Database\Exception\Conflict;
use Utopia\Database\Exception\Restricted;
use Utopia\Database\Exception\Structure;
use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
use Utopia\DSN\DSN;
use Utopia\Logger\Log;
use Utopia\Platform\Action;
@@ -363,7 +362,6 @@ class Deletes extends Action
/**
* @param Document $project
* @param callable $getProjectDB
- * @param Document $target
* @return void
* @throws Exception
*/
@@ -438,7 +436,6 @@ class Deletes extends Action
* @param string $resource
* @param string|null $resourceType
* @return void
- * @throws Authorization
* @throws Exception
*/
private function deleteCacheByResource(Document $project, callable $getProjectDB, string $resource, ?string $resourceType = null): void
@@ -518,7 +515,6 @@ class Deletes extends Action
}
/**
- * @param Database $dbForPlatform
* @param callable $getProjectDB
* @param string $hourlyUsageRetentionDatetime
* @return void
@@ -586,7 +582,6 @@ class Deletes extends Action
* @param Database $dbForPlatform
* @param Document $document
* @return void
- * @throws Authorization
* @throws DatabaseException
* @throws Conflict
* @throws Restricted
@@ -623,7 +618,6 @@ class Deletes extends Action
* @param Document $document
* @return void
* @throws Exception
- * @throws Authorization
* @throws DatabaseException
*/
protected function deleteProject(Database $dbForPlatform, callable $getProjectDB, callable $getDatabasesDB, Device $deviceForFiles, Device $deviceForSites, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, Document $document): void
@@ -952,7 +946,7 @@ class Deletes extends Action
// fast path, no need to list anything!
$delete($dbForProject, $resourceInternalId, $resourceType);
} else {
- $processResource = function (string $type) use ($dbForProject, $delete, $resourceType) {
+ $processResource = function (string $type) use ($dbForProject, $delete) {
$this->listByGroup(
collection: $type,
queries: [Query::select(['$id', '$sequence'])],
@@ -1109,7 +1103,7 @@ class Deletes extends Action
Query::equal('resourceInternalId', [$siteInternalId]),
Query::equal('resourceType', ['sites']),
Query::orderAsc()
- ], $dbForProject, function (Document $document) use ($project, $certificates, $deviceForSites, $deviceForBuilds, $deviceForFiles, $dbForPlatform, &$deploymentInternalIds) {
+ ], $dbForProject, function (Document $document) use ($deviceForSites, $deviceForBuilds, $deviceForFiles, $dbForPlatform, &$deploymentInternalIds, &$deploymentIds) {
$deploymentInternalIds[] = $document->getSequence();
$deploymentIds[] = $document->getId();
$this->deleteBuildFiles($deviceForBuilds, $document);
@@ -1172,7 +1166,7 @@ class Deletes extends Action
Query::equal('deploymentResourceInternalId', [$functionInternalId]),
Query::equal('projectInternalId', [$project->getSequence()]),
Query::orderAsc()
- ], $dbForPlatform, function (Document $document) use ($project, $dbForPlatform, $certificates) {
+ ], $dbForPlatform, function (Document $document) use ($dbForPlatform, $certificates) {
$this->deleteRule($dbForPlatform, $document, $certificates);
});
@@ -1196,7 +1190,7 @@ class Deletes extends Action
Query::equal('resourceInternalId', [$functionInternalId]),
Query::equal('resourceType', ['functions']),
Query::orderAsc()
- ], $dbForProject, function (Document $document) use ($dbForPlatform, $project, $certificates, $deviceForFunctions, $deviceForBuilds, &$deploymentInternalIds) {
+ ], $dbForProject, function (Document $document) use ($deviceForFunctions, $deviceForBuilds, &$deploymentInternalIds) {
$deploymentInternalIds[] = $document->getSequence();
$this->deleteDeploymentFiles($deviceForFunctions, $document);
$this->deleteBuildFiles($deviceForBuilds, $document);
@@ -1321,7 +1315,7 @@ class Deletes extends Action
/**
* @param Device $device
- * @param Document $build
+ * @param Document $deployment
* @return void
*/
private function deleteBuildFiles(Device $device, Document $deployment): void
@@ -1631,9 +1625,9 @@ class Deletes extends Action
try {
$dbForProject->deleteDocuments('transactions', [
Query::lessThan('expiresAt', DateTime::format(new \DateTime())),
- ], onNext: function (Document $transaction) use ($dbForProject, $project, &$transactionInternalIds) {
+ ], onNext: function (Document $transaction) use (&$transactionInternalIds) {
$transactionInternalIds[] = $transaction->getSequence();
- }, onError: function (Throwable $th) use ($project) {
+ }, onError: function (Throwable $th) {
// Swallow errors to avoid breaking the cleanup process
});
} catch (Throwable $th) {
@@ -1646,7 +1640,7 @@ class Deletes extends Action
$dbForProject->deleteDocuments('transactionLogs', [
Query::equal('transactionInternalId', $transactionInternalIds),
- ], onError: function (Throwable $th) use ($project) {
+ ], onError: function (Throwable $th) {
// Swallow errors to avoid breaking the cleanup process
});
}
diff --git a/src/Appwrite/Platform/Workers/Functions.php b/src/Appwrite/Platform/Workers/Functions.php
index 3f19abdf22..bed28dad1c 100644
--- a/src/Appwrite/Platform/Workers/Functions.php
+++ b/src/Appwrite/Platform/Workers/Functions.php
@@ -33,7 +33,7 @@ class Functions extends Action
}
/**
- * @throws Exception
+ * @throws \Exception
*/
public function __construct()
{
@@ -256,7 +256,7 @@ class Functions extends Action
* @param Document $user
* @param string|null $jwt
* @param string|null $event
- * @throws Exception
+ * @throws \Exception
*/
private function fail(
string $message,
@@ -271,10 +271,10 @@ class Functions extends Action
?string $event = null,
): void {
$executionId = ID::unique();
- $headers['x-appwrite-execution-id'] = $executionId ?? '';
+ $headers['x-appwrite-execution-id'] = $executionId;
$headers['x-appwrite-trigger'] = $trigger;
$headers['x-appwrite-event'] = $event ?? '';
- $headers['x-appwrite-user-id'] = $user->getId() ?? '';
+ $headers['x-appwrite-user-id'] = $user->getId();
$headers['x-appwrite-user-jwt'] = $jwt ?? '';
$headersFiltered = [];
@@ -458,8 +458,8 @@ class Functions extends Action
if ($version === 'v2') {
$vars = \array_merge($vars, [
'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
- 'APPWRITE_FUNCTION_DATA' => $body ?? '',
- 'APPWRITE_FUNCTION_EVENT_DATA' => $body ?? '',
+ 'APPWRITE_FUNCTION_DATA' => $body,
+ 'APPWRITE_FUNCTION_EVENT_DATA' => $body,
'APPWRITE_FUNCTION_EVENT' => $headers['x-appwrite-event'] ?? '',
'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
@@ -508,6 +508,9 @@ class Functions extends Action
]);
/** Execute function */
+ $error = null;
+ $errorCode = 0;
+
try {
$version = $function->getAttribute('version', 'v2');
$command = $runtime['startCommand'];
diff --git a/src/Appwrite/Platform/Workers/Mails.php b/src/Appwrite/Platform/Workers/Mails.php
index f144c58e1b..32de1e50d6 100644
--- a/src/Appwrite/Platform/Workers/Mails.php
+++ b/src/Appwrite/Platform/Workers/Mails.php
@@ -4,10 +4,13 @@ namespace Appwrite\Platform\Workers;
use Appwrite\Template\Template;
use Exception;
-use PHPMailer\PHPMailer\PHPMailer;
use Swoole\Runtime;
use Utopia\Database\Document;
use Utopia\Logger\Log;
+use Utopia\Messaging\Adapter\Email as EmailAdapter;
+use Utopia\Messaging\Adapter\Email\SMTP;
+use Utopia\Messaging\Messages\Email as EmailMessage;
+use Utopia\Messaging\Messages\Email\Attachment;
use Utopia\Platform\Action;
use Utopia\Queue\Message;
use Utopia\Registry\Registry;
@@ -49,9 +52,9 @@ class Mails extends Action
/**
* @param Message $message
+ * @param Document $project
* @param Registry $register
* @param Log $log
- * @throws \PHPMailer\PHPMailer\Exception
* @return void
* @throws Exception
*/
@@ -132,36 +135,38 @@ class Mails extends Action
// render() will return the subject in tags, so use strip_tags() to remove them
$subject = \strip_tags($subjectTemplate->render());
- /** @var PHPMailer $mail */
- $mail = empty($smtp)
+ /** @var EmailAdapter $adapter */
+ $adapter = empty($smtp)
? $register->get('smtp')
- : $this->getMailer($smtp);
+ : new SMTP(
+ host: $smtp['host'],
+ port: (int) $smtp['port'],
+ username: $smtp['username'] ?? '',
+ password: $smtp['password'] ?? '',
+ smtpSecure: $smtp['secure'] ?? '',
+ smtpAutoTLS: false,
+ xMailer: 'Appwrite Mailer',
+ timeout: 10,
+ keepAlive: true,
+ timelimit: 30,
+ );
- $mail->clearAddresses();
- $mail->clearAllRecipients();
- $mail->clearReplyTos();
- $mail->clearAttachments();
- $mail->clearBCCs();
- $mail->clearCCs();
- $mail->addAddress($recipient, $name);
- $mail->Subject = $subject;
- $mail->Body = $body;
+ // Resolve from/replyTo using fallback hierarchy: Custom options > SMTP config > Defaults
+ $defaultFromEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+ $defaultFromName = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
- $mail->AltBody = $body;
- $mail->AltBody = preg_replace('/]*>(.*?)<\/style>/is', '', $mail->AltBody);
- $mail->AltBody = \strip_tags($mail->AltBody);
- $mail->AltBody = \trim($mail->AltBody);
-
- $replyTo = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
- $replyToName = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
+ $fromEmail = !empty($smtp) ? ($smtp['senderEmail'] ?? $defaultFromEmail) : $defaultFromEmail;
+ $fromName = !empty($smtp) ? ($smtp['senderName'] ?? $defaultFromName) : $defaultFromName;
+ $replyTo = $defaultFromEmail;
+ $replyToName = $defaultFromName;
$customMailOptions = $payload['customMailOptions'] ?? [];
- // fallback hierarchy: Custom options > SMTP config > Defaults.
- if (!empty($customMailOptions['senderEmail']) || !empty($customMailOptions['senderName'])) {
- $fromEmail = $customMailOptions['senderEmail'] ?? $mail->From;
- $fromName = $customMailOptions['senderName'] ?? $mail->FromName;
- $mail->setFrom($fromEmail, $fromName);
+ if (!empty($customMailOptions['senderEmail'])) {
+ $fromEmail = $customMailOptions['senderEmail'];
+ }
+ if (!empty($customMailOptions['senderName'])) {
+ $fromName = $customMailOptions['senderName'];
}
if (!empty($customMailOptions['replyToEmail']) || !empty($customMailOptions['replyToName'])) {
@@ -172,18 +177,32 @@ class Mails extends Action
$replyToName = $smtp['senderName'] ?? $replyToName;
}
- $mail->addReplyTo($replyTo, $replyToName);
+ $attachments = null;
if (!empty($attachment['content'] ?? '')) {
- $mail->AddStringAttachment(
- base64_decode($attachment['content']),
- $attachment['filename'] ?? 'unknown.file',
- $attachment['encoding'] ?? PHPMailer::ENCODING_BASE64,
- $attachment['type'] ?? 'plain/text'
- );
+ $attachments = [
+ new Attachment(
+ name: $attachment['filename'] ?? 'unknown.file',
+ path: '',
+ type: $attachment['type'] ?? 'plain/text',
+ content: \base64_decode($attachment['content']),
+ ),
+ ];
}
+ $emailMessage = new EmailMessage(
+ to: [['email' => $recipient, 'name' => $name]],
+ subject: $subject,
+ content: $body,
+ fromName: $fromName,
+ fromEmail: $fromEmail,
+ replyToName: $replyToName,
+ replyToEmail: $replyTo,
+ attachments: $attachments,
+ html: true,
+ );
+
try {
- $mail->send();
+ $adapter->send($emailMessage);
} catch (\Throwable $error) {
if ($type === 'smtp') {
throw new Exception('Error sending mail: ' . $error->getMessage(), 401);
@@ -191,38 +210,4 @@ class Mails extends Action
throw new Exception('Error sending mail: ' . $error->getMessage(), 500);
}
}
-
- /**
- * @param array $smtp
- * @return PHPMailer
- * @throws \PHPMailer\PHPMailer\Exception
- */
- protected function getMailer(array $smtp): PHPMailer
- {
- $mail = new PHPMailer(true);
-
- $mail->isSMTP();
-
- $username = $smtp['username'];
- $password = $smtp['password'];
-
- $mail->XMailer = 'Appwrite Mailer';
- $mail->Host = $smtp['host'];
- $mail->Port = $smtp['port'];
- $mail->SMTPAuth = (!empty($username) && !empty($password));
- $mail->Username = $username;
- $mail->Password = $password;
- $mail->SMTPSecure = $smtp['secure'];
- $mail->SMTPAutoTLS = false;
- $mail->SMTPKeepAlive = true;
- $mail->CharSet = 'UTF-8';
- $mail->Timeout = 10; /* Connection timeout */
- $mail->getSMTPInstance()->Timelimit = 30; /* Timeout for each individual SMTP command (e.g. HELO, EHLO, etc.) */
-
- $mail->setFrom($smtp['senderEmail'], $smtp['senderName']);
-
- $mail->isHTML();
-
- return $mail;
- }
}
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index af7d2027e3..ff5eb2417a 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -285,7 +285,7 @@ class Messaging extends Action
try {
$response = $adapter->send($data);
- $deliveredTotal += $response['deliveredTo'];
+ $deliveredTotal += (int) $response['deliveredTo'];
foreach ($response['results'] as $result) {
if ($result['status'] === 'failure') {
$deliveryErrors[] = "Failed sending to target {$result['recipient']} with error: {$result['error']}";
@@ -380,7 +380,7 @@ class Messaging extends Action
]));
// Delete any attachments that were downloaded to local storage
- if ($provider->getAttribute('type') === MESSAGE_TYPE_EMAIL) {
+ if ($providerType === MESSAGE_TYPE_EMAIL) {
if ($deviceForFiles->getType() === Storage::DEVICE_LOCAL) {
return;
}
diff --git a/src/Appwrite/Platform/Workers/Migrations.php b/src/Appwrite/Platform/Workers/Migrations.php
index d96a25351f..2534899f67 100644
--- a/src/Appwrite/Platform/Workers/Migrations.php
+++ b/src/Appwrite/Platform/Workers/Migrations.php
@@ -28,6 +28,7 @@ use Utopia\Locale\Locale;
use Utopia\Migration\Destination;
use Utopia\Migration\Destinations\Appwrite as DestinationAppwrite;
use Utopia\Migration\Destinations\CSV as DestinationCSV;
+use Utopia\Migration\Destinations\JSON as DestinationJSON;
use Utopia\Migration\Exception as MigrationException;
use Utopia\Migration\Resource;
use Utopia\Migration\Resources\Database\Database as ResourceDatabase;
@@ -37,6 +38,7 @@ use Utopia\Migration\Source;
use Utopia\Migration\Sources\Appwrite as SourceAppwrite;
use Utopia\Migration\Sources\CSV;
use Utopia\Migration\Sources\Firebase;
+use Utopia\Migration\Sources\JSON;
use Utopia\Migration\Sources\NHost;
use Utopia\Migration\Sources\Supabase;
use Utopia\Migration\Transfer;
@@ -208,8 +210,8 @@ class Migrations extends Action
$getDatabasesDB = fn (Document $database): Database =>
$this->getDatabasesDBForProject($database);
$queries = [];
- if ($source === SourceAppwrite::getName() && $destination === DestinationCSV::getName()) {
- $queries = Query::parseQueries($migrationOptions['queries']);
+ if ($source === SourceAppwrite::getName() && in_array($destination, [DestinationCSV::getName(), DestinationJSON::getName()])) {
+ $queries = Query::parseQueries($migrationOptions['queries'] ?? []);
}
$migrationSource = match ($source) {
@@ -250,6 +252,12 @@ class Migrations extends Action
$this->dbForProject,
$getDatabasesDB
),
+ JSON::getName() => new JSON(
+ $resourceId,
+ $migrationOptions['path'],
+ $this->deviceForMigrations,
+ $this->dbForProject,
+ ),
default => throw new \Exception('Invalid source type'),
};
@@ -288,6 +296,13 @@ class Migrations extends Action
$options['escape'],
$options['header'],
),
+ DestinationJSON::getName() => new DestinationJSON(
+ $this->deviceForFiles,
+ $migration->getAttribute('resourceId'),
+ $options['bucketId'] ?? 'default',
+ $options['filename'],
+ $options['columns'] ?? [],
+ ),
default => throw new \Exception('Invalid destination type'),
};
}
@@ -393,6 +408,7 @@ class Migrations extends Action
$tempAPIKey = $this->generateAPIKey($project);
$transfer = $source = $destination = null;
+ $aggregatedResources = [];
$host = System::getEnv('_APP_MIGRATION_HOST');
if (empty($host)) {
@@ -429,7 +445,6 @@ class Migrations extends Action
$destination
);
- $aggregatedResources = [];
/** Start Transfer */
if (empty($source->getErrors())) {
$migration->setAttribute('stage', 'migrating');
@@ -550,8 +565,9 @@ class Migrations extends Action
$destination?->success();
$source?->success();
}
- if ($migration->getAttribute('destination') === DestinationCSV::getName()) {
- $this->handleCSVExportComplete($project, $migration, $queueForMails, $queueForRealtime, $platform, $authorization);
+ $destination_type = $migration->getAttribute('destination');
+ if ($destination_type === DestinationCSV::getName() || $destination_type === DestinationJSON::getName()) {
+ $this->handleDataExportComplete($project, $migration, $queueForMails, $queueForRealtime, $platform, $authorization);
}
} finally {
$source?->cleanup();
@@ -583,7 +599,7 @@ class Migrations extends Action
* @param Authorization $authorization
* @return void
*/
- protected function handleCSVExportComplete(
+ protected function handleDataExportComplete(
Document $project,
Document $migration,
Mail $queueForMails,
@@ -608,7 +624,8 @@ class Migrations extends Action
throw new \Exception('Bucket not found');
}
- $path = $this->deviceForFiles->getPath($bucketId . '/' . $this->sanitizeFilename($filename) . '.csv');
+ $extension = $migration->getAttribute('destination') === DestinationJSON::getName() ? '.json' : '.csv';
+ $path = $this->deviceForFiles->getPath($bucketId . '/' . $this->sanitizeFilename($filename) . $extension);
$size = $this->deviceForFiles->getFileSize($path);
$mime = $this->deviceForFiles->getFileMimeType($path);
$hash = $this->deviceForFiles->getFileHash($path);
@@ -632,13 +649,14 @@ class Migrations extends Action
$migration->setAttribute('errors', $errors);
$migration = $this->updateMigrationDocument($migration, $project, $queueForRealtime);
- $this->sendCSVEmail(
+ $this->sendExportEmail(
success: false,
project: $project,
user: $user,
options: $options,
queueForMails: $queueForMails,
platform: $platform,
+ exportType: $migration->getAttribute('destination') === DestinationJSON::getName() ? 'JSON' : 'CSV',
sizeMB: $sizeMB
);
@@ -694,13 +712,14 @@ class Migrations extends Action
$migration->setAttribute('options', $options);
$this->updateMigrationDocument($migration, $project, $queueForRealtime);
- $this->sendCSVEmail(
+ $this->sendExportEmail(
success: true,
project: $project,
user: $user,
options: $options,
queueForMails: $queueForMails,
platform: $platform,
+ exportType: $migration->getAttribute('destination') === DestinationJSON::getName() ? 'JSON' : 'CSV',
downloadUrl: $downloadUrl
);
}
@@ -719,13 +738,14 @@ class Migrations extends Action
* @return void
* @throws \Exception
*/
- protected function sendCSVEmail(
+ protected function sendExportEmail(
bool $success,
Document $project,
Document $user,
array $options,
Mail $queueForMails,
array $platform,
+ string $exportType = 'CSV',
string $downloadUrl = '',
float $sizeMB = 0.0,
): void {
@@ -745,15 +765,15 @@ class Migrations extends Action
? 'success'
: 'failure';
- // Get localized email content
- $subject = $locale->getText("emails.csvExport.{$emailType}.subject");
- $preview = $locale->getText("emails.csvExport.{$emailType}.preview");
- $hello = $locale->getText("emails.csvExport.{$emailType}.hello");
- $body = $locale->getText("emails.csvExport.{$emailType}.body");
- $footer = $locale->getText("emails.csvExport.{$emailType}.footer");
- $thanks = $locale->getText("emails.csvExport.{$emailType}.thanks");
- $signature = $locale->getText("emails.csvExport.{$emailType}.signature");
- $buttonText = $success ? $locale->getText("emails.csvExport.{$emailType}.buttonText") : '';
+ // Get localized email content — replace {{type}} with export format (CSV/JSON)
+ $subject = \str_replace('{{type}}', $exportType, $locale->getText("emails.dataExport.{$emailType}.subject"));
+ $preview = \str_replace('{{type}}', $exportType, $locale->getText("emails.dataExport.{$emailType}.preview"));
+ $hello = $locale->getText("emails.dataExport.{$emailType}.hello");
+ $body = $locale->getText("emails.dataExport.{$emailType}.body");
+ $footer = $locale->getText("emails.dataExport.{$emailType}.footer");
+ $thanks = $locale->getText("emails.dataExport.{$emailType}.thanks");
+ $signature = $locale->getText("emails.dataExport.{$emailType}.signature");
+ $buttonText = $success ? $locale->getText("emails.dataExport.{$emailType}.buttonText") : '';
// Build email body using appropriate template
$templatePath = $success
@@ -769,6 +789,7 @@ class Migrations extends Action
->setParam('{{direction}}', $locale->getText('settings.direction'))
->setParam('{{project}}', $project->getAttribute('name'))
->setParam('{{user}}', $user->getAttribute('name', $user->getAttribute('email')))
+ ->setParam('{{type}}', $exportType)
->setParam('{{size}}', $success ? '' : (string)$sizeMB);
if ($success) {
@@ -789,6 +810,7 @@ class Migrations extends Action
'terms' => $platform['termsUrl'],
'privacy' => $platform['privacyUrl'],
'platform' => $platform['platformName'],
+ 'type' => $exportType,
];
$queueForMails
diff --git a/src/Appwrite/Platform/Workers/StatsResources.php b/src/Appwrite/Platform/Workers/StatsResources.php
index 0e7a9bb0a7..b2823d3722 100644
--- a/src/Appwrite/Platform/Workers/StatsResources.php
+++ b/src/Appwrite/Platform/Workers/StatsResources.php
@@ -208,7 +208,7 @@ class StatsResources extends Action
{
$totalFiles = 0;
$totalStorage = 0;
- $this->foreachDocument($dbForProject, 'buckets', [], function ($bucket) use ($dbForProject, $dbForLogs, $region, &$totalFiles, &$totalStorage) {
+ $this->foreachDocument($dbForProject, 'buckets', [], function ($bucket) use ($dbForProject, $region, &$totalFiles, &$totalStorage) {
try {
$files = $dbForProject->count('bucket_' . $bucket->getSequence());
} catch (Throwable $th) {
diff --git a/src/Appwrite/Platform/Workers/StatsUsage.php b/src/Appwrite/Platform/Workers/StatsUsage.php
index 1e0a2eabba..144c429629 100644
--- a/src/Appwrite/Platform/Workers/StatsUsage.php
+++ b/src/Appwrite/Platform/Workers/StatsUsage.php
@@ -140,7 +140,7 @@ class StatsUsage extends Action
/**
* @param Message $message
- * @param callable(): Database $getProjectDB
+ * @param callable(Document): Database $getProjectDB
* @param callable(): Database $getLogsDB
* @param Registry $register
* @return void
@@ -212,7 +212,7 @@ class StatsUsage extends Action
* @param Document $project
* @param Document $document
* @param array $metrics
- * @param callable(): Database $getProjectDB
+ * @param callable(Document): Database $getProjectDB
* @param string $databaseType Database type from context
* @return void
*/
@@ -394,7 +394,7 @@ class StatsUsage extends Action
/**
* Commit stats to DB
- * @param callable(): Database $getProjectDB
+ * @param callable(Document): Database $getProjectDB
* @return void
*/
public function commitToDb(callable $getProjectDB): void
@@ -459,7 +459,7 @@ class StatsUsage extends Action
/**
* Sort by unique index key reduce locks/deadlocks
*/
- usort($projectStats['stats'], function ($a, $b) use ($sequence) {
+ usort($projectStats['stats'], function ($a, $b) {
// Metric DESC
$cmp = strcmp($b['metric'], $a['metric']);
if ($cmp !== 0) {
diff --git a/src/Appwrite/Platform/Workers/Webhooks.php b/src/Appwrite/Platform/Workers/Webhooks.php
index fce3c7b149..509f0a6313 100644
--- a/src/Appwrite/Platform/Workers/Webhooks.php
+++ b/src/Appwrite/Platform/Workers/Webhooks.php
@@ -233,7 +233,7 @@ class Webhooks extends Action
$template->setParam('{{webhook}}', $webhook->getAttribute('name'));
$template->setParam('{{project}}', $project->getAttribute('name'));
$template->setParam('{{url}}', $webhook->getAttribute('url'));
- $template->setParam('{{error}}', $curlError ?? 'The server returned ' . $statusCode . ' status code');
+ $template->setParam('{{error}}', 'The server returned ' . $statusCode . ' status code');
$template->setParam('{{path}}', "/console/project-$region-$projectId/settings/webhooks/$webhookId");
$template->setParam('{{attempts}}', $attempts);
diff --git a/src/Appwrite/Promises/Promise.php b/src/Appwrite/Promises/Promise.php
index a6b1aa79d5..a58c7c29a8 100644
--- a/src/Appwrite/Promises/Promise.php
+++ b/src/Appwrite/Promises/Promise.php
@@ -2,6 +2,7 @@
namespace Appwrite\Promises;
+/** @phpstan-consistent-constructor */
abstract class Promise
{
protected const STATE_PENDING = 1;
diff --git a/src/Appwrite/SDK/Method.php b/src/Appwrite/SDK/Method.php
index 3cf96b5413..c74406b2a6 100644
--- a/src/Appwrite/SDK/Method.php
+++ b/src/Appwrite/SDK/Method.php
@@ -197,7 +197,7 @@ class Method
public function isHidden(): bool|array
{
- return $this->hide ?? false;
+ return $this->hide;
}
public function isPackaging(): bool
diff --git a/src/Appwrite/SDK/Specification/Format.php b/src/Appwrite/SDK/Specification/Format.php
index 04ecafa8fc..dd4d378345 100644
--- a/src/Appwrite/SDK/Specification/Format.php
+++ b/src/Appwrite/SDK/Specification/Format.php
@@ -204,15 +204,31 @@ abstract class Format
*
* Get services value
*
- * @param array $services
- *
- * @return self
*/
public function getServices(): array
{
return $this->services;
}
+ protected function getDescriptionContents(?string $description): string
+ {
+ if ($description === null || $description === '') {
+ return '';
+ }
+
+ if (!\str_ends_with($description, '.md')) {
+ return $description;
+ }
+
+ $contents = @\file_get_contents($description);
+
+ if ($contents === false) {
+ throw new \RuntimeException('Documentation file not found or unreadable: ' . $description);
+ }
+
+ return $contents;
+ }
+
protected function getRequestEnumName(string $service, string $method, string $param): ?string
{
/* `$service` is `$namespace` */
diff --git a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
index 8c77da413f..88f577eac6 100644
--- a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
+++ b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
@@ -79,8 +79,8 @@ class OpenAPI3 extends Format
$output['components']['securitySchemes']['Key']['x-appwrite'] = ['demo' => ''];
}
- if (isset($output['securityDefinitions']['JWT'])) {
- $output['securityDefinitions']['JWT']['x-appwrite'] = ['demo' => ''];
+ if (isset($output['components']['securitySchemes']['JWT'])) {
+ $output['components']['securitySchemes']['JWT']['x-appwrite'] = ['demo' => ''];
}
if (isset($output['components']['securitySchemes']['Locale'])) {
@@ -99,7 +99,7 @@ class OpenAPI3 extends Format
$sdk = $route->getLabel('sdk', false);
- if (empty($sdk)) {
+ if ($sdk === false) {
continue;
}
@@ -125,8 +125,7 @@ class OpenAPI3 extends Format
$namespace = $sdk->getNamespace() ?? 'default';
- $desc ??= '';
- $descContents = \str_ends_with($desc, '.md') ? \file_get_contents($desc) : $desc;
+ $descContents = $this->getDescriptionContents($desc);
$temp = [
'summary' => $route->getDesc(),
@@ -163,7 +162,7 @@ class OpenAPI3 extends Format
];
}
- if (!empty($additionalMethods)) {
+ if (\is_array($additionalMethods) && \count($additionalMethods) > 0) {
$temp['x-appwrite']['methods'] = [];
foreach ($additionalMethods as $methodObj) {
/** @var Method $methodObj */
@@ -191,7 +190,7 @@ class OpenAPI3 extends Format
'parameters' => [],
'required' => [],
'responses' => [],
- 'description' => ($desc) ? \file_get_contents($desc) : '',
+ 'description' => $this->getDescriptionContents($desc),
'demo' => \strtolower($namespace) . '/' . Template::fromCamelCaseToDash($methodObj->getMethodName()) . '.md',
'public' => $methodObj->isPublic(),
];
@@ -329,7 +328,7 @@ class OpenAPI3 extends Format
if (($response->getCode() ?? 500) === 204) {
$temp['responses'][(string)$response->getCode() ?? '500']['description'] = 'No content';
- unset($temp['responses'][(string)$response->getCode() ?? '500']['schema']);
+ unset($temp['responses'][(string)$response->getCode() ?? '500']['content']);
}
}
@@ -383,7 +382,7 @@ class OpenAPI3 extends Format
$validator = $validator->getValidator();
}
- $class = !empty($validator)
+ $class = $validator instanceof Validator
? \get_class($validator)
: '';
@@ -431,7 +430,7 @@ class OpenAPI3 extends Format
$node['schema']['type'] = $validator->getType();
$node['schema']['x-example'] = ($param['example'] ?? '') ?: '<' . \strtoupper(Template::fromCamelCaseToSnake($node['name'])) . '>';
break;
- case \Utopia\Database\Validator\DatetimeValidator::class:
+ case \Utopia\Database\Validator\Datetime::class:
$node['schema']['type'] = $validator->getType();
$node['schema']['format'] = 'datetime';
$node['schema']['x-example'] = ($param['example'] ?? '') ?: Model::TYPE_DATETIME_EXAMPLE;
@@ -463,7 +462,6 @@ class OpenAPI3 extends Format
$node['schema']['x-example'] = ($param['example'] ?? '') ?: 'https://example.com';
break;
case \Utopia\Validator\JSON::class:
- case \Utopia\Validator\Mock::class:
case \Utopia\Validator\Assoc::class:
$param['default'] = (empty($param['default'])) ? new \stdClass() : $param['default'];
$node['schema']['type'] = 'object';
@@ -563,12 +561,6 @@ class OpenAPI3 extends Format
$node['schema']['x-example'] = $param['example'];
}
break;
- case \Utopia\Validator\Length::class:
- $node['schema']['type'] = $validator->getType();
- if (!empty($param['example'])) {
- $node['schema']['x-example'] = $param['example'];
- }
- break;
case \Utopia\Validator\WhiteList::class:
if ($array) {
$validator = $validator->getValidator();
diff --git a/src/Appwrite/SDK/Specification/Format/Swagger2.php b/src/Appwrite/SDK/Specification/Format/Swagger2.php
index d0815d8cad..f9c79431f0 100644
--- a/src/Appwrite/SDK/Specification/Format/Swagger2.php
+++ b/src/Appwrite/SDK/Specification/Format/Swagger2.php
@@ -96,10 +96,9 @@ class Swagger2 extends Format
$scope = $route->getLabel('scope', '');
- /** @var Method $sdk */
$sdk = $route->getLabel('sdk', false);
- if (empty($sdk)) {
+ if ($sdk === false) {
continue;
}
@@ -127,8 +126,7 @@ class Swagger2 extends Format
$sdkPlatforms = array_values(array_unique($sdkPlatforms));
$namespace = $sdk->getNamespace() ?? 'default';
- $desc ??= '';
- $descContents = \str_ends_with($desc, '.md') ? \file_get_contents($desc) : $desc;
+ $descContents = $this->getDescriptionContents($desc);
$temp = [
'summary' => $route->getDesc(),
@@ -171,7 +169,7 @@ class Swagger2 extends Format
$temp['produces'][] = $produces;
}
- if (!empty($additionalMethods)) {
+ if (\is_array($additionalMethods) && \count($additionalMethods) > 0) {
$temp['x-appwrite']['methods'] = [];
foreach ($additionalMethods as $methodObj) {
/** @var Method $methodObj */
@@ -200,7 +198,7 @@ class Swagger2 extends Format
'parameters' => [],
'required' => [],
'responses' => [],
- 'description' => ($desc) ? \file_get_contents($desc) : '',
+ 'description' => $this->getDescriptionContents($desc),
'demo' => \strtolower($namespace) . '/' . Template::fromCamelCaseToDash($methodObj->getMethodName()) . '.md',
'public' => $methodObj->isPublic(),
];
@@ -388,7 +386,7 @@ class Swagger2 extends Format
$validator = $validator->getValidator();
}
- $class = !empty($validator)
+ $class = $validator instanceof Validator
? \get_class($validator)
: '';
@@ -436,7 +434,7 @@ class Swagger2 extends Format
$node['type'] = $validator->getType();
$node['x-example'] = ($param['example'] ?? '') ?: '<' . \strtoupper(Template::fromCamelCaseToSnake($node['name'])) . '>';
break;
- case \Utopia\Database\Validator\DatetimeValidator::class:
+ case \Utopia\Database\Validator\Datetime::class:
$node['type'] = $validator->getType();
$node['format'] = 'datetime';
$node['x-example'] = ($param['example'] ?? '') ?: Model::TYPE_DATETIME_EXAMPLE;
@@ -479,7 +477,6 @@ class Swagger2 extends Format
}
break;
case \Utopia\Validator\JSON::class:
- case \Utopia\Validator\Mock::class:
case \Utopia\Validator\Assoc::class:
$node['type'] = 'object';
$node['default'] = (empty($param['default'])) ? new \stdClass() : $param['default'];
@@ -552,12 +549,6 @@ class Swagger2 extends Format
$node['x-example'] = $param['example'];
}
break;
- case \Utopia\Validator\Length::class:
- $node['type'] = $validator->getType();
- if (!empty($param['example'])) {
- $node['x-example'] = $param['example'];
- }
- break;
case \Utopia\Validator\WhiteList::class:
if ($array) {
$validator = $validator->getValidator();
diff --git a/src/Appwrite/Template/Template.php b/src/Appwrite/Template/Template.php
index c8744c87bb..695e925e52 100644
--- a/src/Appwrite/Template/Template.php
+++ b/src/Appwrite/Template/Template.php
@@ -149,7 +149,7 @@ class Template extends View
/**
* From Camel Case
*
- * @var string $input
+ * @param string $input
*
* @return string
*/
@@ -167,7 +167,7 @@ class Template extends View
/**
* From Camel Case to Dash Case
*
- * @var string $input
+ * @param string $input
*
* @return string
*/
diff --git a/src/Appwrite/Utopia/Database/Documents/User.php b/src/Appwrite/Utopia/Database/Documents/User.php
index 50e66dac38..211c6449dc 100644
--- a/src/Appwrite/Utopia/Database/Documents/User.php
+++ b/src/Appwrite/Utopia/Database/Documents/User.php
@@ -86,7 +86,6 @@ class User extends Document
/**
* Check if user is anonymous.
*
- * @param Document $this
* @return bool
*/
public function isAnonymous(): bool
@@ -153,7 +152,6 @@ class User extends Document
/**
* Verify session and check that its not expired.
*
- * @param array $sessions
* @param string $secret
*
* @return bool|string
diff --git a/src/Appwrite/Utopia/Request.php b/src/Appwrite/Utopia/Request.php
index 9428ff9d88..ed602ecdd5 100644
--- a/src/Appwrite/Utopia/Request.php
+++ b/src/Appwrite/Utopia/Request.php
@@ -17,7 +17,7 @@ class Request extends UtopiaRequest
* @var array
*/
private array $filters = [];
- private static ?Route $route = null;
+ private ?Route $route = null;
public function __construct(SwooleRequest $request)
{
@@ -34,11 +34,11 @@ class Request extends UtopiaRequest
{
$parameters = parent::getParams();
- if (!$this->hasFilters() || !self::hasRoute()) {
+ if (!$this->hasFilters() || !$this->hasRoute()) {
return $parameters;
}
- $methods = self::getRoute()->getLabel('sdk', null);
+ $methods = $this->getRoute()?->getLabel('sdk', null);
if (empty($methods)) {
return $parameters;
@@ -131,9 +131,9 @@ class Request extends UtopiaRequest
*
* @return void
*/
- public static function setRoute(?Route $route): void
+ public function setRoute(?Route $route): void
{
- self::$route = $route;
+ $this->route = $route;
}
/**
@@ -141,9 +141,9 @@ class Request extends UtopiaRequest
*
* @return Route|null
*/
- public static function getRoute(): ?Route
+ public function getRoute(): ?Route
{
- return self::$route;
+ return $this->route;
}
/**
@@ -151,9 +151,9 @@ class Request extends UtopiaRequest
*
* @return bool
*/
- public static function hasRoute(): bool
+ public function hasRoute(): bool
{
- return self::$route !== null;
+ return $this->route !== null;
}
/**
diff --git a/src/Appwrite/Utopia/Request/Filters/V17.php b/src/Appwrite/Utopia/Request/Filters/V17.php
index 2cdf3973b2..0e4f9eceb6 100644
--- a/src/Appwrite/Utopia/Request/Filters/V17.php
+++ b/src/Appwrite/Utopia/Request/Filters/V17.php
@@ -120,11 +120,11 @@ class V17 extends Filter
$isArrayStack = !$isStringStack && $stackCount > 0;
if ($char === static::CHAR_BACKSLASH) {
- if (!(static::isSpecialChar($filter[$i + 1]))) {
- static::appendSymbol($isStringStack, $filter[$i], $i, $filter, $currentParam);
+ if (!(self::isSpecialChar($filter[$i + 1]))) {
+ self::appendSymbol($isStringStack, $filter[$i], $i, $filter, $currentParam);
}
- static::appendSymbol($isStringStack, $filter[$i + 1], $i, $filter, $currentParam);
+ self::appendSymbol($isStringStack, $filter[$i + 1], $i, $filter, $currentParam);
$i++;
continue;
@@ -147,7 +147,7 @@ class V17 extends Filter
}
// Either way, add symbol to builder
- static::appendSymbol(
+ self::appendSymbol(
$isStringStack,
$char,
$i,
@@ -199,7 +199,7 @@ class V17 extends Filter
}
// Value, not relevant to syntax
- static::appendSymbol(
+ self::appendSymbol(
$isStringStack,
$char,
$i,
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index 99170a58c9..9d0e8abefa 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -299,7 +299,7 @@ class Response extends SwooleResponse
/**
* @var bool
*/
- protected static bool $showSensitive = false;
+ protected bool $showSensitive = false;
/**
* @var array
@@ -509,7 +509,7 @@ class Response extends SwooleResponse
$isPrivilegedUser = $user->isPrivileged($roles);
$isAppUser = $user->isApp($roles);
- if ((!$isPrivilegedUser && !$isAppUser) && !self::$showSensitive) {
+ if ((!$isPrivilegedUser && !$isAppUser) && !$this->showSensitive) {
$data->setAttribute($key, '');
}
}
@@ -629,9 +629,9 @@ class Response extends SwooleResponse
}
/**
- * Return the currently set filter
+ * Return the currently set filters
*
- * @return Filter
+ * @return array
*/
public function getFilters(): array
{
@@ -659,18 +659,20 @@ class Response extends SwooleResponse
}
/**
- * Static wrapper to show sensitive data in response
+ * Wrapper to show sensitive data in response
*
- * @param callable The callback to show sensitive information for
+ * @param callable(): array $callback The callback to show sensitive information for
* @return array
*/
- public static function showSensitive(callable $callback): array
+ public function showSensitive(callable $callback): array
{
+ $previous = $this->showSensitive;
+
try {
- self::$showSensitive = true;
+ $this->showSensitive = true;
return $callback();
} finally {
- self::$showSensitive = false;
+ $this->showSensitive = $previous;
}
}
diff --git a/src/Appwrite/Utopia/Response/Filters/V21.php b/src/Appwrite/Utopia/Response/Filters/V21.php
index b65e26a8b0..3fc16d6c8a 100644
--- a/src/Appwrite/Utopia/Response/Filters/V21.php
+++ b/src/Appwrite/Utopia/Response/Filters/V21.php
@@ -11,34 +11,48 @@ class V21 extends Filter
public function parse(array $content, string $model): array
{
return match ($model) {
+ Response::MODEL_USER => $this->parseUser($content),
+ Response::MODEL_USER_LIST => $this->handleList(
+ $content,
+ 'users',
+ fn ($item) => $this->parseUser($item),
+ ),
+ Response::MODEL_ACCOUNT => $this->parseUser($content),
Response::MODEL_SITE => $this->parseSite($content),
Response::MODEL_SITE_LIST => $this->handleList(
$content,
- "sites",
+ 'sites',
fn ($item) => $this->parseSite($item),
),
Response::MODEL_FUNCTION => $this->parseFunction($content),
Response::MODEL_FUNCTION_LIST => $this->handleList(
$content,
- "functions",
+ 'functions',
fn ($item) => $this->parseFunction($item),
),
Response::MODEL_DOCUMENT => $this->parseDocument($content),
Response::MODEL_DOCUMENT_LIST => $this->handleList(
$content,
- "documents",
+ 'documents',
fn ($item) => $this->parseDocument($item),
),
Response::MODEL_ROW => $this->parseRow($content),
Response::MODEL_ROW_LIST => $this->handleList(
$content,
- "rows",
+ 'rows',
fn ($item) => $this->parseRow($item),
),
default => $content,
};
}
+ protected function parseUser(array $content): array
+ {
+ unset($content['impersonator']);
+ unset($content['impersonatorUserId']);
+ return $content;
+ }
+
protected function parseSite(array $content): array
{
$content = $this->parseSpecs($content);
diff --git a/src/Appwrite/Utopia/Response/Model/Project.php b/src/Appwrite/Utopia/Response/Model/Project.php
index cd33a29685..5902902e9e 100644
--- a/src/Appwrite/Utopia/Response/Model/Project.php
+++ b/src/Appwrite/Utopia/Response/Model/Project.php
@@ -137,6 +137,24 @@ class Project extends Model
'default' => false,
'example' => true,
])
+ ->addRule('authDisposableEmails', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to disallow disposable email addresses during signup and email updates.',
+ 'default' => false,
+ 'example' => true,
+ ])
+ ->addRule('authCanonicalEmails', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to require canonical email addresses during signup and email updates.',
+ 'default' => false,
+ 'example' => true,
+ ])
+ ->addRule('authFreeEmails', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to disallow free email addresses during signup and email updates.',
+ 'default' => false,
+ 'example' => true,
+ ])
->addRule('authMockNumbers', [
'type' => Response::MODEL_MOCK_NUMBER,
'description' => 'An array of mock numbers and their corresponding verification codes (OTPs).',
@@ -415,6 +433,9 @@ class Project extends Model
$document->setAttribute('authPasswordHistory', $authValues['passwordHistory'] ?? 0);
$document->setAttribute('authPasswordDictionary', $authValues['passwordDictionary'] ?? false);
$document->setAttribute('authPersonalDataCheck', $authValues['personalDataCheck'] ?? false);
+ $document->setAttribute('authDisposableEmails', $authValues['disposableEmails'] ?? false);
+ $document->setAttribute('authCanonicalEmails', $authValues['canonicalEmails'] ?? false);
+ $document->setAttribute('authFreeEmails', $authValues['freeEmails'] ?? false);
$document->setAttribute('authMockNumbers', $authValues['mockNumbers'] ?? []);
$document->setAttribute('authSessionAlerts', $authValues['sessionAlerts'] ?? false);
$document->setAttribute('authMembershipsUserName', $authValues['membershipsUserName'] ?? true);
diff --git a/src/Appwrite/Utopia/Response/Model/User.php b/src/Appwrite/Utopia/Response/Model/User.php
index 476778e68b..01447ccfc2 100644
--- a/src/Appwrite/Utopia/Response/Model/User.php
+++ b/src/Appwrite/Utopia/Response/Model/User.php
@@ -157,9 +157,9 @@ class User extends Model
}
/**
- * Get Collection
+ * Filter user document attributes for response output.
*
- * @return string
+ * @return Document
*/
public function filter(Document $document): Document
{
diff --git a/tests/e2e/Services/Databases/Legacy/DatabasesStringTypesTest.php b/tests/e2e/Services/Databases/Legacy/DatabasesStringTypesTest.php
index f68f0b909e..06c008e61d 100644
--- a/tests/e2e/Services/Databases/Legacy/DatabasesStringTypesTest.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesStringTypesTest.php
@@ -29,8 +29,8 @@ class DatabasesStringTypesTest extends Scope
protected function setupDatabaseAndCollection(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$setupCache[$cacheKey])) {
- return static::$setupCache[$cacheKey];
+ if (!empty(self::$setupCache[$cacheKey])) {
+ return self::$setupCache[$cacheKey];
}
$projectId = $this->getProject()['$id'];
@@ -135,12 +135,12 @@ class DatabasesStringTypesTest extends Scope
// Wait for all attributes to be available
$this->waitForAllAttributes($databaseId, $collectionId);
- static::$setupCache[$cacheKey] = [
+ self::$setupCache[$cacheKey] = [
'databaseId' => $databaseId,
'collectionId' => $collectionId,
];
- return static::$setupCache[$cacheKey];
+ return self::$setupCache[$cacheKey];
}
public function testCreateDatabase(): void
diff --git a/tests/e2e/Services/Databases/Permissions/DatabasesPermissionsBase.php b/tests/e2e/Services/Databases/Permissions/DatabasesPermissionsBase.php
index d6869cc650..134257d06a 100644
--- a/tests/e2e/Services/Databases/Permissions/DatabasesPermissionsBase.php
+++ b/tests/e2e/Services/Databases/Permissions/DatabasesPermissionsBase.php
@@ -45,6 +45,12 @@ trait DatabasesPermissionsBase
return $recordId ? "{$base}/{$recordId}" : $base;
}
+ protected function getIndexUrl(string $databaseId, string $containerId, string $indexId = ''): string
+ {
+ $base = "{$this->getContainerUrl($databaseId, $containerId)}/indexes";
+ return $indexId ? "{$base}/{$indexId}" : $base;
+ }
+
// User Management Methods
public function createUser(string $id, string $email, string $password = 'test123!'): array
{
diff --git a/tests/e2e/Services/Functions/FunctionsBase.php b/tests/e2e/Services/Functions/FunctionsBase.php
index af426d5221..42976cda84 100644
--- a/tests/e2e/Services/Functions/FunctionsBase.php
+++ b/tests/e2e/Services/Functions/FunctionsBase.php
@@ -100,6 +100,24 @@ trait FunctionsBase
'x-appwrite-key' => $this->getProject()['apiKey'],
]));
$this->assertNotEquals(401, $function['headers']['status-code'], 'Auth failed while polling function activation');
+
+ if (
+ ($function['body']['deploymentId'] ?? '') !== $deploymentId
+ && ($function['body']['latestDeploymentId'] ?? '') === $deploymentId
+ && ($function['body']['latestDeploymentStatus'] ?? '') === 'ready'
+ ) {
+ $activation = $this->updateFunctionDeployment($functionId, $deploymentId);
+ $this->assertContains(
+ $activation['headers']['status-code'],
+ [200, 409],
+ 'Deployment activation request failed: ' . json_encode($activation['body'], JSON_PRETTY_PRINT)
+ );
+
+ if ($activation['headers']['status-code'] === 200) {
+ $function = $activation;
+ }
+ }
+
$this->assertEquals($deploymentId, $function['body']['deploymentId'] ?? '', 'Deployment is not activated, deployment: ' . json_encode($function['body'], JSON_PRETTY_PRINT));
}, 120000, 500);
}
diff --git a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
index 1d61cb0ebb..1208121077 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
@@ -414,7 +414,7 @@ class FunctionsCustomClientTest extends Scope
'offset' => 2
]);
$this->assertEquals(200, $templatesOffset['headers']['status-code']);
- $this->addToAssertionCount(1, $templatesOffset['body']['templates']);
+ $this->addToAssertionCount(1);
$this->assertEquals($templates['body']['templates'][2]['id'], $templatesOffset['body']['templates'][0]['id']);
// List templates with filters
diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
index d0b2190f1c..ba518ee0b6 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@@ -1003,6 +1003,7 @@ class FunctionsCustomServerTest extends Scope
'x-appwrite-project' => $this->getProject()['$id']
];
$id = '';
+ $largeTag = null;
while (!feof($handle)) {
$curlFile = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode(@fread($handle, $chunkSize)), $mimeType, 'large-fx.tar.gz');
$headers['content-range'] = 'bytes ' . ($counter * $chunkSize) . '-' . min(((($counter * $chunkSize) + $chunkSize) - 1), $size - 1) . '/' . $size;
diff --git a/tests/e2e/Services/GraphQL/FunctionsClientTest.php b/tests/e2e/Services/GraphQL/FunctionsClientTest.php
index 234d8fa71b..8dc2fe337f 100644
--- a/tests/e2e/Services/GraphQL/FunctionsClientTest.php
+++ b/tests/e2e/Services/GraphQL/FunctionsClientTest.php
@@ -24,8 +24,8 @@ class FunctionsClientTest extends Scope
protected function setupFunction(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedFunction[$key])) {
- return static::$cachedFunction[$key];
+ if (!empty(self::$cachedFunction[$key])) {
+ return self::$cachedFunction[$key];
}
$projectId = $this->getProject()['$id'];
@@ -79,15 +79,15 @@ class FunctionsClientTest extends Scope
$this->assertIsArray($variables['body']['data']);
$this->assertArrayNotHasKey('errors', $variables['body']);
- static::$cachedFunction[$key] = $function;
+ self::$cachedFunction[$key] = $function;
return $function;
}
protected function setupDeployment(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedDeployment[$key])) {
- return static::$cachedDeployment[$key];
+ if (!empty(self::$cachedDeployment[$key])) {
+ return self::$cachedDeployment[$key];
}
$function = $this->setupFunction();
@@ -146,15 +146,15 @@ class FunctionsClientTest extends Scope
$this->assertEquals('ready', $deployment['status']);
}, 60000);
- static::$cachedDeployment[$key] = $deployment;
+ self::$cachedDeployment[$key] = $deployment;
return $deployment;
}
protected function setupExecution(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedExecution[$key])) {
- return static::$cachedExecution[$key];
+ if (!empty(self::$cachedExecution[$key])) {
+ return self::$cachedExecution[$key];
}
$function = $this->setupFunction();
@@ -177,8 +177,8 @@ class FunctionsClientTest extends Scope
$this->assertIsArray($execution['body']['data']);
$this->assertArrayNotHasKey('errors', $execution['body']);
- static::$cachedExecution[$key] = $execution['body']['data']['functionsCreateExecution'];
- return static::$cachedExecution[$key];
+ self::$cachedExecution[$key] = $execution['body']['data']['functionsCreateExecution'];
+ return self::$cachedExecution[$key];
}
public function testCreateFunction(): void
diff --git a/tests/e2e/Services/GraphQL/FunctionsServerTest.php b/tests/e2e/Services/GraphQL/FunctionsServerTest.php
index a66789d646..8e1c7ac7e7 100644
--- a/tests/e2e/Services/GraphQL/FunctionsServerTest.php
+++ b/tests/e2e/Services/GraphQL/FunctionsServerTest.php
@@ -25,8 +25,8 @@ class FunctionsServerTest extends Scope
protected function setupFunction(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedFunction[$key])) {
- return static::$cachedFunction[$key];
+ if (!empty(self::$cachedFunction[$key])) {
+ return self::$cachedFunction[$key];
}
$projectId = $this->getProject()['$id'];
@@ -79,15 +79,15 @@ class FunctionsServerTest extends Scope
$this->assertIsArray($variables['body']['data']);
$this->assertArrayNotHasKey('errors', $variables['body']);
- static::$cachedFunction[$key] = $function;
+ self::$cachedFunction[$key] = $function;
return $function;
}
protected function setupDeployment(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedDeployment[$key])) {
- return static::$cachedDeployment[$key];
+ if (!empty(self::$cachedDeployment[$key])) {
+ return self::$cachedDeployment[$key];
}
$function = $this->setupFunction();
@@ -149,15 +149,15 @@ class FunctionsServerTest extends Scope
$this->assertEquals('ready', $deployment['status']);
}, 120000);
- static::$cachedDeployment[$key] = $deployment;
+ self::$cachedDeployment[$key] = $deployment;
return $deployment;
}
protected function setupExecution(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedExecution[$key])) {
- return static::$cachedExecution[$key];
+ if (!empty(self::$cachedExecution[$key])) {
+ return self::$cachedExecution[$key];
}
$deployment = $this->setupDeployment();
@@ -179,8 +179,8 @@ class FunctionsServerTest extends Scope
$this->assertIsArray($execution['body']['data']);
$this->assertArrayNotHasKey('errors', $execution['body']);
- static::$cachedExecution[$key] = $execution['body']['data']['functionsCreateExecution'];
- return static::$cachedExecution[$key];
+ self::$cachedExecution[$key] = $execution['body']['data']['functionsCreateExecution'];
+ return self::$cachedExecution[$key];
}
public function testCreateFunction(): void
@@ -496,8 +496,8 @@ class FunctionsServerTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedDeployment[$key] = [];
- static::$cachedExecution[$key] = [];
+ self::$cachedDeployment[$key] = [];
+ self::$cachedExecution[$key] = [];
}
/**
@@ -529,6 +529,6 @@ class FunctionsServerTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedFunction[$key] = [];
+ self::$cachedFunction[$key] = [];
}
}
diff --git a/tests/e2e/Services/GraphQL/Legacy/AbuseTest.php b/tests/e2e/Services/GraphQL/Legacy/AbuseTest.php
index dfec046f55..39939fdc0e 100644
--- a/tests/e2e/Services/GraphQL/Legacy/AbuseTest.php
+++ b/tests/e2e/Services/GraphQL/Legacy/AbuseTest.php
@@ -102,7 +102,7 @@ class AbuseTest extends Scope
$maxQueries = System::getEnv('_APP_GRAPHQL_MAX_QUERIES', 10);
$query = [];
- for ($i = 0; $i <= $maxQueries + 1; $i++) {
+ for ($i = 0; $i <= ((int) $maxQueries) + 1; $i++) {
$query[] = ['query' => $this->getQuery(self::LIST_COUNTRIES)];
}
diff --git a/tests/e2e/Services/GraphQL/Legacy/DatabaseClientTest.php b/tests/e2e/Services/GraphQL/Legacy/DatabaseClientTest.php
index 4d34dc6b23..a4987c4078 100644
--- a/tests/e2e/Services/GraphQL/Legacy/DatabaseClientTest.php
+++ b/tests/e2e/Services/GraphQL/Legacy/DatabaseClientTest.php
@@ -43,8 +43,8 @@ class DatabaseClientTest extends Scope
protected function setupDatabase(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$database[$cacheKey])) {
- return static::$database[$cacheKey];
+ if (!empty(self::$database[$cacheKey])) {
+ return self::$database[$cacheKey];
}
$projectId = $this->getProject()['$id'];
@@ -71,9 +71,9 @@ class DatabaseClientTest extends Scope
}
$this->assertIsArray($database['body']['data']);
- static::$database[$cacheKey] = $database['body']['data']['databasesCreate'];
+ self::$database[$cacheKey] = $database['body']['data']['databasesCreate'];
- return static::$database[$cacheKey];
+ return self::$database[$cacheKey];
}
/**
@@ -82,8 +82,8 @@ class DatabaseClientTest extends Scope
protected function setupCollection(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$collection[$cacheKey])) {
- return static::$collection[$cacheKey];
+ if (!empty(self::$collection[$cacheKey])) {
+ return self::$collection[$cacheKey];
}
$database = $this->setupDatabase();
@@ -121,12 +121,12 @@ class DatabaseClientTest extends Scope
$this->assertIsArray($collection['body']['data']);
- static::$collection[$cacheKey] = [
+ self::$collection[$cacheKey] = [
'database' => $database,
'collection' => $collection['body']['data']['databasesCreateCollection'],
];
- return static::$collection[$cacheKey];
+ return self::$collection[$cacheKey];
}
/**
@@ -206,8 +206,8 @@ class DatabaseClientTest extends Scope
protected function setupDocument(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$document[$cacheKey])) {
- return static::$document[$cacheKey];
+ if (!empty(self::$document[$cacheKey])) {
+ return self::$document[$cacheKey];
}
$data = $this->setupAttributes();
@@ -256,13 +256,13 @@ class DatabaseClientTest extends Scope
$this->assertArrayNotHasKey('errors', $document['body']);
$this->assertIsArray($document['body']['data']);
- static::$document[$cacheKey] = [
+ self::$document[$cacheKey] = [
'database' => $data['database'],
'collection' => $data['collection'],
'document' => $document['body']['data']['databasesCreateDocument'],
];
- return static::$document[$cacheKey];
+ return self::$document[$cacheKey];
}
/**
@@ -271,8 +271,8 @@ class DatabaseClientTest extends Scope
protected function setupBulkData(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$bulkData[$cacheKey])) {
- return static::$bulkData[$cacheKey];
+ if (!empty(self::$bulkData[$cacheKey])) {
+ return self::$bulkData[$cacheKey];
}
$project = $this->getProject();
@@ -352,13 +352,13 @@ class DatabaseClientTest extends Scope
$this->assertArrayNotHasKey('errors', $res['body']);
$this->assertCount(10, $res['body']['data']['databasesCreateDocuments']['documents']);
- static::$bulkData[$cacheKey] = [
+ self::$bulkData[$cacheKey] = [
'databaseId' => $databaseId,
'collectionId' => $collectionId,
'projectId' => $projectId,
];
- return static::$bulkData[$cacheKey];
+ return self::$bulkData[$cacheKey];
}
/**
diff --git a/tests/e2e/Services/GraphQL/MessagingTest.php b/tests/e2e/Services/GraphQL/MessagingTest.php
index 322c51c1f7..c76b9a2e4d 100644
--- a/tests/e2e/Services/GraphQL/MessagingTest.php
+++ b/tests/e2e/Services/GraphQL/MessagingTest.php
@@ -26,8 +26,8 @@ class MessagingTest extends Scope
protected function setupProviders(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedProviders[$key])) {
- return static::$cachedProviders[$key];
+ if (!empty(self::$cachedProviders[$key])) {
+ return self::$cachedProviders[$key];
}
$providersParams = [
@@ -128,15 +128,15 @@ class MessagingTest extends Scope
$this->assertEquals($providersParams[$providerKey]['name'], $response['body']['data']['messagingCreate' . $providerKey . 'Provider']['name']);
}
- static::$cachedProviders[$key] = $providers;
+ self::$cachedProviders[$key] = $providers;
return $providers;
}
protected function setupUpdatedProviders(): array
{
$key = $this->getProject()['$id'] . '_updated';
- if (!empty(static::$cachedProviders[$key])) {
- return static::$cachedProviders[$key];
+ if (!empty(self::$cachedProviders[$key])) {
+ return self::$cachedProviders[$key];
}
$providers = $this->setupProviders();
@@ -247,15 +247,15 @@ class MessagingTest extends Scope
$this->assertEquals('Mailgun2', $response['body']['data']['messagingUpdateMailgunProvider']['name']);
$this->assertEquals(false, $response['body']['data']['messagingUpdateMailgunProvider']['enabled']);
- static::$cachedProviders[$key] = $providers;
+ self::$cachedProviders[$key] = $providers;
return $providers;
}
protected function setupTopic(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedTopic[$key])) {
- return static::$cachedTopic[$key];
+ if (!empty(self::$cachedTopic[$key])) {
+ return self::$cachedTopic[$key];
}
$query = $this->getQuery(self::CREATE_TOPIC);
@@ -275,15 +275,15 @@ class MessagingTest extends Scope
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals('topic1', $response['body']['data']['messagingCreateTopic']['name']);
- static::$cachedTopic[$key] = $response['body']['data']['messagingCreateTopic'];
- return static::$cachedTopic[$key];
+ self::$cachedTopic[$key] = $response['body']['data']['messagingCreateTopic'];
+ return self::$cachedTopic[$key];
}
protected function setupUpdatedTopic(): string
{
$key = $this->getProject()['$id'] . '_updated';
- if (!empty(static::$cachedTopic[$key])) {
- return static::$cachedTopic[$key];
+ if (!empty(self::$cachedTopic[$key])) {
+ return self::$cachedTopic[$key];
}
$topic = $this->setupTopic();
@@ -306,15 +306,15 @@ class MessagingTest extends Scope
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals('topic2', $response['body']['data']['messagingUpdateTopic']['name']);
- static::$cachedTopic[$key] = $topicId;
+ self::$cachedTopic[$key] = $topicId;
return $topicId;
}
protected function setupSubscriber(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedSubscriber[$key])) {
- return static::$cachedSubscriber[$key];
+ if (!empty(self::$cachedSubscriber[$key])) {
+ return self::$cachedSubscriber[$key];
}
$topic = $this->setupTopic();
@@ -386,15 +386,15 @@ class MessagingTest extends Scope
$this->assertEquals($response['body']['data']['messagingCreateSubscriber']['targetId'], $targetId);
$this->assertEquals($response['body']['data']['messagingCreateSubscriber']['target']['userId'], $userId);
- static::$cachedSubscriber[$key] = $response['body']['data']['messagingCreateSubscriber'];
- return static::$cachedSubscriber[$key];
+ self::$cachedSubscriber[$key] = $response['body']['data']['messagingCreateSubscriber'];
+ return self::$cachedSubscriber[$key];
}
protected function setupEmail(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedEmail[$key])) {
- return static::$cachedEmail[$key];
+ if (!empty(self::$cachedEmail[$key])) {
+ return self::$cachedEmail[$key];
}
if (empty(System::getEnv('_APP_MESSAGE_EMAIL_TEST_DSN'))) {
@@ -409,7 +409,7 @@ class MessagingTest extends Scope
$apiKey = $emailDSN->getPassword();
$domain = $emailDSN->getUser();
- if (empty($to) || empty($from) || empty($apiKey) || empty($domain) || empty($isEuRegion)) {
+ if (empty($to) || empty($fromName) || empty($fromEmail) || empty($apiKey) || empty($domain) || empty($isEuRegion)) {
$this->markTestSkipped('Email provider not configured');
}
@@ -550,15 +550,15 @@ class MessagingTest extends Scope
$this->assertEquals(1, $message['body']['data']['messagingGetMessage']['deliveredTotal']);
$this->assertEquals(0, \count($message['body']['data']['messagingGetMessage']['deliveryErrors']));
- static::$cachedEmail[$key] = $message['body']['data']['messagingGetMessage'];
- return static::$cachedEmail[$key];
+ self::$cachedEmail[$key] = $message['body']['data']['messagingGetMessage'];
+ return self::$cachedEmail[$key];
}
protected function setupSms(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedSms[$key])) {
- return static::$cachedSms[$key];
+ if (!empty(self::$cachedSms[$key])) {
+ return self::$cachedSms[$key];
}
if (empty(System::getEnv('_APP_MESSAGE_SMS_TEST_DSN'))) {
@@ -709,15 +709,15 @@ class MessagingTest extends Scope
$this->assertEquals(1, $message['body']['data']['messagingGetMessage']['deliveredTotal']);
$this->assertEquals(0, \count($message['body']['data']['messagingGetMessage']['deliveryErrors']));
- static::$cachedSms[$key] = $message['body']['data']['messagingGetMessage'];
- return static::$cachedSms[$key];
+ self::$cachedSms[$key] = $message['body']['data']['messagingGetMessage'];
+ return self::$cachedSms[$key];
}
protected function setupPush(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedPush[$key])) {
- return static::$cachedPush[$key];
+ if (!empty(self::$cachedPush[$key])) {
+ return self::$cachedPush[$key];
}
if (empty(System::getEnv('_APP_MESSAGE_PUSH_TEST_DSN'))) {
@@ -870,8 +870,8 @@ class MessagingTest extends Scope
$this->assertEquals(1, $message['body']['data']['messagingGetMessage']['deliveredTotal']);
$this->assertEquals(0, \count($message['body']['data']['messagingGetMessage']['deliveryErrors']));
- static::$cachedPush[$key] = $message['body']['data']['messagingGetMessage'];
- return static::$cachedPush[$key];
+ self::$cachedPush[$key] = $message['body']['data']['messagingGetMessage'];
+ return self::$cachedPush[$key];
}
public function testCreateProviders(): void
@@ -945,8 +945,8 @@ class MessagingTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedProviders[$key] = [];
- static::$cachedProviders[$key . '_updated'] = [];
+ self::$cachedProviders[$key] = [];
+ self::$cachedProviders[$key . '_updated'] = [];
}
public function testCreateTopic(): void
@@ -1081,7 +1081,7 @@ class MessagingTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedSubscriber[$key] = [];
+ self::$cachedSubscriber[$key] = [];
}
public function testDeleteTopic()
@@ -1105,8 +1105,8 @@ class MessagingTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedTopic[$key] = [];
- static::$cachedTopic[$key . '_updated'] = [];
+ self::$cachedTopic[$key] = [];
+ self::$cachedTopic[$key . '_updated'] = [];
}
public function testSendEmail(): void
diff --git a/tests/e2e/Services/GraphQL/StorageClientTest.php b/tests/e2e/Services/GraphQL/StorageClientTest.php
index 84af910a50..25041e843b 100644
--- a/tests/e2e/Services/GraphQL/StorageClientTest.php
+++ b/tests/e2e/Services/GraphQL/StorageClientTest.php
@@ -23,8 +23,8 @@ class StorageClientTest extends Scope
protected function setupBucket(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedBucket[$key])) {
- return static::$cachedBucket[$key];
+ if (!empty(self::$cachedBucket[$key])) {
+ return self::$cachedBucket[$key];
}
$projectId = $this->getProject()['$id'];
@@ -55,15 +55,15 @@ class StorageClientTest extends Scope
$bucket = $bucket['body']['data']['storageCreateBucket'];
$this->assertEquals('Actors', $bucket['name']);
- static::$cachedBucket[$key] = $bucket;
+ self::$cachedBucket[$key] = $bucket;
return $bucket;
}
protected function setupFile(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedFile[$key])) {
- return static::$cachedFile[$key];
+ if (!empty(self::$cachedFile[$key])) {
+ return self::$cachedFile[$key];
}
$bucket = $this->setupBucket();
@@ -99,8 +99,8 @@ class StorageClientTest extends Scope
$this->assertIsArray($file['body']['data']);
$this->assertArrayNotHasKey('errors', $file['body']);
- static::$cachedFile[$key] = $file['body']['data']['storageCreateFile'];
- return static::$cachedFile[$key];
+ self::$cachedFile[$key] = $file['body']['data']['storageCreateFile'];
+ return self::$cachedFile[$key];
}
public function testCreateBucket(): void
@@ -229,6 +229,8 @@ class StorageClientTest extends Scope
], $this->getHeaders()), $gqlPayload);
$this->assertEquals(47218, \strlen($file['body']));
+
+ return $file;
}
/**
@@ -319,6 +321,6 @@ class StorageClientTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedFile[$key] = [];
+ self::$cachedFile[$key] = [];
}
}
diff --git a/tests/e2e/Services/GraphQL/StorageServerTest.php b/tests/e2e/Services/GraphQL/StorageServerTest.php
index 8a3158a98b..cc4c8ecec3 100644
--- a/tests/e2e/Services/GraphQL/StorageServerTest.php
+++ b/tests/e2e/Services/GraphQL/StorageServerTest.php
@@ -23,8 +23,8 @@ class StorageServerTest extends Scope
protected function setupBucket(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedBucket[$key])) {
- return static::$cachedBucket[$key];
+ if (!empty(self::$cachedBucket[$key])) {
+ return self::$cachedBucket[$key];
}
$projectId = $this->getProject()['$id'];
@@ -54,15 +54,15 @@ class StorageServerTest extends Scope
$bucket = $bucket['body']['data']['storageCreateBucket'];
$this->assertEquals('Actors', $bucket['name']);
- static::$cachedBucket[$key] = $bucket;
+ self::$cachedBucket[$key] = $bucket;
return $bucket;
}
protected function setupFile(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedFile[$key])) {
- return static::$cachedFile[$key];
+ if (!empty(self::$cachedFile[$key])) {
+ return self::$cachedFile[$key];
}
$bucket = $this->setupBucket();
@@ -98,8 +98,8 @@ class StorageServerTest extends Scope
$this->assertIsArray($file['body']['data']);
$this->assertArrayNotHasKey('errors', $file['body']);
- static::$cachedFile[$key] = $file['body']['data']['storageCreateFile'];
- return static::$cachedFile[$key];
+ self::$cachedFile[$key] = $file['body']['data']['storageCreateFile'];
+ return self::$cachedFile[$key];
}
public function testCreateBucket(): void
@@ -291,6 +291,8 @@ class StorageServerTest extends Scope
], $this->getHeaders()), $gqlPayload);
$this->assertEquals(47218, \strlen($file['body']));
+
+ return $file;
}
/**
@@ -413,7 +415,7 @@ class StorageServerTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedFile[$key] = [];
+ self::$cachedFile[$key] = [];
}
/**
@@ -443,7 +445,7 @@ class StorageServerTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedBucket[$key] = [];
- static::$cachedFile[$key] = [];
+ self::$cachedBucket[$key] = [];
+ self::$cachedFile[$key] = [];
}
}
diff --git a/tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php b/tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php
index 05185149fd..c358882b8b 100644
--- a/tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php
+++ b/tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php
@@ -102,7 +102,7 @@ class AbuseTest extends Scope
$maxQueries = System::getEnv('_APP_GRAPHQL_MAX_QUERIES', 10);
$query = [];
- for ($i = 0; $i <= $maxQueries + 1; $i++) {
+ for ($i = 0; $i <= ((int) $maxQueries) + 1; $i++) {
$query[] = ['query' => $this->getQuery(self::LIST_COUNTRIES)];
}
diff --git a/tests/e2e/Services/GraphQL/TablesDB/DatabaseServerTest.php b/tests/e2e/Services/GraphQL/TablesDB/DatabaseServerTest.php
index 3078202546..f0b4e4b75c 100644
--- a/tests/e2e/Services/GraphQL/TablesDB/DatabaseServerTest.php
+++ b/tests/e2e/Services/GraphQL/TablesDB/DatabaseServerTest.php
@@ -39,8 +39,8 @@ class DatabaseServerTest extends Scope
protected function setupDatabase(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedDatabase[$cacheKey])) {
- return static::$cachedDatabase[$cacheKey];
+ if (!empty(self::$cachedDatabase[$cacheKey])) {
+ return self::$cachedDatabase[$cacheKey];
}
$projectId = $this->getProject()['$id'];
@@ -62,15 +62,15 @@ class DatabaseServerTest extends Scope
$this->assertArrayNotHasKey('errors', $database['body']);
- static::$cachedDatabase[$cacheKey] = $database['body']['data']['tablesDBCreate'];
- return static::$cachedDatabase[$cacheKey];
+ self::$cachedDatabase[$cacheKey] = $database['body']['data']['tablesDBCreate'];
+ return self::$cachedDatabase[$cacheKey];
}
protected function setupTable(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedTableData[$cacheKey])) {
- return static::$cachedTableData[$cacheKey];
+ if (!empty(self::$cachedTableData[$cacheKey])) {
+ return self::$cachedTableData[$cacheKey];
}
$database = $this->setupDatabase();
@@ -124,20 +124,20 @@ class DatabaseServerTest extends Scope
$this->assertArrayNotHasKey('errors', $table2['body']);
$table2 = $table2['body']['data']['tablesDBCreateTable'];
- static::$cachedTableData[$cacheKey] = [
+ self::$cachedTableData[$cacheKey] = [
'database' => $database,
'table' => $table,
'table2' => $table2,
];
- return static::$cachedTableData[$cacheKey];
+ return self::$cachedTableData[$cacheKey];
}
protected function setupStringColumn(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedStringColumnData[$cacheKey])) {
- return static::$cachedStringColumnData[$cacheKey];
+ if (!empty(self::$cachedStringColumnData[$cacheKey])) {
+ return self::$cachedStringColumnData[$cacheKey];
}
$data = $this->setupTable();
@@ -159,8 +159,8 @@ class DatabaseServerTest extends Scope
'x-appwrite-project' => $projectId,
], $this->getHeaders()), $gqlPayload);
- static::$cachedStringColumnData[$cacheKey] = $data;
- return static::$cachedStringColumnData[$cacheKey];
+ self::$cachedStringColumnData[$cacheKey] = $data;
+ return self::$cachedStringColumnData[$cacheKey];
}
protected function setupUpdatedStringColumn(): array
@@ -205,8 +205,8 @@ class DatabaseServerTest extends Scope
protected function setupIntegerColumn(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedIntegerColumnData[$cacheKey])) {
- return static::$cachedIntegerColumnData[$cacheKey];
+ if (!empty(self::$cachedIntegerColumnData[$cacheKey])) {
+ return self::$cachedIntegerColumnData[$cacheKey];
}
$data = $this->setupTable();
@@ -229,8 +229,8 @@ class DatabaseServerTest extends Scope
'x-appwrite-project' => $projectId,
], $this->getHeaders()), $gqlPayload);
- static::$cachedIntegerColumnData[$cacheKey] = $data;
- return static::$cachedIntegerColumnData[$cacheKey];
+ self::$cachedIntegerColumnData[$cacheKey] = $data;
+ return self::$cachedIntegerColumnData[$cacheKey];
}
protected function setupUpdatedIntegerColumn(): array
@@ -275,8 +275,8 @@ class DatabaseServerTest extends Scope
protected function setupBooleanColumn(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedBooleanColumnData[$cacheKey])) {
- return static::$cachedBooleanColumnData[$cacheKey];
+ if (!empty(self::$cachedBooleanColumnData[$cacheKey])) {
+ return self::$cachedBooleanColumnData[$cacheKey];
}
$data = $this->setupTable();
@@ -297,8 +297,8 @@ class DatabaseServerTest extends Scope
'x-appwrite-project' => $projectId,
], $this->getHeaders()), $gqlPayload);
- static::$cachedBooleanColumnData[$cacheKey] = $data;
- return static::$cachedBooleanColumnData[$cacheKey];
+ self::$cachedBooleanColumnData[$cacheKey] = $data;
+ return self::$cachedBooleanColumnData[$cacheKey];
}
protected function setupUpdatedBooleanColumn(): array
@@ -341,8 +341,8 @@ class DatabaseServerTest extends Scope
protected function setupFloatColumn(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedFloatColumnData[$cacheKey])) {
- return static::$cachedFloatColumnData[$cacheKey];
+ if (!empty(self::$cachedFloatColumnData[$cacheKey])) {
+ return self::$cachedFloatColumnData[$cacheKey];
}
$data = $this->setupTable();
@@ -366,8 +366,8 @@ class DatabaseServerTest extends Scope
'x-appwrite-project' => $projectId,
], $this->getHeaders()), $gqlPayload);
- static::$cachedFloatColumnData[$cacheKey] = $data;
- return static::$cachedFloatColumnData[$cacheKey];
+ self::$cachedFloatColumnData[$cacheKey] = $data;
+ return self::$cachedFloatColumnData[$cacheKey];
}
protected function setupUpdatedFloatColumn(): array
@@ -412,8 +412,8 @@ class DatabaseServerTest extends Scope
protected function setupEmailColumn(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedEmailColumnData[$cacheKey])) {
- return static::$cachedEmailColumnData[$cacheKey];
+ if (!empty(self::$cachedEmailColumnData[$cacheKey])) {
+ return self::$cachedEmailColumnData[$cacheKey];
}
$data = $this->setupTable();
@@ -434,8 +434,8 @@ class DatabaseServerTest extends Scope
'x-appwrite-project' => $projectId,
], $this->getHeaders()), $gqlPayload);
- static::$cachedEmailColumnData[$cacheKey] = $data;
- return static::$cachedEmailColumnData[$cacheKey];
+ self::$cachedEmailColumnData[$cacheKey] = $data;
+ return self::$cachedEmailColumnData[$cacheKey];
}
protected function setupUpdatedEmailColumn(): array
@@ -478,8 +478,8 @@ class DatabaseServerTest extends Scope
protected function setupEnumColumn(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedEnumColumnData[$cacheKey])) {
- return static::$cachedEnumColumnData[$cacheKey];
+ if (!empty(self::$cachedEnumColumnData[$cacheKey])) {
+ return self::$cachedEnumColumnData[$cacheKey];
}
$data = $this->setupTable();
@@ -505,8 +505,8 @@ class DatabaseServerTest extends Scope
'x-appwrite-project' => $projectId,
], $this->getHeaders()), $gqlPayload);
- static::$cachedEnumColumnData[$cacheKey] = $data;
- return static::$cachedEnumColumnData[$cacheKey];
+ self::$cachedEnumColumnData[$cacheKey] = $data;
+ return self::$cachedEnumColumnData[$cacheKey];
}
protected function setupUpdatedEnumColumn(): array
@@ -554,8 +554,8 @@ class DatabaseServerTest extends Scope
protected function setupDatetimeColumn(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedDatetimeColumnData[$cacheKey])) {
- return static::$cachedDatetimeColumnData[$cacheKey];
+ if (!empty(self::$cachedDatetimeColumnData[$cacheKey])) {
+ return self::$cachedDatetimeColumnData[$cacheKey];
}
$data = $this->setupTable();
@@ -576,8 +576,8 @@ class DatabaseServerTest extends Scope
'x-appwrite-project' => $projectId,
], $this->getHeaders()), $gqlPayload);
- static::$cachedDatetimeColumnData[$cacheKey] = $data;
- return static::$cachedDatetimeColumnData[$cacheKey];
+ self::$cachedDatetimeColumnData[$cacheKey] = $data;
+ return self::$cachedDatetimeColumnData[$cacheKey];
}
protected function setupUpdatedDatetimeColumn(): array
@@ -620,8 +620,8 @@ class DatabaseServerTest extends Scope
protected function setupRelationshipColumn(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedRelationshipColumnData[$cacheKey])) {
- return static::$cachedRelationshipColumnData[$cacheKey];
+ if (!empty(self::$cachedRelationshipColumnData[$cacheKey])) {
+ return self::$cachedRelationshipColumnData[$cacheKey];
}
$data = $this->setupTable();
@@ -645,8 +645,8 @@ class DatabaseServerTest extends Scope
'x-appwrite-project' => $projectId,
], $this->getHeaders()), $gqlPayload);
- static::$cachedRelationshipColumnData[$cacheKey] = $data;
- return static::$cachedRelationshipColumnData[$cacheKey];
+ self::$cachedRelationshipColumnData[$cacheKey] = $data;
+ return self::$cachedRelationshipColumnData[$cacheKey];
}
protected function setupUpdatedRelationshipColumn(): array
@@ -688,8 +688,8 @@ class DatabaseServerTest extends Scope
protected function setupIPColumn(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedIPColumnData[$cacheKey])) {
- return static::$cachedIPColumnData[$cacheKey];
+ if (!empty(self::$cachedIPColumnData[$cacheKey])) {
+ return self::$cachedIPColumnData[$cacheKey];
}
$data = $this->setupTable();
@@ -711,8 +711,8 @@ class DatabaseServerTest extends Scope
'x-appwrite-project' => $projectId,
], $this->getHeaders()), $gqlPayload);
- static::$cachedIPColumnData[$cacheKey] = $data;
- return static::$cachedIPColumnData[$cacheKey];
+ self::$cachedIPColumnData[$cacheKey] = $data;
+ return self::$cachedIPColumnData[$cacheKey];
}
protected function setupUpdatedIPColumn(): array
@@ -755,8 +755,8 @@ class DatabaseServerTest extends Scope
protected function setupURLColumn(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedURLColumnData[$cacheKey])) {
- return static::$cachedURLColumnData[$cacheKey];
+ if (!empty(self::$cachedURLColumnData[$cacheKey])) {
+ return self::$cachedURLColumnData[$cacheKey];
}
$data = $this->setupTable();
@@ -778,8 +778,8 @@ class DatabaseServerTest extends Scope
'x-appwrite-project' => $projectId,
], $this->getHeaders()), $gqlPayload);
- static::$cachedURLColumnData[$cacheKey] = $data;
- return static::$cachedURLColumnData[$cacheKey];
+ self::$cachedURLColumnData[$cacheKey] = $data;
+ return self::$cachedURLColumnData[$cacheKey];
}
protected function setupUpdatedURLColumn(): array
@@ -822,8 +822,8 @@ class DatabaseServerTest extends Scope
protected function setupIndex(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedIndexData[$cacheKey])) {
- return static::$cachedIndexData[$cacheKey];
+ if (!empty(self::$cachedIndexData[$cacheKey])) {
+ return self::$cachedIndexData[$cacheKey];
}
// Need updated string and integer columns first
@@ -855,31 +855,31 @@ class DatabaseServerTest extends Scope
if (isset($index['body']['errors'])) {
$errorMessage = $index['body']['errors'][0]['message'] ?? '';
if (strpos($errorMessage, 'already exists') !== false || strpos($errorMessage, 'Document with the requested ID already exists') !== false) {
- static::$cachedIndexData[$cacheKey] = [
+ self::$cachedIndexData[$cacheKey] = [
'database' => $data['database'],
'table' => $data['table'],
'index' => ['key' => 'index'],
];
- return static::$cachedIndexData[$cacheKey];
+ return self::$cachedIndexData[$cacheKey];
}
}
$this->assertArrayNotHasKey('errors', $index['body']);
- static::$cachedIndexData[$cacheKey] = [
+ self::$cachedIndexData[$cacheKey] = [
'database' => $data['database'],
'table' => $data['table'],
'index' => $index['body']['data']['tablesDBCreateIndex'],
];
- return static::$cachedIndexData[$cacheKey];
+ return self::$cachedIndexData[$cacheKey];
}
protected function setupRow(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedRowData[$cacheKey])) {
- return static::$cachedRowData[$cacheKey];
+ if (!empty(self::$cachedRowData[$cacheKey])) {
+ return self::$cachedRowData[$cacheKey];
}
// Need all columns that the row data references
@@ -940,20 +940,20 @@ class DatabaseServerTest extends Scope
$this->assertArrayNotHasKey('errors', $row['body']);
$row = $row['body']['data']['tablesDBCreateRow'];
- static::$cachedRowData[$cacheKey] = [
+ self::$cachedRowData[$cacheKey] = [
'database' => $data['database'],
'table' => $data['table'],
'row' => $row,
];
- return static::$cachedRowData[$cacheKey];
+ return self::$cachedRowData[$cacheKey];
}
protected function setupBulkData(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$cachedBulkData[$cacheKey])) {
- return static::$cachedBulkData[$cacheKey];
+ if (!empty(self::$cachedBulkData[$cacheKey])) {
+ return self::$cachedBulkData[$cacheKey];
}
$project = $this->getProject();
@@ -1034,9 +1034,9 @@ class DatabaseServerTest extends Scope
$this->client->call(Client::METHOD_POST, '/graphql', $headers, $payload);
- static::$cachedBulkData[$cacheKey] = compact('databaseId', 'tableId', 'projectId');
+ self::$cachedBulkData[$cacheKey] = compact('databaseId', 'tableId', 'projectId');
- return static::$cachedBulkData[$cacheKey];
+ return self::$cachedBulkData[$cacheKey];
}
public function testCreateDatabase(): void
@@ -1088,7 +1088,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedStringColumnData[$cacheKey] = $data;
+ self::$cachedStringColumnData[$cacheKey] = $data;
}
/**
@@ -1166,7 +1166,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedIntegerColumnData[$cacheKey] = $data;
+ self::$cachedIntegerColumnData[$cacheKey] = $data;
}
/**
@@ -1246,7 +1246,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedBooleanColumnData[$cacheKey] = $data;
+ self::$cachedBooleanColumnData[$cacheKey] = $data;
}
/**
@@ -1325,7 +1325,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedFloatColumnData[$cacheKey] = $data;
+ self::$cachedFloatColumnData[$cacheKey] = $data;
}
/**
@@ -1405,7 +1405,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedEmailColumnData[$cacheKey] = $data;
+ self::$cachedEmailColumnData[$cacheKey] = $data;
}
/**
@@ -1486,7 +1486,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedEnumColumnData[$cacheKey] = $data;
+ self::$cachedEnumColumnData[$cacheKey] = $data;
}
@@ -1570,7 +1570,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedDatetimeColumnData[$cacheKey] = $data;
+ self::$cachedDatetimeColumnData[$cacheKey] = $data;
}
/**
@@ -1646,7 +1646,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedRelationshipColumnData[$cacheKey] = $data;
+ self::$cachedRelationshipColumnData[$cacheKey] = $data;
}
public function testUpdateRelationshipColumn(): void
@@ -1717,7 +1717,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedIPColumnData[$cacheKey] = $data;
+ self::$cachedIPColumnData[$cacheKey] = $data;
}
/**
@@ -1794,7 +1794,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedURLColumnData[$cacheKey] = $data;
+ self::$cachedURLColumnData[$cacheKey] = $data;
}
/**
@@ -1877,7 +1877,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedIndexData[$cacheKey] = [
+ self::$cachedIndexData[$cacheKey] = [
'database' => $data['database'],
'table' => $data['table'],
'index' => $index['body']['data']['tablesDBCreateIndex'],
@@ -1952,7 +1952,7 @@ class DatabaseServerTest extends Scope
// Store for caching
$cacheKey = $this->getProject()['$id'] ?? 'default';
- static::$cachedRowData[$cacheKey] = [
+ self::$cachedRowData[$cacheKey] = [
'database' => $data['database'],
'table' => $data['table'],
'row' => $row,
diff --git a/tests/e2e/Services/GraphQL/TeamsClientTest.php b/tests/e2e/Services/GraphQL/TeamsClientTest.php
index 44cf3c9d12..e6c27f44f8 100644
--- a/tests/e2e/Services/GraphQL/TeamsClientTest.php
+++ b/tests/e2e/Services/GraphQL/TeamsClientTest.php
@@ -20,8 +20,8 @@ class TeamsClientTest extends Scope
protected function setupTeam(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedTeam[$key])) {
- return static::$cachedTeam[$key];
+ if (!empty(self::$cachedTeam[$key])) {
+ return self::$cachedTeam[$key];
}
$projectId = $this->getProject()['$id'];
@@ -45,15 +45,15 @@ class TeamsClientTest extends Scope
$team = $team['body']['data']['teamsCreate'];
$this->assertEquals('Team Name', $team['name']);
- static::$cachedTeam[$key] = $team;
+ self::$cachedTeam[$key] = $team;
return $team;
}
protected function setupMembership(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedMembership[$key])) {
- return static::$cachedMembership[$key];
+ if (!empty(self::$cachedMembership[$key])) {
+ return self::$cachedMembership[$key];
}
$team = $this->setupTeam();
@@ -82,7 +82,7 @@ class TeamsClientTest extends Scope
$this->assertEquals($team['_id'], $membership['teamId']);
$this->assertEquals(['developer'], $membership['roles']);
- static::$cachedMembership[$key] = $membership;
+ self::$cachedMembership[$key] = $membership;
return $membership;
}
@@ -211,6 +211,6 @@ class TeamsClientTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedMembership[$key] = [];
+ self::$cachedMembership[$key] = [];
}
}
diff --git a/tests/e2e/Services/GraphQL/TeamsServerTest.php b/tests/e2e/Services/GraphQL/TeamsServerTest.php
index bd0939040c..ff6e8e3c6f 100644
--- a/tests/e2e/Services/GraphQL/TeamsServerTest.php
+++ b/tests/e2e/Services/GraphQL/TeamsServerTest.php
@@ -22,8 +22,8 @@ class TeamsServerTest extends Scope
protected function setupTeam(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedTeam[$key])) {
- return static::$cachedTeam[$key];
+ if (!empty(self::$cachedTeam[$key])) {
+ return self::$cachedTeam[$key];
}
$projectId = $this->getProject()['$id'];
@@ -47,15 +47,15 @@ class TeamsServerTest extends Scope
$team = $team['body']['data']['teamsCreate'];
$this->assertEquals('Team Name', $team['name']);
- static::$cachedTeam[$key] = $team;
+ self::$cachedTeam[$key] = $team;
return $team;
}
protected function setupMembership(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedMembership[$key])) {
- return static::$cachedMembership[$key];
+ if (!empty(self::$cachedMembership[$key])) {
+ return self::$cachedMembership[$key];
}
$team = $this->setupTeam();
@@ -83,15 +83,15 @@ class TeamsServerTest extends Scope
$this->assertEquals($team['_id'], $membership['teamId']);
$this->assertEquals(['developer'], $membership['roles']);
- static::$cachedMembership[$key] = $membership;
+ self::$cachedMembership[$key] = $membership;
return $membership;
}
protected function setupTeamWithPrefs(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedTeamWithPrefs[$key])) {
- return static::$cachedTeamWithPrefs[$key];
+ if (!empty(self::$cachedTeamWithPrefs[$key])) {
+ return self::$cachedTeamWithPrefs[$key];
}
$team = $this->setupTeam();
@@ -137,7 +137,7 @@ class TeamsServerTest extends Scope
$this->assertIsArray($prefs['body']['data']['teamsUpdatePrefs']);
$this->assertEquals('{"key":"value"}', $prefs['body']['data']['teamsUpdatePrefs']['data']);
- static::$cachedTeamWithPrefs[$key] = $fetchedTeam;
+ self::$cachedTeamWithPrefs[$key] = $fetchedTeam;
return $fetchedTeam;
}
@@ -349,7 +349,7 @@ class TeamsServerTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedMembership[$key] = [];
+ self::$cachedMembership[$key] = [];
}
#[Group('cl-ignore')]
diff --git a/tests/e2e/Services/GraphQL/UsersTest.php b/tests/e2e/Services/GraphQL/UsersTest.php
index da9f761567..efe99531be 100644
--- a/tests/e2e/Services/GraphQL/UsersTest.php
+++ b/tests/e2e/Services/GraphQL/UsersTest.php
@@ -21,8 +21,8 @@ class UsersTest extends Scope
protected function setupUser(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedUser[$key])) {
- return static::$cachedUser[$key];
+ if (!empty(self::$cachedUser[$key])) {
+ return self::$cachedUser[$key];
}
$projectId = $this->getProject()['$id'];
@@ -50,15 +50,15 @@ class UsersTest extends Scope
$this->assertEquals('Project User', $user['name']);
$this->assertEquals($email, $user['email']);
- static::$cachedUser[$key] = $user;
+ self::$cachedUser[$key] = $user;
return $user;
}
protected function setupUserTarget(): array
{
$key = $this->getProject()['$id'];
- if (!empty(static::$cachedUserTarget[$key])) {
- return static::$cachedUserTarget[$key];
+ if (!empty(self::$cachedUserTarget[$key])) {
+ return self::$cachedUserTarget[$key];
}
$user = $this->setupUser();
@@ -106,8 +106,8 @@ class UsersTest extends Scope
$this->assertEquals(200, $target['headers']['status-code']);
$this->assertEquals('random-email@mail.org', $target['body']['data']['usersCreateTarget']['identifier']);
- static::$cachedUserTarget[$key] = $target['body']['data']['usersCreateTarget'];
- return static::$cachedUserTarget[$key];
+ self::$cachedUserTarget[$key] = $target['body']['data']['usersCreateTarget'];
+ return self::$cachedUserTarget[$key];
}
public function testCreateUser(): void
@@ -581,7 +581,7 @@ class UsersTest extends Scope
// Clear cache after deletion
$key = $this->getProject()['$id'];
- static::$cachedUserTarget[$key] = [];
+ self::$cachedUserTarget[$key] = [];
}
public function testDeleteUser()
diff --git a/tests/e2e/Services/Messaging/MessagingBase.php b/tests/e2e/Services/Messaging/MessagingBase.php
index 160ea61568..d83b450739 100644
--- a/tests/e2e/Services/Messaging/MessagingBase.php
+++ b/tests/e2e/Services/Messaging/MessagingBase.php
@@ -2241,7 +2241,7 @@ trait MessagingBase
$authKey = $smsDSN->getPassword();
$templateId = $smsDSN->getParam('templateId');
- if (empty($to) || empty($from) || empty($senderId) || empty($authKey)) {
+ if (empty($to) || empty($senderId) || empty($authKey)) {
$this->markTestSkipped('SMS provider not configured');
}
diff --git a/tests/e2e/Services/Migrations/MigrationsBase.php b/tests/e2e/Services/Migrations/MigrationsBase.php
index 1e8b1f5ad3..9e9ce2fbcd 100644
--- a/tests/e2e/Services/Migrations/MigrationsBase.php
+++ b/tests/e2e/Services/Migrations/MigrationsBase.php
@@ -64,8 +64,8 @@ trait MigrationsBase
*/
protected function setupMigrationDatabase(): array
{
- if (!empty(static::$cachedDatabaseData)) {
- return static::$cachedDatabaseData;
+ if (!empty(self::$cachedDatabaseData)) {
+ return self::$cachedDatabaseData;
}
$response = $this->client->call(Client::METHOD_POST, '/databases', [
@@ -81,11 +81,11 @@ trait MigrationsBase
$this->assertNotEmpty($response['body']);
$this->assertNotEmpty($response['body']['$id']);
- static::$cachedDatabaseData = [
+ self::$cachedDatabaseData = [
'databaseId' => $response['body']['$id'],
];
- return static::$cachedDatabaseData;
+ return self::$cachedDatabaseData;
}
/**
@@ -94,8 +94,8 @@ trait MigrationsBase
*/
protected function setupMigrationTable(): array
{
- if (!empty(static::$cachedTableData)) {
- return static::$cachedTableData;
+ if (!empty(self::$cachedTableData)) {
+ return self::$cachedTableData;
}
// Ensure database exists first
@@ -141,12 +141,12 @@ trait MigrationsBase
$this->assertEquals('available', $response['body']['status']);
}, 5000, 500);
- static::$cachedTableData = [
+ self::$cachedTableData = [
'databaseId' => $databaseId,
'tableId' => $tableId,
];
- return static::$cachedTableData;
+ return self::$cachedTableData;
}
public function performMigrationSync(array $body): array
@@ -670,7 +670,7 @@ trait MigrationsBase
]);
// Clear the cache since we cleaned up
- static::$cachedDatabaseData = [];
+ self::$cachedDatabaseData = [];
}
public function testAppwriteMigrationDatabasesRow(): void
@@ -757,8 +757,8 @@ trait MigrationsBase
]);
// Clear the caches since we cleaned up
- static::$cachedDatabaseData = [];
- static::$cachedTableData = [];
+ self::$cachedDatabaseData = [];
+ self::$cachedTableData = [];
}
/**
@@ -1331,7 +1331,7 @@ trait MigrationsBase
]
);
- $this->assertEventually(function () use ($missingColumn, $databaseId, $tableId) {
+ $this->assertEventually(function () use ($missingColumn) {
$migrationId = $missingColumn['body']['$id'];
$migration = $this->client->call(Client::METHOD_GET, '/migrations/'.$migrationId, array_merge([
'content-type' => 'application/json',
@@ -1363,7 +1363,7 @@ trait MigrationsBase
]
);
- $this->assertEventually(function () use ($missingColumn, $databaseId, $tableId) {
+ $this->assertEventually(function () use ($missingColumn) {
$migrationId = $missingColumn['body']['$id'];
$migration = $this->client->call(Client::METHOD_GET, '/migrations/'.$migrationId, array_merge([
'content-type' => 'application/json',
@@ -1395,7 +1395,7 @@ trait MigrationsBase
]
);
- $this->assertEventually(function () use ($irrelevantColumn, $databaseId, $tableId) {
+ $this->assertEventually(function () use ($irrelevantColumn) {
$migrationId = $irrelevantColumn['body']['$id'];
$migration = $this->client->call(Client::METHOD_GET, '/migrations/'.$migrationId, array_merge([
'content-type' => 'application/json',
@@ -1422,7 +1422,7 @@ trait MigrationsBase
]
);
- $this->assertEventually(function () use ($migration, $databaseId, $tableId) {
+ $this->assertEventually(function () use ($migration) {
$migrationId = $migration['body']['$id'];
$migration = $this->client->call(Client::METHOD_GET, '/migrations/'.$migrationId, array_merge([
'content-type' => 'application/json',
@@ -1464,7 +1464,7 @@ trait MigrationsBase
]
);
- $this->assertEventually(function () use ($migration, $databaseId, $tableId) {
+ $this->assertEventually(function () use ($migration) {
$migrationId = $migration['body']['$id'];
$migration = $this->client->call(Client::METHOD_GET, '/migrations/'.$migrationId, array_merge([
'content-type' => 'application/json',
@@ -3825,4 +3825,714 @@ trait MigrationsBase
'x-appwrite-key' => $sourceProject['apiKey'],
]);
}
+
+ public function testCreateJSONImport(): void
+ {
+ // Make a database
+ $response = $this->client->call(Client::METHOD_POST, '/databases', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ], [
+ 'databaseId' => ID::unique(),
+ 'name' => 'Test Database'
+ ]);
+
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertEquals(201, $response['headers']['status-code']);
+ $this->assertEquals('Test Database', $response['body']['name']);
+
+ $databaseId = $response['body']['$id'];
+
+ // make a table
+ $response = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ]), [
+ 'name' => 'Test table',
+ 'tableId' => ID::unique(),
+ ]);
+
+ $this->assertEquals(201, $response['headers']['status-code']);
+ $this->assertEquals($response['body']['name'], 'Test table');
+
+ $tableId = $response['body']['$id'];
+
+ // make columns
+ $response = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/columns/string', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ]), [
+ 'key' => 'name',
+ 'size' => 256,
+ 'required' => true,
+ ]);
+
+ $this->assertEquals(202, $response['headers']['status-code']);
+ $this->assertEquals($response['body']['key'], 'name');
+ $this->assertEquals($response['body']['type'], 'string');
+ $this->assertEquals($response['body']['size'], 256);
+ $this->assertEquals($response['body']['required'], true);
+
+ $response = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/columns/integer', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ]), [
+ 'key' => 'age',
+ 'min' => 18,
+ 'max' => 65,
+ 'required' => true,
+ ]);
+
+ $this->assertEquals(202, $response['headers']['status-code']);
+ $this->assertEquals($response['body']['key'], 'age');
+ $this->assertEquals($response['body']['type'], 'integer');
+ $this->assertEquals($response['body']['min'], 18);
+ $this->assertEquals($response['body']['max'], 65);
+ $this->assertEquals($response['body']['required'], true);
+
+ // make a bucket, upload a file to it!
+ $bucketOne = $this->client->call(Client::METHOD_POST, '/storage/buckets', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'bucketId' => ID::unique(),
+ 'name' => 'Test Bucket',
+ 'maximumFileSize' => 2000000, //2MB
+ 'allowedFileExtensions' => ['json'],
+ 'compression' => 'gzip',
+ 'encryption' => true
+ ]);
+ $this->assertEquals(201, $bucketOne['headers']['status-code']);
+ $this->assertNotEmpty($bucketOne['body']['$id']);
+
+ $bucketOneId = $bucketOne['body']['$id'];
+
+ $bucketIds = [
+ 'default' => $bucketOneId,
+ 'missing-column' => $bucketOneId,
+ 'irrelevant-column' => $bucketOneId,
+ 'documents-internals' => $bucketOneId,
+ ];
+
+ $fileIds = [];
+
+ foreach ($bucketIds as $label => $bucketId) {
+ $jsonFileName = match ($label) {
+ 'missing-column',
+ 'irrelevant-column',
+ 'documents-internals' => "$label.json",
+ default => 'documents.json',
+ };
+
+ $response = $this->client->call(Client::METHOD_POST, '/storage/buckets/' . $bucketId . '/files', array_merge([
+ 'content-type' => 'multipart/form-data',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'fileId' => ID::unique(),
+ 'file' => new CURLFile(realpath(__DIR__ . '/../../../resources/json/'.$jsonFileName), 'application/json', $jsonFileName),
+ ]);
+
+ $this->assertEquals(201, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertEquals($jsonFileName, $response['body']['name']);
+ $this->assertEquals('application/json', $response['body']['mimeType']);
+
+ $fileIds[$label] = $response['body']['$id'];
+ }
+
+ // missing column, fail in worker.
+ $missingColumn = $this->performJsonMigration(
+ [
+ 'fileId' => $fileIds['missing-column'],
+ 'bucketId' => $bucketIds['missing-column'],
+ 'resourceId' => $databaseId . ':' . $tableId,
+ ]
+ );
+
+ $this->assertEventually(function () use ($missingColumn) {
+ $migrationId = $missingColumn['body']['$id'];
+ $migration = $this->client->call(Client::METHOD_GET, '/migrations/'.$migrationId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $migration['headers']['status-code']);
+ $this->assertEquals('finished', $migration['body']['stage']);
+ $this->assertEquals('failed', $migration['body']['status']);
+ $this->assertEquals('JSON', $migration['body']['source']);
+ $this->assertEquals('Appwrite', $migration['body']['destination']);
+ $this->assertContains(Resource::TYPE_ROW, $migration['body']['resources']);
+
+ /* fails in batch create documents unlike csv which checks headers first! */
+ $this->assertArrayHasKey(Resource::TYPE_ROW, $migration['body']['statusCounters']);
+ $this->assertGreaterThan(0, $migration['body']['statusCounters'][Resource::TYPE_ROW]['error']);
+
+ $this->assertThat(
+ implode("\n", $migration['body']['errors']),
+ $this->stringContains('Missing required attribute')
+ );
+ $this->assertThat(
+ implode("\n", $migration['body']['errors']),
+ $this->stringContains('age')
+ );
+ }, 60_000, 500);
+
+ // irrelevant column - email, success.
+ $irrelevantColumn = $this->performJsonMigration(
+ [
+ 'fileId' => $fileIds['irrelevant-column'],
+ 'bucketId' => $bucketIds['irrelevant-column'],
+ 'resourceId' => $databaseId . ':' . $tableId,
+ ]
+ );
+
+ $this->assertEventually(function () use ($irrelevantColumn) {
+ $migrationId = $irrelevantColumn['body']['$id'];
+ $migration = $this->client->call(Client::METHOD_GET, '/migrations/'.$migrationId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $migration['headers']['status-code']);
+ $this->assertEquals('finished', $migration['body']['stage']);
+ $this->assertEquals('completed', $migration['body']['status']);
+ $this->assertEquals('JSON', $migration['body']['source']);
+ $this->assertEquals('Appwrite', $migration['body']['destination']);
+ $this->assertContains(Resource::TYPE_ROW, $migration['body']['resources']);
+ $this->assertArrayHasKey(Resource::TYPE_ROW, $migration['body']['statusCounters']);
+ $this->assertEquals(100, $migration['body']['statusCounters'][Resource::TYPE_ROW]['success']);
+ }, 10_000, 500);
+
+ // all data exists, pass.
+ $migration = $this->performJsonMigration(
+ [
+ 'endpoint' => $this->endpoint,
+ 'fileId' => $fileIds['default'],
+ 'bucketId' => $bucketIds['default'],
+ 'resourceId' => $databaseId . ':' . $tableId,
+ ]
+ );
+
+ $this->assertEventually(function () use ($migration) {
+ $migrationId = $migration['body']['$id'];
+ $migration = $this->client->call(Client::METHOD_GET, '/migrations/'.$migrationId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $migration['headers']['status-code']);
+ $this->assertEquals('finished', $migration['body']['stage']);
+ $this->assertEquals('completed', $migration['body']['status']);
+ $this->assertEquals('JSON', $migration['body']['source']);
+ $this->assertEquals('Appwrite', $migration['body']['destination']);
+ $this->assertContains(Resource::TYPE_ROW, $migration['body']['resources']);
+ $this->assertArrayHasKey(Resource::TYPE_ROW, $migration['body']['statusCounters']);
+ $this->assertEquals(100, $migration['body']['statusCounters'][Resource::TYPE_ROW]['success']);
+ }, 10_000, 500);
+
+ // get rows count
+ $rows = $this->client->call(Client::METHOD_GET, '/tablesdb/'.$databaseId.'/tables/'.$tableId.'/rows', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'queries' => [
+ Query::limit(250)->toString()
+ ]
+ ]);
+
+ $this->assertEquals(200, $rows['headers']['status-code']);
+ $this->assertIsArray($rows['body']['rows']);
+ $this->assertIsNumeric($rows['body']['total']);
+ $this->assertEquals(200, $rows['body']['total']);
+
+ // all data exists and includes internals, pass.
+ $migration = $this->performJsonMigration(
+ [
+ 'endpoint' => $this->endpoint,
+ 'fileId' => $fileIds['documents-internals'],
+ 'bucketId' => $bucketIds['documents-internals'],
+ 'resourceId' => $databaseId . ':' . $tableId,
+ ]
+ );
+
+ $this->assertEventually(function () use ($migration) {
+ $migrationId = $migration['body']['$id'];
+ $migration = $this->client->call(Client::METHOD_GET, '/migrations/'.$migrationId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $migration['headers']['status-code']);
+ $this->assertEquals('finished', $migration['body']['stage']);
+ $this->assertEquals('completed', $migration['body']['status']);
+ $this->assertEquals('JSON', $migration['body']['source']);
+ $this->assertEquals('Appwrite', $migration['body']['destination']);
+ $this->assertContains(Resource::TYPE_ROW, $migration['body']['resources']);
+ $this->assertArrayHasKey(Resource::TYPE_ROW, $migration['body']['statusCounters']);
+ $this->assertEquals(25, $migration['body']['statusCounters'][Resource::TYPE_ROW]['success']);
+ }, 10_000, 500);
+ }
+
+ private function performJsonMigration(array $body): array
+ {
+ return $this->client->call(Client::METHOD_POST, '/migrations/json/imports', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $body);
+ }
+
+ /**
+ * Test JSON export with email notification
+ */
+ public function testCreateJSONExport(): void
+ {
+ // Create a database
+ $database = $this->client->call(Client::METHOD_POST, '/databases', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ], [
+ 'databaseId' => ID::unique(),
+ 'name' => 'Test Export Database'
+ ]);
+
+ $this->assertEquals(201, $database['headers']['status-code']);
+ $databaseId = $database['body']['$id'];
+
+ // Create a collection
+ $collection = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ], [
+ 'collectionId' => ID::unique(),
+ 'name' => 'Test Export Collection',
+ 'permissions' => []
+ ]);
+
+ $this->assertEquals(201, $collection['headers']['status-code']);
+ $collectionId = $collection['body']['$id'];
+
+ // Create a simple attribute like the basic test
+ $name = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/string', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ], [
+ 'key' => 'name',
+ 'size' => 255,
+ 'required' => true,
+ ]);
+
+ $this->assertEquals(202, $name['headers']['status-code']);
+
+ // Create a simple attribute like the basic test
+ $email = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/string', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ], [
+ 'key' => 'email',
+ 'size' => 255,
+ 'required' => false,
+ ]);
+
+ $this->assertEquals(202, $email['headers']['status-code']);
+
+ \sleep(3);
+
+ // Create sample documents
+ for ($i = 1; $i <= 10; $i++) {
+ $doc = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collectionId . '/documents', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ], [
+ 'documentId' => ID::unique(),
+ 'data' => [
+ 'name' => 'Test User ' . $i,
+ 'email' => 'user' . $i . '@appwrite.io'
+ ]
+ ]);
+
+ $this->assertEquals(201, $doc['headers']['status-code'], 'Failed to create document ' . $i);
+ }
+
+ // Verify documents were created
+ $docs = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $collectionId . '/documents', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ]);
+
+ $this->assertEquals(200, $docs['headers']['status-code']);
+ $this->assertEquals(10, $docs['body']['total'], 'Expected 10 documents but got ' . $docs['body']['total']);
+
+ // Perform JSON export with notification enabled (uses internal bucket)
+ $migration = $this->client->call(Client::METHOD_POST, '/migrations/json/exports', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id']
+ ], $this->getHeaders()), [
+ 'resourceId' => $databaseId . ':' . $collectionId,
+ 'filename' => 'test-json-export',
+ 'columns' => [],
+ 'queries' => [],
+ 'notify' => true
+ ]);
+
+ $this->assertEquals(202, $migration['headers']['status-code']);
+ $this->assertNotEmpty($migration['body']['$id']);
+ $migrationId = $migration['body']['$id'];
+
+ $this->assertEventually(function () use ($migrationId) {
+ $response = $this->client->call(Client::METHOD_GET, '/migrations/' . $migrationId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals('finished', $response['body']['stage']);
+ $this->assertEquals('completed', $response['body']['status']);
+ $this->assertEquals('Appwrite', $response['body']['source']);
+ $this->assertEquals('JSON', $response['body']['destination']);
+
+ return true;
+ }, 30_000, 500);
+
+ // Check that email was sent with download link
+ $lastEmail = $this->getLastEmail();
+ $this->assertNotEmpty($lastEmail);
+ $this->assertEquals('Your JSON export is ready', $lastEmail['subject']);
+ $this->assertStringContainsStringIgnoringCase('Your data export has been completed successfully', $lastEmail['text']);
+
+ // Extract download URL from email HTML
+ \preg_match('/href="([^"]*\/storage\/buckets\/[^"]*\/push[^"]*)"/', $lastEmail['html'], $matches);
+ $this->assertNotEmpty($matches[1], 'Download URL not found in email');
+ $downloadUrl = html_entity_decode($matches[1]);
+
+ // Parse the URL to extract components
+ $components = \parse_url($downloadUrl);
+ $this->assertNotEmpty($components);
+ \parse_str($components['query'] ?? '', $queryParams);
+ $this->assertArrayHasKey('jwt', $queryParams, 'JWT not found in download URL');
+ $this->assertNotEmpty($queryParams['jwt']);
+ $this->assertArrayHasKey('project', $queryParams, 'Project not found in download URL');
+ $this->assertStringContainsString('/storage/buckets/default/files/', $downloadUrl);
+
+ // Test download with JWT
+ $path = \str_replace('/v1', '', $components['path']);
+ $downloadWithJwt = $this->client->call(Client::METHOD_GET, $path . '?project=' . $queryParams['project'] . '&jwt=' . $queryParams['jwt']);
+ $this->assertEquals(200, $downloadWithJwt['headers']['status-code'], 'Failed to download file with JWT');
+
+ // Verify the downloaded content is valid JSON
+ $jsonData = $downloadWithJwt['body'];
+ $this->assertNotEmpty($jsonData, 'JSON export should not be empty');
+ $decoded = json_decode($jsonData, true);
+ $this->assertIsArray($decoded, 'JSON should be valid and decodable');
+ $this->assertCount(10, $decoded, 'JSON should contain 10 documents');
+ $this->assertArrayHasKey('name', $decoded[0], 'JSON documents should contain name field');
+ $this->assertArrayHasKey('email', $decoded[0], 'JSON documents should contain email field');
+ $this->assertStringContainsString('Test User', $decoded[0]['name'], 'JSON should contain test data');
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId, [
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ]);
+ }
+
+ public function testCreateVectorsDBJSONExport(): void
+ {
+ $headers = [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ];
+
+ // Create vectorsdb database
+ $database = $this->client->call(Client::METHOD_POST, '/vectorsdb', $headers, [
+ 'databaseId' => ID::unique(),
+ 'name' => 'VectorsDB Export Test'
+ ]);
+ $this->assertEquals(201, $database['headers']['status-code']);
+ $databaseId = $database['body']['$id'];
+
+ // Create collection with dimension 16
+ $collection = $this->client->call(Client::METHOD_POST, '/vectorsdb/' . $databaseId . '/collections', $headers, [
+ 'collectionId' => ID::unique(),
+ 'name' => 'VecExportCol',
+ 'dimension' => 16,
+ ]);
+ $this->assertEquals(201, $collection['headers']['status-code']);
+ $collectionId = $collection['body']['$id'];
+
+ // Seed 5 documents
+ for ($i = 1; $i <= 5; $i++) {
+ $embeddings = array_map(fn () => round((mt_rand() / mt_getrandmax()) * 2 - 1, 6), range(1, 16));
+ $doc = $this->client->call(Client::METHOD_POST, '/vectorsdb/' . $databaseId . '/collections/' . $collectionId . '/documents', $headers, [
+ 'documentId' => ID::unique(),
+ 'data' => [
+ 'embeddings' => $embeddings,
+ 'metadata' => ['title' => 'Doc ' . $i, 'score' => round($i * 0.2, 1)]
+ ]
+ ]);
+ $this->assertEquals(201, $doc['headers']['status-code'], 'Failed to create vector document ' . $i);
+ }
+
+ // Trigger JSON export
+ $migration = $this->client->call(Client::METHOD_POST, '/migrations/json/exports', $headers, [
+ 'resourceId' => $databaseId . ':' . $collectionId,
+ 'filename' => 'vectorsdb-export-test',
+ 'columns' => [],
+ 'queries' => [],
+ 'notify' => false,
+ ]);
+ $this->assertEquals(202, $migration['headers']['status-code']);
+ $migrationId = $migration['body']['$id'];
+
+ // Poll until completed
+ $this->assertEventually(function () use ($migrationId, $headers) {
+ $migration = $this->client->call(Client::METHOD_GET, '/migrations/' . $migrationId, $headers);
+
+ $this->assertEquals(200, $migration['headers']['status-code']);
+ $this->assertEquals('finished', $migration['body']['stage']);
+ $this->assertEquals('completed', $migration['body']['status']);
+ $this->assertEquals('Appwrite', $migration['body']['source']);
+ $this->assertEquals('JSON', $migration['body']['destination']);
+ }, 30_000, 500);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/vectorsdb/' . $databaseId, $headers);
+ }
+
+ public function testCreateVectorsDBJSONImport(): void
+ {
+ $headers = [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ];
+
+ // Create vectorsdb database
+ $database = $this->client->call(Client::METHOD_POST, '/vectorsdb', $headers, [
+ 'databaseId' => ID::unique(),
+ 'name' => 'VectorsDB Import Test'
+ ]);
+ $this->assertEquals(201, $database['headers']['status-code']);
+ $databaseId = $database['body']['$id'];
+
+ // Create collection with dimension 16
+ $collection = $this->client->call(Client::METHOD_POST, '/vectorsdb/' . $databaseId . '/collections', $headers, [
+ 'collectionId' => ID::unique(),
+ 'name' => 'VecImportCol',
+ 'dimension' => 16,
+ ]);
+ $this->assertEquals(201, $collection['headers']['status-code']);
+ $collectionId = $collection['body']['$id'];
+
+ // Create bucket and upload test file
+ $bucket = $this->client->call(Client::METHOD_POST, '/storage/buckets', $headers, [
+ 'bucketId' => ID::unique(),
+ 'name' => 'VectorsDB Import Bucket',
+ 'maximumFileSize' => 2000000,
+ 'allowedFileExtensions' => ['json'],
+ ]);
+ $this->assertEquals(201, $bucket['headers']['status-code']);
+ $bucketId = $bucket['body']['$id'];
+
+ $file = $this->client->call(Client::METHOD_POST, '/storage/buckets/' . $bucketId . '/files', array_merge([
+ 'content-type' => 'multipart/form-data',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'fileId' => ID::unique(),
+ 'file' => new \CURLFile(realpath(__DIR__ . '/../../../resources/json/vectorsdb-documents.json'), 'application/json', 'vectorsdb-documents.json'),
+ ]);
+ $this->assertEquals(201, $file['headers']['status-code']);
+ $fileId = $file['body']['$id'];
+
+ // Trigger import
+ $migration = $this->performJsonMigration([
+ 'fileId' => $fileId,
+ 'bucketId' => $bucketId,
+ 'resourceId' => $databaseId . ':' . $collectionId,
+ ]);
+ $this->assertEquals(202, $migration['headers']['status-code']);
+
+ // Poll until completed
+ $this->assertEventually(function () use ($migration, $headers) {
+ $migrationId = $migration['body']['$id'];
+ $result = $this->client->call(Client::METHOD_GET, '/migrations/' . $migrationId, $headers);
+
+ $this->assertEquals(200, $result['headers']['status-code']);
+ $this->assertEquals('finished', $result['body']['stage']);
+ $this->assertEquals('completed', $result['body']['status']);
+ $this->assertEquals('JSON', $result['body']['source']);
+ $this->assertEquals('Appwrite', $result['body']['destination']);
+ }, 30_000, 500);
+
+ // Verify documents were imported
+ $docs = $this->client->call(Client::METHOD_GET, '/vectorsdb/' . $databaseId . '/collections/' . $collectionId . '/documents', $headers);
+ $this->assertEquals(200, $docs['headers']['status-code']);
+ $this->assertEquals(10, $docs['body']['total'], 'Should have imported 10 vectorsdb documents');
+
+ // Verify first document structure
+ $firstDoc = $docs['body']['documents'][0];
+ $this->assertArrayHasKey('embeddings', $firstDoc);
+ $this->assertCount(16, $firstDoc['embeddings'], 'Imported embeddings should have 16 dimensions');
+ $this->assertArrayHasKey('metadata', $firstDoc);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/vectorsdb/' . $databaseId, $headers);
+ }
+
+ public function testCreateDocumentsDBJSONExport(): void
+ {
+ $headers = [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ];
+
+ // Create documentsdb database
+ $database = $this->client->call(Client::METHOD_POST, '/documentsdb', $headers, [
+ 'databaseId' => ID::unique(),
+ 'name' => 'DocumentsDB Export Test'
+ ]);
+ $this->assertEquals(201, $database['headers']['status-code']);
+ $databaseId = $database['body']['$id'];
+
+ // Create collection (schemaless — no attributes needed)
+ $collection = $this->client->call(Client::METHOD_POST, '/documentsdb/' . $databaseId . '/collections', $headers, [
+ 'collectionId' => ID::unique(),
+ 'name' => 'DocExportCol',
+ ]);
+ $this->assertEquals(201, $collection['headers']['status-code']);
+ $collectionId = $collection['body']['$id'];
+
+ // Seed 5 documents
+ for ($i = 1; $i <= 5; $i++) {
+ $doc = $this->client->call(Client::METHOD_POST, '/documentsdb/' . $databaseId . '/collections/' . $collectionId . '/documents', $headers, [
+ 'documentId' => ID::unique(),
+ 'data' => [
+ 'name' => 'User ' . $i,
+ 'email' => 'user' . $i . '@test.com',
+ 'age' => 20 + $i,
+ 'address' => ['city' => 'City ' . $i, 'zip' => '1000' . $i]
+ ]
+ ]);
+ $this->assertEquals(201, $doc['headers']['status-code'], 'Failed to create document ' . $i);
+ }
+
+ // Trigger JSON export
+ $migration = $this->client->call(Client::METHOD_POST, '/migrations/json/exports', $headers, [
+ 'resourceId' => $databaseId . ':' . $collectionId,
+ 'filename' => 'documentsdb-export-test',
+ 'columns' => [],
+ 'queries' => [],
+ 'notify' => false,
+ ]);
+ $this->assertEquals(202, $migration['headers']['status-code']);
+ $migrationId = $migration['body']['$id'];
+
+ // Poll until completed
+ $this->assertEventually(function () use ($migrationId, $headers) {
+ $migration = $this->client->call(Client::METHOD_GET, '/migrations/' . $migrationId, $headers);
+
+ $this->assertEquals(200, $migration['headers']['status-code']);
+ $this->assertEquals('finished', $migration['body']['stage']);
+ $this->assertEquals('completed', $migration['body']['status']);
+ $this->assertEquals('Appwrite', $migration['body']['source']);
+ $this->assertEquals('JSON', $migration['body']['destination']);
+ }, 30_000, 500);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/documentsdb/' . $databaseId, $headers);
+ }
+
+ public function testCreateDocumentsDBJSONImport(): void
+ {
+ $headers = [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey']
+ ];
+
+ // Create documentsdb database
+ $database = $this->client->call(Client::METHOD_POST, '/documentsdb', $headers, [
+ 'databaseId' => ID::unique(),
+ 'name' => 'DocumentsDB Import Test'
+ ]);
+ $this->assertEquals(201, $database['headers']['status-code']);
+ $databaseId = $database['body']['$id'];
+
+ // Create collection (schemaless)
+ $collection = $this->client->call(Client::METHOD_POST, '/documentsdb/' . $databaseId . '/collections', $headers, [
+ 'collectionId' => ID::unique(),
+ 'name' => 'DocImportCol',
+ ]);
+ $this->assertEquals(201, $collection['headers']['status-code']);
+ $collectionId = $collection['body']['$id'];
+
+ // Create bucket and upload test file
+ $bucket = $this->client->call(Client::METHOD_POST, '/storage/buckets', $headers, [
+ 'bucketId' => ID::unique(),
+ 'name' => 'DocumentsDB Import Bucket',
+ 'maximumFileSize' => 2000000,
+ 'allowedFileExtensions' => ['json'],
+ ]);
+ $this->assertEquals(201, $bucket['headers']['status-code']);
+ $bucketId = $bucket['body']['$id'];
+
+ $file = $this->client->call(Client::METHOD_POST, '/storage/buckets/' . $bucketId . '/files', array_merge([
+ 'content-type' => 'multipart/form-data',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'fileId' => ID::unique(),
+ 'file' => new \CURLFile(realpath(__DIR__ . '/../../../resources/json/documentsdb-documents.json'), 'application/json', 'documentsdb-documents.json'),
+ ]);
+ $this->assertEquals(201, $file['headers']['status-code']);
+ $fileId = $file['body']['$id'];
+
+ // Trigger import
+ $migration = $this->performJsonMigration([
+ 'fileId' => $fileId,
+ 'bucketId' => $bucketId,
+ 'resourceId' => $databaseId . ':' . $collectionId,
+ ]);
+ $this->assertEquals(202, $migration['headers']['status-code']);
+
+ // Poll until completed
+ $this->assertEventually(function () use ($migration, $headers) {
+ $migrationId = $migration['body']['$id'];
+ $result = $this->client->call(Client::METHOD_GET, '/migrations/' . $migrationId, $headers);
+
+ $this->assertEquals(200, $result['headers']['status-code']);
+ $this->assertEquals('finished', $result['body']['stage']);
+ $this->assertEquals('completed', $result['body']['status']);
+ $this->assertEquals('JSON', $result['body']['source']);
+ $this->assertEquals('Appwrite', $result['body']['destination']);
+ }, 30_000, 500);
+
+ // Verify documents were imported
+ $docs = $this->client->call(Client::METHOD_GET, '/documentsdb/' . $databaseId . '/collections/' . $collectionId . '/documents', $headers);
+ $this->assertEquals(200, $docs['headers']['status-code']);
+ $this->assertEquals(10, $docs['body']['total'], 'Should have imported 10 documentsdb documents');
+
+ // Verify first document has nested data
+ $firstDoc = $docs['body']['documents'][0];
+ $this->assertArrayHasKey('name', $firstDoc);
+ $this->assertArrayHasKey('address', $firstDoc);
+ $this->assertIsArray($firstDoc['address']);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/documentsdb/' . $databaseId, $headers);
+ }
+
}
diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
index 3f84529943..481a34b070 100644
--- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
+++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
@@ -62,6 +62,9 @@ class ProjectsConsoleClientTest extends Scope
$this->assertArrayHasKey('platforms', $response['body']);
$this->assertArrayHasKey('webhooks', $response['body']);
$this->assertArrayHasKey('keys', $response['body']);
+ $this->assertEquals(false, $response['body']['authDisposableEmails']);
+ $this->assertEquals(false, $response['body']['authCanonicalEmails']);
+ $this->assertEquals(false, $response['body']['authFreeEmails']);
$response = $this->client->call(Client::METHOD_POST, '/projects', array_merge([
'content-type' => 'application/json',
diff --git a/tests/e2e/Services/Storage/StorageBase.php b/tests/e2e/Services/Storage/StorageBase.php
index 9f4105e1cb..e5bb06cc48 100644
--- a/tests/e2e/Services/Storage/StorageBase.php
+++ b/tests/e2e/Services/Storage/StorageBase.php
@@ -97,6 +97,7 @@ trait StorageBase
'x-appwrite-project' => $this->getProject()['$id']
];
$id = '';
+ $largeFile = null;
while (!feof($handle)) {
$curlFile = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode(@fread($handle, $chunkSize)), $mimeType, 'large-file.mp4');
$headers['content-range'] = 'bytes ' . ($counter * $chunkSize) . '-' . min(((($counter * $chunkSize) + $chunkSize) - 1), $size - 1) . '/' . $size;
@@ -132,7 +133,7 @@ trait StorageBase
self::$cachedBucketFile[$cacheKey] = [
'bucketId' => $bucketId,
'fileId' => $file['body']['$id'],
- 'largeFileId' => $largeFile['body']['$id'],
+ 'largeFileId' => $largeFile['body']['$id'] ?? '',
'largeBucketId' => $bucket2['body']['$id'],
'webpFileId' => $webpFile['body']['$id']
];
@@ -261,6 +262,7 @@ trait StorageBase
'x-appwrite-project' => $this->getProject()['$id']
];
$id = '';
+ $largeFile = null;
while (!feof($handle)) {
$curlFile = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode(@fread($handle, $chunkSize)), $mimeType, 'large-file.mp4');
$headers['content-range'] = 'bytes ' . ($counter * $chunkSize) . '-' . min(((($counter * $chunkSize) + $chunkSize) - 1), $size - 1) . '/' . $size;
diff --git a/tests/e2e/Services/TablesDB/DatabasesStringTypesTest.php b/tests/e2e/Services/TablesDB/DatabasesStringTypesTest.php
index 44af63fb22..b7fd982a6d 100644
--- a/tests/e2e/Services/TablesDB/DatabasesStringTypesTest.php
+++ b/tests/e2e/Services/TablesDB/DatabasesStringTypesTest.php
@@ -29,8 +29,8 @@ class DatabasesStringTypesTest extends Scope
protected function setupDatabaseAndTable(): array
{
$cacheKey = $this->getProject()['$id'] ?? 'default';
- if (!empty(static::$setupCache[$cacheKey])) {
- return static::$setupCache[$cacheKey];
+ if (!empty(self::$setupCache[$cacheKey])) {
+ return self::$setupCache[$cacheKey];
}
$projectId = $this->getProject()['$id'];
@@ -131,7 +131,7 @@ class DatabasesStringTypesTest extends Scope
// Cache before waiting so that if waitForAllAttributes times out,
// subsequent calls don't try to re-create the same columns (causing 409)
- static::$setupCache[$cacheKey] = [
+ self::$setupCache[$cacheKey] = [
'databaseId' => $databaseId,
'tableId' => $tableId,
];
@@ -139,7 +139,7 @@ class DatabasesStringTypesTest extends Scope
// Wait for all columns to be available
$this->waitForAllAttributes($databaseId, $tableId);
- return static::$setupCache[$cacheKey];
+ return self::$setupCache[$cacheKey];
}
public function testCreateDatabase(): void
diff --git a/tests/e2e/Services/Tokens/TokensBase.php b/tests/e2e/Services/Tokens/TokensBase.php
index ced6bb5dde..1fcdeb347f 100644
--- a/tests/e2e/Services/Tokens/TokensBase.php
+++ b/tests/e2e/Services/Tokens/TokensBase.php
@@ -14,8 +14,8 @@ trait TokensBase
protected function setupBucketAndFile(): array
{
- if (!empty(static::$bucketAndFileData)) {
- return static::$bucketAndFileData;
+ if (!empty(self::$bucketAndFileData)) {
+ return self::$bucketAndFileData;
}
$bucket = $this->client->call(
@@ -61,7 +61,7 @@ trait TokensBase
]
);
- static::$bucketAndFileData = [
+ self::$bucketAndFileData = [
'fileId' => $fileId,
'bucketId' => $bucketId,
'token' => $token['body'],
@@ -72,7 +72,7 @@ trait TokensBase
],
];
- return static::$bucketAndFileData;
+ return self::$bucketAndFileData;
}
public function testCreateBucketAndFile(): void
diff --git a/tests/e2e/Services/Tokens/TokensConsoleClientTest.php b/tests/e2e/Services/Tokens/TokensConsoleClientTest.php
index b7f188f5b5..601bf1d2d0 100644
--- a/tests/e2e/Services/Tokens/TokensConsoleClientTest.php
+++ b/tests/e2e/Services/Tokens/TokensConsoleClientTest.php
@@ -25,8 +25,8 @@ class TokensConsoleClientTest extends Scope
protected function setupToken(): array
{
- if (!empty(static::$tokenData)) {
- return static::$tokenData;
+ if (!empty(self::$tokenData)) {
+ return self::$tokenData;
}
$bucket = $this->client->call(Client::METHOD_POST, '/storage/buckets', array_merge([
@@ -68,13 +68,13 @@ class TokensConsoleClientTest extends Scope
'x-appwrite-project' => $this->getProject()['$id']
], $this->getHeaders()));
- static::$tokenData = [
+ self::$tokenData = [
'fileId' => $fileId,
'bucketId' => $bucketId,
'tokenId' => $token['body']['$id'],
];
- return static::$tokenData;
+ return self::$tokenData;
}
public function testCreateToken(): void
diff --git a/tests/e2e/Services/Tokens/TokensCustomServerTest.php b/tests/e2e/Services/Tokens/TokensCustomServerTest.php
index ecb9bafc89..3efa0adbe1 100644
--- a/tests/e2e/Services/Tokens/TokensCustomServerTest.php
+++ b/tests/e2e/Services/Tokens/TokensCustomServerTest.php
@@ -22,8 +22,8 @@ class TokensCustomServerTest extends Scope
protected function setupToken(): array
{
- if (!empty(static::$tokenData)) {
- return static::$tokenData;
+ if (!empty(self::$tokenData)) {
+ return self::$tokenData;
}
$bucket = $this->client->call(Client::METHOD_POST, '/storage/buckets', [
@@ -66,13 +66,13 @@ class TokensCustomServerTest extends Scope
'x-appwrite-project' => $this->getProject()['$id']
], $this->getHeaders()));
- static::$tokenData = [
+ self::$tokenData = [
'fileId' => $fileId,
'bucketId' => $bucketId,
'tokenId' => $token['body']['$id'],
];
- return static::$tokenData;
+ return self::$tokenData;
}
public function testCreateToken(): void
diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index 940746a8eb..3255d9a67f 100644
--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@@ -28,8 +28,8 @@ trait UsersBase
protected function setupUser(): array
{
$projectId = $this->getProject()['$id'];
- if (!empty(static::$cachedUser[$projectId])) {
- return static::$cachedUser[$projectId];
+ if (!empty(self::$cachedUser[$projectId])) {
+ return self::$cachedUser[$projectId];
}
$user = $this->client->call(Client::METHOD_POST, '/users', array_merge([
@@ -52,16 +52,16 @@ trait UsersBase
]);
if (!empty($response['body']['users'])) {
- static::$cachedUser[$projectId] = ['userId' => $response['body']['users'][0]['$id']];
- return static::$cachedUser[$projectId];
+ self::$cachedUser[$projectId] = ['userId' => $response['body']['users'][0]['$id']];
+ return self::$cachedUser[$projectId];
}
}
if ($user['headers']['status-code'] === 201) {
- static::$cachedUser[$projectId] = ['userId' => $user['body']['$id']];
+ self::$cachedUser[$projectId] = ['userId' => $user['body']['$id']];
}
- return static::$cachedUser[$projectId];
+ return self::$cachedUser[$projectId];
}
/**
@@ -90,7 +90,7 @@ trait UsersBase
protected function setupHashedPasswordUsers(): void
{
$projectId = $this->getProject()['$id'];
- if (!empty(static::$cachedHashedPasswordUsers[$projectId])) {
+ if (!empty(self::$cachedHashedPasswordUsers[$projectId])) {
return;
}
@@ -180,7 +180,7 @@ trait UsersBase
'passwordSignerKey' => 'XyEKE9RcTDeLEsL/RjwPDBv/RqDl8fb3gpYEOQaPihbxf1ZAtSOHCjuAAa7Q3oHpCYhXSN9tizHgVOwn6krflQ==',
]);
- static::$cachedHashedPasswordUsers[$projectId] = true;
+ self::$cachedHashedPasswordUsers[$projectId] = true;
}
/**
@@ -189,8 +189,8 @@ trait UsersBase
protected function setupUserTarget(): array
{
$projectId = $this->getProject()['$id'];
- if (!empty(static::$cachedUserTarget[$projectId])) {
- return static::$cachedUserTarget[$projectId];
+ if (!empty(self::$cachedUserTarget[$projectId])) {
+ return self::$cachedUserTarget[$projectId];
}
$data = $this->setupUser();
@@ -233,10 +233,10 @@ trait UsersBase
]);
if ($response['headers']['status-code'] === 201) {
- static::$cachedUserTarget[$projectId] = $response['body'];
+ self::$cachedUserTarget[$projectId] = $response['body'];
}
- return static::$cachedUserTarget[$projectId] ?? [];
+ return self::$cachedUserTarget[$projectId] ?? [];
}
/**
@@ -247,7 +247,7 @@ trait UsersBase
$data = $this->setupUser();
$projectId = $this->getProject()['$id'];
- if (static::$userNameUpdated) {
+ if (self::$userNameUpdated) {
return $data;
}
@@ -258,7 +258,7 @@ trait UsersBase
'name' => 'Updated name',
]);
- static::$userNameUpdated = true;
+ self::$userNameUpdated = true;
return $data;
}
@@ -270,7 +270,7 @@ trait UsersBase
$data = $this->setupUser();
$projectId = $this->getProject()['$id'];
- if (static::$userEmailUpdated) {
+ if (self::$userEmailUpdated) {
return $data;
}
@@ -281,7 +281,7 @@ trait UsersBase
'email' => 'users.service@updated.com',
]);
- static::$userEmailUpdated = true;
+ self::$userEmailUpdated = true;
return $data;
}
@@ -293,7 +293,7 @@ trait UsersBase
$data = $this->setupUser();
$projectId = $this->getProject()['$id'];
- if (static::$userNumberUpdated) {
+ if (self::$userNumberUpdated) {
return $data;
}
@@ -304,7 +304,7 @@ trait UsersBase
'number' => '+910000000000',
]);
- static::$userNumberUpdated = true;
+ self::$userNumberUpdated = true;
return $data;
}
@@ -474,7 +474,7 @@ trait UsersBase
// Cache the user ID for other tests
$projectId = $this->getProject()['$id'];
- static::$cachedUser[$projectId] = ['userId' => $body['$id']];
+ self::$cachedUser[$projectId] = ['userId' => $body['$id']];
}
/**
@@ -1274,7 +1274,7 @@ trait UsersBase
$this->assertEquals($user['body']['name'], 'Updated name');
// Mark name as updated for search tests
- static::$userNameUpdated = true;
+ self::$userNameUpdated = true;
}
public function testUpdateUserNameSearch(): void
@@ -1357,7 +1357,7 @@ trait UsersBase
$this->assertEquals($user['body']['email'], 'users.service@updated.com');
// Mark email as updated for search tests
- static::$userEmailUpdated = true;
+ self::$userEmailUpdated = true;
}
public function testUpdateUserEmailSearch(): void
@@ -1645,7 +1645,7 @@ trait UsersBase
$this->assertEquals($response['body']['type'], $errorType);
// Mark phone as updated for search tests
- static::$userNumberUpdated = true;
+ self::$userNumberUpdated = true;
}
public function testUpdateTwoUsersPhoneToEmpty(): void
@@ -1954,7 +1954,7 @@ trait UsersBase
// Cache for other tests
$projectId = $this->getProject()['$id'];
- static::$cachedUserTarget[$projectId] = $response['body'];
+ self::$cachedUserTarget[$projectId] = $response['body'];
}
public function testUpdateUserTarget(): void
@@ -1973,7 +1973,7 @@ trait UsersBase
// Update cache with new data
$projectId = $this->getProject()['$id'];
- static::$cachedUserTarget[$projectId] = $response['body'];
+ self::$cachedUserTarget[$projectId] = $response['body'];
}
public function testListUserTarget(): void
@@ -2014,7 +2014,7 @@ trait UsersBase
// Clear cached target since it was deleted
$projectId = $this->getProject()['$id'];
- unset(static::$cachedUserTarget[$projectId]);
+ unset(self::$cachedUserTarget[$projectId]);
$response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/targets', array_merge([
'content-type' => 'application/json',
diff --git a/tests/e2e/Services/VCS/VCSConsoleClientTest.php b/tests/e2e/Services/VCS/VCSConsoleClientTest.php
index b1b7e9a42a..854e7110f1 100644
--- a/tests/e2e/Services/VCS/VCSConsoleClientTest.php
+++ b/tests/e2e/Services/VCS/VCSConsoleClientTest.php
@@ -37,8 +37,8 @@ class VCSConsoleClientTest extends Scope
{
$projectId = $this->getProject()['$id'];
- if (!empty(static::$cachedInstallationId[$projectId])) {
- return static::$cachedInstallationId[$projectId];
+ if (!empty(self::$cachedInstallationId[$projectId])) {
+ return self::$cachedInstallationId[$projectId];
}
$response = $this->client->call(Client::METHOD_GET, '/mock/github/callback', array_merge([
@@ -48,8 +48,8 @@ class VCSConsoleClientTest extends Scope
'projectId' => $projectId,
]);
- static::$cachedInstallationId[$projectId] = $response['body']['installationId'];
- return static::$cachedInstallationId[$projectId];
+ self::$cachedInstallationId[$projectId] = $response['body']['installationId'];
+ return self::$cachedInstallationId[$projectId];
}
/**
@@ -60,8 +60,8 @@ class VCSConsoleClientTest extends Scope
{
$projectId = $this->getProject()['$id'];
- if (!empty(static::$cachedFunctionData[$projectId])) {
- return static::$cachedFunctionData[$projectId];
+ if (!empty(self::$cachedFunctionData[$projectId])) {
+ return self::$cachedFunctionData[$projectId];
}
$installationId = $this->setupInstallation();
@@ -86,12 +86,12 @@ class VCSConsoleClientTest extends Scope
'providerBranch' => 'main',
]);
- static::$cachedFunctionData[$projectId] = [
+ self::$cachedFunctionData[$projectId] = [
'installationId' => $installationId,
'functionId' => $function['body']['$id']
];
- return static::$cachedFunctionData[$projectId];
+ return self::$cachedFunctionData[$projectId];
}
public function testGitHubAuthorize(): void
diff --git a/tests/resources/json/documents-internals.json b/tests/resources/json/documents-internals.json
new file mode 100644
index 0000000000..6fe6820cdf
--- /dev/null
+++ b/tests/resources/json/documents-internals.json
@@ -0,0 +1,254 @@
+[
+ {
+ "$id": "z1y2x3w4v5u6t7s8",
+ "$createdAt": "2022-10-23T10:33:01+00:00",
+ "$updatedAt": "2023-03-15T12:00:41+00:00",
+ "$permissions": [
+ "read(\"any\")",
+ "update(\"user:123\")"
+ ],
+ "name": "Diamond Mendez",
+ "age": 56
+ },
+ {
+ "$id": "r9q0p1o2n3m4l5k6",
+ "$createdAt": "2021-08-11T21:05:13+00:00",
+ "$updatedAt": "2024-01-02T08:45:22+00:00",
+ "$permissions": [
+ "read(\"any\")",
+ "update(\"user:456\")"
+ ],
+ "name": "Michael Huff",
+ "age": 20
+ },
+ {
+ "$id": "j7i8h9g0f1e2d3c4",
+ "$createdAt": "2020-05-29T14:22:56+00:00",
+ "$updatedAt": "2022-11-30T18:19:33+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Alyssa Rodriguez",
+ "age": 37
+ },
+ {
+ "$id": "b5a6z7y8x9w0v1u2",
+ "$createdAt": "2023-01-18T03:44:09+00:00",
+ "$updatedAt": "2023-09-07T23:50:17+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Barbara Smith",
+ "age": 26
+ },
+ {
+ "$id": "t3s4r5q6p7o8n9m0",
+ "$createdAt": "2020-11-02T09:12:45+00:00",
+ "$updatedAt": "2021-07-21T15:30:55+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Evelyn Edwards",
+ "age": 54
+ },
+ {
+ "$id": "l1k2j3i4h5g6f7e8",
+ "$createdAt": "2022-03-19T19:55:27+00:00",
+ "$updatedAt": "2024-05-14T06:28:11+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Tina Richardson",
+ "age": 41
+ },
+ {
+ "$id": "d9c0b1a2z3y4x5w6",
+ "$createdAt": "2021-04-07T01:18:34+00:00",
+ "$updatedAt": "2023-06-25T11:47:04+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Joel Hernandez",
+ "age": 49
+ },
+ {
+ "$id": "v7u8t9s0r1q2p3o4",
+ "$createdAt": "2023-08-22T16:40:18+00:00",
+ "$updatedAt": "2024-02-19T04:09:58+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Zachary Cooper",
+ "age": 59
+ },
+ {
+ "$id": "n5m6l7k8j9i0h1g2",
+ "$createdAt": "2020-02-12T07:59:01+00:00",
+ "$updatedAt": "2022-09-08T13:21:49+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Brittany Spears",
+ "age": 20
+ },
+ {
+ "$id": "f3e4d5c6b7a8z9y0",
+ "$createdAt": "2021-12-05T22:33:12+00:00",
+ "$updatedAt": "2023-11-11T02:55:37+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Holly White",
+ "age": 47
+ },
+ {
+ "$id": "x1w2v3u4t5s6r7q8",
+ "$createdAt": "2022-07-14T05:01:50+00:00",
+ "$updatedAt": "2024-04-01T20:10:26+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Kimberly Barnes",
+ "age": 27
+ },
+ {
+ "$id": "p9o0n1m2l3k4j5i6",
+ "$createdAt": "2020-09-28T11:27:36+00:00",
+ "$updatedAt": "2021-10-17T09:38:08+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Stephen Miller",
+ "age": 53
+ },
+ {
+ "$id": "h7g8f9e0d1c2b3a4",
+ "$createdAt": "2023-04-04T08:15:59+00:00",
+ "$updatedAt": "2024-06-29T17:03:14+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Yvonne Newman",
+ "age": 41
+ },
+ {
+ "$id": "y5x6w7v8u9t0s1r2",
+ "$createdAt": "2021-01-25T18:09:21+00:00",
+ "$updatedAt": "2022-08-16T22:44:51+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Carol Kane",
+ "age": 38
+ },
+ {
+ "$id": "q3p4o5n6m7l8k9j0",
+ "$createdAt": "2022-06-09T12:53:47+00:00",
+ "$updatedAt": "2023-12-24T01:16:05+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Doris Foster",
+ "age": 44
+ },
+ {
+ "$id": "i1h2g3f4e5d6c7b8",
+ "$createdAt": "2020-07-03T23:37:02+00:00",
+ "$updatedAt": "2021-05-09T05:52:43+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Joseph Stokes",
+ "age": 28
+ },
+ {
+ "$id": "a9z0y1x2w3v4u5t6",
+ "$createdAt": "2023-10-10T02:20:15+00:00",
+ "$updatedAt": "2024-03-28T14:33:29+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Steve Williams",
+ "age": 31
+ },
+ {
+ "$id": "s7r8q9p0o1n2m3l4",
+ "$createdAt": "2021-06-16T13:48:53+00:00",
+ "$updatedAt": "2022-04-22T07:07:19+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "James Carey",
+ "age": 29
+ },
+ {
+ "$id": "k5j6i7h8g9f0e1d2",
+ "$createdAt": "2022-12-27T20:06:38+00:00",
+ "$updatedAt": "2023-08-03T10:25:57+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Kathryn Henry",
+ "age": 38
+ },
+ {
+ "$id": "c3b4a5z6y7x8w9v0",
+ "$createdAt": "2020-04-20T04:41:24+00:00",
+ "$updatedAt": "2021-02-13T19:14:06+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Christopher Landry",
+ "age": 23
+ },
+ {
+ "$id": "u1t2s3r4q5p6o7n8",
+ "$createdAt": "2023-05-08T00:58:10+00:00",
+ "$updatedAt": "2024-07-05T03:36:48+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Jennifer Mcgee",
+ "age": 62
+ },
+ {
+ "$id": "m9l0k1j2i3h4g5f6",
+ "$createdAt": "2021-09-01T06:11:42+00:00",
+ "$updatedAt": "2022-01-26T16:59:23+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Cathy Church",
+ "age": 35
+ },
+ {
+ "$id": "e7d8c9b0a1z2y3x4",
+ "$createdAt": "2022-02-18T15:24:07+00:00",
+ "$updatedAt": "2023-04-12T00:40:31+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Jose Lopez",
+ "age": 41
+ },
+ {
+ "$id": "w5v6u7t8s9r0q1p2",
+ "$createdAt": "2020-12-13T09:03:55+00:00",
+ "$updatedAt": "2021-11-06T11:23:16+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "William Rose",
+ "age": 30
+ },
+ {
+ "$id": "o3n4m5l6k7j8i9h0",
+ "$createdAt": "2021-12-13T09:03:55+00:00",
+ "$updatedAt": "2022-11-06T11:23:16+00:00",
+ "$permissions": [
+ "read(\"any\")"
+ ],
+ "name": "Charles Hammer",
+ "age": 61
+ }
+]
\ No newline at end of file
diff --git a/tests/resources/json/documents.json b/tests/resources/json/documents.json
new file mode 100644
index 0000000000..1ce5533297
--- /dev/null
+++ b/tests/resources/json/documents.json
@@ -0,0 +1,502 @@
+[
+ {
+ "$id": "hxfcwpcas5xokpwe",
+ "name": "Diamond Mendez",
+ "age": 56
+ },
+ {
+ "$id": "gw8nxwf6esn3tfwf",
+ "name": "Michael Huff",
+ "age": 20
+ },
+ {
+ "$id": "xb6bxg56lral1qy9",
+ "name": "Alyssa Rodriguez",
+ "age": 37
+ },
+ {
+ "$id": "imerjq5j36y3agh2",
+ "name": "Barbara Smith",
+ "age": 26
+ },
+ {
+ "$id": "07yq9qdlhmbzmr35",
+ "name": "Evelyn Edwards",
+ "age": 54
+ },
+ {
+ "$id": "ksqo631sbhwj5ltg",
+ "name": "Tina Richardson",
+ "age": 41
+ },
+ {
+ "$id": "j7zlndgu0gbshp15",
+ "name": "Joel Hernandez",
+ "age": 49
+ },
+ {
+ "$id": "mfntvnljrcmf7h6v",
+ "name": "Zachary Cooper",
+ "age": 59
+ },
+ {
+ "$id": "5f9b01nziqu2h8ed",
+ "name": "Brittany Spears",
+ "age": 20
+ },
+ {
+ "$id": "4vxzbnzraqznk5u8",
+ "name": "Holly White",
+ "age": 47
+ },
+ {
+ "$id": "d4ywy3mtphaatbpf",
+ "name": "Kimberly Barnes",
+ "age": 27
+ },
+ {
+ "$id": "88odnk6nthyyvbal",
+ "name": "Stephen Miller",
+ "age": 53
+ },
+ {
+ "$id": "08oekee3fn7mzaa5",
+ "name": "Yvonne Newman",
+ "age": 41
+ },
+ {
+ "$id": "quw55kn9895i5e4v",
+ "name": "Carol Kane",
+ "age": 38
+ },
+ {
+ "$id": "nge6bm8ykripei6f",
+ "name": "Doris Foster",
+ "age": 44
+ },
+ {
+ "$id": "4k16i33s0xl2ypx9",
+ "name": "Joseph Stokes",
+ "age": 28
+ },
+ {
+ "$id": "q0j5rxbgid66snyf",
+ "name": "Steve Williams",
+ "age": 31
+ },
+ {
+ "$id": "n1oxun7mqq3p103y",
+ "name": "James Carey",
+ "age": 29
+ },
+ {
+ "$id": "0dbvs840jkf8i0ye",
+ "name": "Kathryn Henry",
+ "age": 38
+ },
+ {
+ "$id": "5sfaidgs1h87v15v",
+ "name": "Christopher Landry",
+ "age": 23
+ },
+ {
+ "$id": "vg3punvfu5khmf41",
+ "name": "Jennifer Mcgee",
+ "age": 62
+ },
+ {
+ "$id": "f933qydr9u5b2r11",
+ "name": "Cathy Church",
+ "age": 35
+ },
+ {
+ "$id": "wjv87y1inf8yk32s",
+ "name": "Jose Lopez",
+ "age": 41
+ },
+ {
+ "$id": "uljysdvdlcyrbrwk",
+ "name": "William Rose",
+ "age": 30
+ },
+ {
+ "$id": "ot8xtzh77j55wq0s",
+ "name": "Sarah Ford",
+ "age": 26
+ },
+ {
+ "$id": "9t76vnsv2u36s43t",
+ "name": "Alisha Jones",
+ "age": 61
+ },
+ {
+ "$id": "66y4tnty62hw8c02",
+ "name": "Kristin Kelly",
+ "age": 61
+ },
+ {
+ "$id": "2punfblazi5v16ar",
+ "name": "Brendan Stout",
+ "age": 40
+ },
+ {
+ "$id": "sxhr4nf5w2gx4wbg",
+ "name": "Kelly Cruz",
+ "age": 18
+ },
+ {
+ "$id": "68dvrqfwqnkq5el9",
+ "name": "Samantha Martin",
+ "age": 50
+ },
+ {
+ "$id": "20192l6dbeinhkh0",
+ "name": "David Santos",
+ "age": 46
+ },
+ {
+ "$id": "si0l4dgay09ebfmf",
+ "name": "Elizabeth Carroll",
+ "age": 22
+ },
+ {
+ "$id": "lhse40vbldqb6ap1",
+ "name": "Corey Owens",
+ "age": 46
+ },
+ {
+ "$id": "h5t3pslykyx3kxfm",
+ "name": "Shelby Mueller",
+ "age": 65
+ },
+ {
+ "$id": "ldc0luydrw6jub0f",
+ "name": "Dr. Sylvia Myers",
+ "age": 29
+ },
+ {
+ "$id": "voc9628xg4dsgw2y",
+ "name": "Scott Freeman",
+ "age": 48
+ },
+ {
+ "$id": "o4y0gk3gqv1ax2fz",
+ "name": "Christopher Atkinson",
+ "age": 21
+ },
+ {
+ "$id": "u1n3x4e4u7e0vzj6",
+ "name": "Sean Diaz",
+ "age": 31
+ },
+ {
+ "$id": "s36eskwtm0w7lwr7",
+ "name": "Bobby Dyer",
+ "age": 57
+ },
+ {
+ "$id": "4hjnag1p5iwvtixd",
+ "name": "Daniel Hall",
+ "age": 62
+ },
+ {
+ "$id": "m91d80oxsa216zbh",
+ "name": "Jennifer Ramirez",
+ "age": 65
+ },
+ {
+ "$id": "5hj6858zo2g85n6v",
+ "name": "Angela Jackson",
+ "age": 57
+ },
+ {
+ "$id": "8m8oihv9a1e7nn92",
+ "name": "Kelly Lewis",
+ "age": 36
+ },
+ {
+ "$id": "7azy39la0no0mxi7",
+ "name": "Jessica Munoz",
+ "age": 55
+ },
+ {
+ "$id": "47pmjkhnnqhyit8c",
+ "name": "Kelly George",
+ "age": 65
+ },
+ {
+ "$id": "6j6cpy4kgneg1mmh",
+ "name": "Anthony Johnson",
+ "age": 65
+ },
+ {
+ "$id": "tnlmtvap1zz89km9",
+ "name": "Regina Fields",
+ "age": 61
+ },
+ {
+ "$id": "6cyuvnwwqdmrpfzh",
+ "name": "Sharon Schaefer",
+ "age": 30
+ },
+ {
+ "$id": "p1v4pyu2pqodc0ey",
+ "name": "Jacob French",
+ "age": 62
+ },
+ {
+ "$id": "6npynnhjt2jd05xo",
+ "name": "Jessica Costa",
+ "age": 23
+ },
+ {
+ "$id": "wcxedf13n2e9qi4l",
+ "name": "George Hardy",
+ "age": 53
+ },
+ {
+ "$id": "yf2xlcmszk2tqeig",
+ "name": "Andrea Allison",
+ "age": 20
+ },
+ {
+ "$id": "3bf2zzv7poststwa",
+ "name": "Kevin Ferguson",
+ "age": 32
+ },
+ {
+ "$id": "c2iataz0hhv39q63",
+ "name": "Joseph Johnson",
+ "age": 58
+ },
+ {
+ "$id": "3e8npxhov4a39pvq",
+ "name": "Ashley Martinez",
+ "age": 18
+ },
+ {
+ "$id": "t7dp41tysipytywq",
+ "name": "Charles Nixon",
+ "age": 23
+ },
+ {
+ "$id": "z8cztq7c47phyfhk",
+ "name": "Carol Dudley",
+ "age": 40
+ },
+ {
+ "$id": "2636f9d8r4ipm3h6",
+ "name": "David Weber",
+ "age": 51
+ },
+ {
+ "$id": "eh3f6wxtvkjq6ykq",
+ "name": "Scott Robinson",
+ "age": 32
+ },
+ {
+ "$id": "raskbwpsje69a59h",
+ "name": "Anthony Hardy",
+ "age": 38
+ },
+ {
+ "$id": "90hn1p0b4cs9e2og",
+ "name": "Mackenzie Owens",
+ "age": 52
+ },
+ {
+ "$id": "am3swwfbo076x0v1",
+ "name": "Brian Foster",
+ "age": 27
+ },
+ {
+ "$id": "5uw7utb9lq5cfncw",
+ "name": "Hannah Forbes",
+ "age": 56
+ },
+ {
+ "$id": "cs6mbfzkzifefx6r",
+ "name": "Lauren Reed",
+ "age": 26
+ },
+ {
+ "$id": "ftw3uvztziiz9x00",
+ "name": "Morgan Smith",
+ "age": 28
+ },
+ {
+ "$id": "uhrqseeo43mozpaq",
+ "name": "Samantha Alexander",
+ "age": 65
+ },
+ {
+ "$id": "pvvmzyfc1lxor11e",
+ "name": "Tiffany Roberts",
+ "age": 20
+ },
+ {
+ "$id": "jia7bdag4abz123s",
+ "name": "Emily Hayes",
+ "age": 34
+ },
+ {
+ "$id": "h6oozcngbz8o5x4y",
+ "name": "Rebecca Villegas",
+ "age": 52
+ },
+ {
+ "$id": "9v6z1pn2f9twcy12",
+ "name": "Donald Shah",
+ "age": 61
+ },
+ {
+ "$id": "wzz3jduioso77o7f",
+ "name": "Denise Cain",
+ "age": 59
+ },
+ {
+ "$id": "u51plhgvjodkswnr",
+ "name": "Kristine Ramirez",
+ "age": 53
+ },
+ {
+ "$id": "t1uhkmiytfyc13vc",
+ "name": "Stacey Adkins",
+ "age": 61
+ },
+ {
+ "$id": "iqaqnf0ybg2ct507",
+ "name": "Daniel Hunt",
+ "age": 20
+ },
+ {
+ "$id": "idwrwv2uu4hcpv2i",
+ "name": "Roberta Johnson",
+ "age": 48
+ },
+ {
+ "$id": "2yd2hd6auetjacyo",
+ "name": "Jason Williamson",
+ "age": 39
+ },
+ {
+ "$id": "egrmdbibnjhi914x",
+ "name": "Sandra Robinson",
+ "age": 50
+ },
+ {
+ "$id": "15m1pz2bb0ercgyk",
+ "name": "Steve Rice",
+ "age": 25
+ },
+ {
+ "$id": "0i21bhkxdagjurb7",
+ "name": "Kimberly Fritz",
+ "age": 53
+ },
+ {
+ "$id": "726ofi7h5snreq67",
+ "name": "Brianna Reynolds",
+ "age": 33
+ },
+ {
+ "$id": "csqxse3wym56eim6",
+ "name": "Alexander Williams",
+ "age": 50
+ },
+ {
+ "$id": "qeaoylnrsf8p3byg",
+ "name": "Andrew Thomas",
+ "age": 25
+ },
+ {
+ "$id": "edsswobumzyzbvhf",
+ "name": "Austin Williams",
+ "age": 57
+ },
+ {
+ "$id": "hdzhzpt0ahy5hkib",
+ "name": "Nicholas Williams",
+ "age": 24
+ },
+ {
+ "$id": "w1qmvmg4roa8xnwu",
+ "name": "Mrs. Michelle Cisneros",
+ "age": 48
+ },
+ {
+ "$id": "3z3o73x7adyuo6w0",
+ "name": "Stacey Smith",
+ "age": 39
+ },
+ {
+ "$id": "sse2u5zlgoqrgmcf",
+ "name": "Laura Beck",
+ "age": 20
+ },
+ {
+ "$id": "rvovijmvch58r4yx",
+ "name": "Molly Clark",
+ "age": 51
+ },
+ {
+ "$id": "doe06nrx8sg5mcuv",
+ "name": "Carmen Morris",
+ "age": 41
+ },
+ {
+ "$id": "jbjdwuvj5s4kw04y",
+ "name": "Amanda Munoz",
+ "age": 20
+ },
+ {
+ "$id": "6k2ewkla7js0yw23",
+ "name": "Rachel Collins",
+ "age": 44
+ },
+ {
+ "$id": "fcxuyr4kkhrnigu1",
+ "name": "John Alexander",
+ "age": 18
+ },
+ {
+ "$id": "d25fuwlos5mk07o0",
+ "name": "Stacy Hunter",
+ "age": 22
+ },
+ {
+ "$id": "1vdai2rxmwd57oet",
+ "name": "Eric Massey",
+ "age": 40
+ },
+ {
+ "$id": "pq4jnt9izu1wlrzd",
+ "name": "Scott Garcia",
+ "age": 20
+ },
+ {
+ "$id": "lz9kfc0lty5xcz14",
+ "name": "Cassandra Nelson",
+ "age": 35
+ },
+ {
+ "$id": "pu7w6tyab5jd4we9",
+ "name": "Aaron Johnson",
+ "age": 50
+ },
+ {
+ "$id": "8dupswd2kqwdyn8v",
+ "name": "Shannon Sherman",
+ "age": 45
+ },
+ {
+ "$id": "ye466l71jthiz2p6",
+ "name": "April Garcia",
+ "age": 60
+ },
+ {
+ "$id": "xogsmfwb73l16qdt",
+ "name": "Evan Lynn",
+ "age": 20
+ }
+]
\ No newline at end of file
diff --git a/tests/resources/json/documentsdb-documents.json b/tests/resources/json/documentsdb-documents.json
new file mode 100644
index 0000000000..908c123e81
--- /dev/null
+++ b/tests/resources/json/documentsdb-documents.json
@@ -0,0 +1,162 @@
+[
+ {
+ "$id": "doc01",
+ "name": "Alice",
+ "email": "alice@test.com",
+ "age": 35,
+ "active": false,
+ "tags": [
+ "analyst",
+ "engineer"
+ ],
+ "address": {
+ "city": "New York",
+ "zip": "27436",
+ "country": "DE"
+ }
+ },
+ {
+ "$id": "doc02",
+ "name": "Bob",
+ "email": "bob@test.com",
+ "age": 58,
+ "active": false,
+ "tags": [
+ "engineer",
+ "manager"
+ ],
+ "address": {
+ "city": "London",
+ "zip": "49320",
+ "country": "JP"
+ }
+ },
+ {
+ "$id": "doc03",
+ "name": "Charlie",
+ "email": "charlie@test.com",
+ "age": 23,
+ "active": true,
+ "tags": [
+ "analyst",
+ "manager"
+ ],
+ "address": {
+ "city": "Tokyo",
+ "zip": "74758",
+ "country": "JP"
+ }
+ },
+ {
+ "$id": "doc04",
+ "name": "Diana",
+ "email": "diana@test.com",
+ "age": 60,
+ "active": true,
+ "tags": [
+ "analyst",
+ "manager"
+ ],
+ "address": {
+ "city": "Paris",
+ "zip": "50703",
+ "country": "JP"
+ }
+ },
+ {
+ "$id": "doc05",
+ "name": "Eve",
+ "email": "eve@test.com",
+ "age": 59,
+ "active": false,
+ "tags": [
+ "engineer",
+ "designer"
+ ],
+ "address": {
+ "city": "Berlin",
+ "zip": "98929",
+ "country": "UK"
+ }
+ },
+ {
+ "$id": "doc06",
+ "name": "Frank",
+ "email": "frank@test.com",
+ "age": 23,
+ "active": true,
+ "tags": [
+ "engineer",
+ "manager"
+ ],
+ "address": {
+ "city": "Sydney",
+ "zip": "82907",
+ "country": "US"
+ }
+ },
+ {
+ "$id": "doc07",
+ "name": "Grace",
+ "email": "grace@test.com",
+ "age": 36,
+ "active": true,
+ "tags": [
+ "analyst",
+ "developer"
+ ],
+ "address": {
+ "city": "Toronto",
+ "zip": "68710",
+ "country": "US"
+ }
+ },
+ {
+ "$id": "doc08",
+ "name": "Hank",
+ "email": "hank@test.com",
+ "age": 28,
+ "active": false,
+ "tags": [
+ "engineer",
+ "manager"
+ ],
+ "address": {
+ "city": "Mumbai",
+ "zip": "61026",
+ "country": "FR"
+ }
+ },
+ {
+ "$id": "doc09",
+ "name": "Iris",
+ "email": "iris@test.com",
+ "age": 40,
+ "active": true,
+ "tags": [
+ "developer",
+ "designer"
+ ],
+ "address": {
+ "city": "Seoul",
+ "zip": "48039",
+ "country": "FR"
+ }
+ },
+ {
+ "$id": "doc10",
+ "name": "Jack",
+ "email": "jack@test.com",
+ "age": 45,
+ "active": false,
+ "tags": [
+ "manager",
+ "developer"
+ ],
+ "address": {
+ "city": "Dubai",
+ "zip": "22733",
+ "country": "JP"
+ }
+ }
+]
\ No newline at end of file
diff --git a/tests/resources/json/irrelevant-column.json b/tests/resources/json/irrelevant-column.json
new file mode 100644
index 0000000000..d047620ab0
--- /dev/null
+++ b/tests/resources/json/irrelevant-column.json
@@ -0,0 +1,602 @@
+[
+ {
+ "$id": "r5ctmrqwqn1m3rc0",
+ "name": "Diamond Mendez",
+ "age": 56,
+ "email": "diamond.mendez@example.com"
+ },
+ {
+ "$id": "wxwp7e7q7nx3ltfx",
+ "name": "Michael Huff",
+ "age": 20,
+ "email": "michael.huff@example.com"
+ },
+ {
+ "$id": "4ct0b38fwaojawlv",
+ "name": "Alyssa Rodriguez",
+ "age": 37,
+ "email": "alyssa.rodriguez@example.com"
+ },
+ {
+ "$id": "o0jjcuygbta2zvga",
+ "name": "Barbara Smith",
+ "age": 26,
+ "email": "barbara.smith@example.com"
+ },
+ {
+ "$id": "bdy6l2ofl8klb4pb",
+ "name": "Evelyn Edwards",
+ "age": 54,
+ "email": "evelyn.edwards@example.com"
+ },
+ {
+ "$id": "rkccl72v7zwtbila",
+ "name": "Tina Richardson",
+ "age": 41,
+ "email": "tina.richardson@example.com"
+ },
+ {
+ "$id": "cilw7um0cd927esj",
+ "name": "Joel Hernandez",
+ "age": 49,
+ "email": "joel.hernandez@example.com"
+ },
+ {
+ "$id": "60povvz0votkve1j",
+ "name": "Zachary Cooper",
+ "age": 59,
+ "email": "zachary.cooper@example.com"
+ },
+ {
+ "$id": "ayow5dzwktvbbtp2",
+ "name": "Brittany Spears",
+ "age": 20,
+ "email": "brittany.spears@example.com"
+ },
+ {
+ "$id": "cfru98od0lab0b2n",
+ "name": "Holly White",
+ "age": 47,
+ "email": "holly.white@example.com"
+ },
+ {
+ "$id": "vjxjldvu3r6uylq6",
+ "name": "Kimberly Barnes",
+ "age": 27,
+ "email": "kimberly.barnes@example.com"
+ },
+ {
+ "$id": "d1p47hl97pw6xowb",
+ "name": "Stephen Miller",
+ "age": 53,
+ "email": "stephen.miller@example.com"
+ },
+ {
+ "$id": "yxk6qaa5ryb3gqrb",
+ "name": "Yvonne Newman",
+ "age": 41,
+ "email": "yvonne.newman@example.com"
+ },
+ {
+ "$id": "ifkeo7j8t7hfd7z8",
+ "name": "Carol Kane",
+ "age": 38,
+ "email": "carol.kane@example.com"
+ },
+ {
+ "$id": "e1q4lq8vvpxp9ysb",
+ "name": "Doris Foster",
+ "age": 44,
+ "email": "doris.foster@example.com"
+ },
+ {
+ "$id": "obec6d52dc6swzsf",
+ "name": "Joseph Stokes",
+ "age": 28,
+ "email": "joseph.stokes@example.com"
+ },
+ {
+ "$id": "26v06la6ug8wkvim",
+ "name": "Steve Williams",
+ "age": 31,
+ "email": "steve.williams@example.com"
+ },
+ {
+ "$id": "m4glre4ch12vkxp6",
+ "name": "James Carey",
+ "age": 29,
+ "email": "james.carey@example.com"
+ },
+ {
+ "$id": "jee8fyfffnjugsd5",
+ "name": "Kathryn Henry",
+ "age": 38,
+ "email": "kathryn.henry@example.com"
+ },
+ {
+ "$id": "miquc6ljb9l3a31r",
+ "name": "Christopher Landry",
+ "age": 23,
+ "email": "christopher.landry@example.com"
+ },
+ {
+ "$id": "ghf7da7seeuj1zdl",
+ "name": "Jennifer Mcgee",
+ "age": 62,
+ "email": "jennifer.mcgee@example.com"
+ },
+ {
+ "$id": "x7h11phjrz77w0q8",
+ "name": "Cathy Church",
+ "age": 35,
+ "email": "cathy.church@example.com"
+ },
+ {
+ "$id": "dn8u5lsux4708z6j",
+ "name": "Jose Lopez",
+ "age": 41,
+ "email": "jose.lopez@example.com"
+ },
+ {
+ "$id": "zb7fdlyohuyy5i9k",
+ "name": "William Rose",
+ "age": 30,
+ "email": "william.rose@example.com"
+ },
+ {
+ "$id": "qyrj8m9krp4dt4wt",
+ "name": "Sarah Ford",
+ "age": 26,
+ "email": "sarah.ford@example.com"
+ },
+ {
+ "$id": "t6t673zpfyhhz8pg",
+ "name": "Alisha Jones",
+ "age": 61,
+ "email": "alisha.jones@example.com"
+ },
+ {
+ "$id": "0hfbo0iy1q9bwc2n",
+ "name": "Kristin Kelly",
+ "age": 61,
+ "email": "kristin.kelly@example.com"
+ },
+ {
+ "$id": "8alv4e4xrpcj443z",
+ "name": "Brendan Stout",
+ "age": 40,
+ "email": "brendan.stout@example.com"
+ },
+ {
+ "$id": "qxm7a0z32xdkzxdj",
+ "name": "Kelly Cruz",
+ "age": 18,
+ "email": "kelly.cruz@example.com"
+ },
+ {
+ "$id": "885mti7j7oiz5p5g",
+ "name": "Samantha Martin",
+ "age": 50,
+ "email": "samantha.martin@example.com"
+ },
+ {
+ "$id": "v8i7dvhby6711m66",
+ "name": "David Santos",
+ "age": 46,
+ "email": "david.santos@example.com"
+ },
+ {
+ "$id": "rggc0ow8ccd2jgvp",
+ "name": "Elizabeth Carroll",
+ "age": 22,
+ "email": "elizabeth.carroll@example.com"
+ },
+ {
+ "$id": "012472s64rvzq1c4",
+ "name": "Corey Owens",
+ "age": 46,
+ "email": "corey.owens@example.com"
+ },
+ {
+ "$id": "0k2xrwj4g33ut14y",
+ "name": "Shelby Mueller",
+ "age": 65,
+ "email": "shelby.mueller@example.com"
+ },
+ {
+ "$id": "s3y9rl4uzf3difiq",
+ "name": "Dr. Sylvia Myers",
+ "age": 29,
+ "email": "sylvia.myers@example.com"
+ },
+ {
+ "$id": "ntpc2td892t7f6an",
+ "name": "Scott Freeman",
+ "age": 48,
+ "email": "scott.freeman@example.com"
+ },
+ {
+ "$id": "7f703gibyr5ijdmt",
+ "name": "Christopher Atkinson",
+ "age": 21,
+ "email": "christopher.atkinson@example.com"
+ },
+ {
+ "$id": "r2jdf2pivkxmqd0l",
+ "name": "Sean Diaz",
+ "age": 31,
+ "email": "sean.diaz@example.com"
+ },
+ {
+ "$id": "fj98fji1lrxeigs9",
+ "name": "Bobby Dyer",
+ "age": 57,
+ "email": "bobby.dyer@example.com"
+ },
+ {
+ "$id": "mehqmzp9u7xv1z3j",
+ "name": "Daniel Hall",
+ "age": 62,
+ "email": "daniel.hall@example.com"
+ },
+ {
+ "$id": "4cd5ln65qjfv3h4j",
+ "name": "Jennifer Ramirez",
+ "age": 65,
+ "email": "jennifer.ramirez@example.com"
+ },
+ {
+ "$id": "wdi6ap0oa7m1ab1d",
+ "name": "Angela Jackson",
+ "age": 57,
+ "email": "angela.jackson@example.com"
+ },
+ {
+ "$id": "l2foqjhxvjhjzijb",
+ "name": "Kelly Lewis",
+ "age": 36,
+ "email": "kelly.lewis@example.com"
+ },
+ {
+ "$id": "d963t5yu35uagwm4",
+ "name": "Jessica Munoz",
+ "age": 55,
+ "email": "jessica.munoz@example.com"
+ },
+ {
+ "$id": "99ez9uxsim8zp64m",
+ "name": "Kelly George",
+ "age": 65,
+ "email": "kelly.george@example.com"
+ },
+ {
+ "$id": "v7wl221gycftl63d",
+ "name": "Anthony Johnson",
+ "age": 65,
+ "email": "anthony.johnson@example.com"
+ },
+ {
+ "$id": "p2zzj0lnmjvqzfc3",
+ "name": "Regina Fields",
+ "age": 61,
+ "email": "regina.fields@example.com"
+ },
+ {
+ "$id": "fk655e243z2ivvx6",
+ "name": "Sharon Schaefer",
+ "age": 30,
+ "email": "sharon.schaefer@example.com"
+ },
+ {
+ "$id": "4ywsv6fw8g2d8ncw",
+ "name": "Jacob French",
+ "age": 62,
+ "email": "jacob.french@example.com"
+ },
+ {
+ "$id": "y61q9k6g4h0fxxz4",
+ "name": "Jessica Costa",
+ "age": 23,
+ "email": "jessica.costa@example.com"
+ },
+ {
+ "$id": "knj4hfzsthk7vx5n",
+ "name": "George Hardy",
+ "age": 53,
+ "email": "george.hardy@example.com"
+ },
+ {
+ "$id": "a88u9w2pct2nn8l6",
+ "name": "Andrea Allison",
+ "age": 20,
+ "email": "andrea.allison@example.com"
+ },
+ {
+ "$id": "hw960v1ybycrwr5o",
+ "name": "Kevin Ferguson",
+ "age": 32,
+ "email": "kevin.ferguson@example.com"
+ },
+ {
+ "$id": "j9garslpgx6jgzgb",
+ "name": "Joseph Johnson",
+ "age": 58,
+ "email": "joseph.johnson@example.com"
+ },
+ {
+ "$id": "gv101bz36elm84cd",
+ "name": "Ashley Martinez",
+ "age": 18,
+ "email": "ashley.martinez@example.com"
+ },
+ {
+ "$id": "xrvzgt3gc0c7g4cl",
+ "name": "Charles Nixon",
+ "age": 23,
+ "email": "charles.nixon@example.com"
+ },
+ {
+ "$id": "awjlu7uk0eutcfpb",
+ "name": "Carol Dudley",
+ "age": 40,
+ "email": "carol.dudley@example.com"
+ },
+ {
+ "$id": "95oi26p2zdudpime",
+ "name": "David Weber",
+ "age": 51,
+ "email": "david.weber@example.com"
+ },
+ {
+ "$id": "h8x7pkhdvu5bcp89",
+ "name": "Scott Robinson",
+ "age": 32,
+ "email": "scott.robinson@example.com"
+ },
+ {
+ "$id": "oj6cu4jm1z2afe7s",
+ "name": "Anthony Hardy",
+ "age": 38,
+ "email": "anthony.hardy@example.com"
+ },
+ {
+ "$id": "hgsdi1g30poqqmf0",
+ "name": "Mackenzie Owens",
+ "age": 52,
+ "email": "mackenzie.owens@example.com"
+ },
+ {
+ "$id": "8fzdz914bqlqk2tc",
+ "name": "Brian Foster",
+ "age": 27,
+ "email": "brian.foster@example.com"
+ },
+ {
+ "$id": "fwlqoeiunjhczpl0",
+ "name": "Hannah Forbes",
+ "age": 56,
+ "email": "hannah.forbes@example.com"
+ },
+ {
+ "$id": "rsv8156goe8z4j6j",
+ "name": "Lauren Reed",
+ "age": 26,
+ "email": "lauren.reed@example.com"
+ },
+ {
+ "$id": "1fjqv3w7uwbswe2p",
+ "name": "Morgan Smith",
+ "age": 28,
+ "email": "morgan.smith@example.com"
+ },
+ {
+ "$id": "soqrzmhhg05hhzn4",
+ "name": "Samantha Alexander",
+ "age": 65,
+ "email": "samantha.alexander@example.com"
+ },
+ {
+ "$id": "8quy52cto9kjjokp",
+ "name": "Tiffany Roberts",
+ "age": 20,
+ "email": "tiffany.roberts@example.com"
+ },
+ {
+ "$id": "e3i1g1lw04v7jd89",
+ "name": "Emily Hayes",
+ "age": 34,
+ "email": "emily.hayes@example.com"
+ },
+ {
+ "$id": "s7n8lzb0sw7h93z1",
+ "name": "Rebecca Villegas",
+ "age": 52,
+ "email": "rebecca.villegas@example.com"
+ },
+ {
+ "$id": "e2lc7i81tpkqs1rp",
+ "name": "Donald Shah",
+ "age": 61,
+ "email": "donald.shah@example.com"
+ },
+ {
+ "$id": "3oe2mysup1xluiw0",
+ "name": "Denise Cain",
+ "age": 59,
+ "email": "denise.cain@example.com"
+ },
+ {
+ "$id": "1vqypc37f85nuqz4",
+ "name": "Kristine Ramirez",
+ "age": 53,
+ "email": "kristine.ramirez@example.com"
+ },
+ {
+ "$id": "m0uh7r3dc6z8ucb4",
+ "name": "Stacey Adkins",
+ "age": 61,
+ "email": "stacey.adkins@example.com"
+ },
+ {
+ "$id": "jdofz6x1ahganmqf",
+ "name": "Daniel Hunt",
+ "age": 20,
+ "email": "daniel.hunt@example.com"
+ },
+ {
+ "$id": "vbe903c2q4m4q97g",
+ "name": "Roberta Johnson",
+ "age": 48,
+ "email": "roberta.johnson@example.com"
+ },
+ {
+ "$id": "sndngrxuwpd93pdb",
+ "name": "Jason Williamson",
+ "age": 39,
+ "email": "jason.williamson@example.com"
+ },
+ {
+ "$id": "66hvaw2p5xwf07p8",
+ "name": "Sandra Robinson",
+ "age": 50,
+ "email": "sandra.robinson@example.com"
+ },
+ {
+ "$id": "9pvingfsl8cmag5c",
+ "name": "Steve Rice",
+ "age": 25,
+ "email": "steve.rice@example.com"
+ },
+ {
+ "$id": "qe154m5hh00u4iiz",
+ "name": "Kimberly Fritz",
+ "age": 53,
+ "email": "kimberly.fritz@example.com"
+ },
+ {
+ "$id": "avqnbrco2f0tfupk",
+ "name": "Brianna Reynolds",
+ "age": 33,
+ "email": "brianna.reynolds@example.com"
+ },
+ {
+ "$id": "cqs10gi2qu1r3ugb",
+ "name": "Alexander Williams",
+ "age": 50,
+ "email": "alexander.williams@example.com"
+ },
+ {
+ "$id": "jrpmfi6hmm7pmegp",
+ "name": "Andrew Thomas",
+ "age": 25,
+ "email": "andrew.thomas@example.com"
+ },
+ {
+ "$id": "heeab2qqf0zm446f",
+ "name": "Austin Williams",
+ "age": 57,
+ "email": "austin.williams@example.com"
+ },
+ {
+ "$id": "bkhugvnil7kjchm6",
+ "name": "Nicholas Williams",
+ "age": 24,
+ "email": "nicholas.williams@example.com"
+ },
+ {
+ "$id": "b045j302pvv8l1p4",
+ "name": "Mrs. Michelle Cisneros",
+ "age": 48,
+ "email": "michelle.cisneros@example.com"
+ },
+ {
+ "$id": "aikhii5q210lrfpr",
+ "name": "Stacey Smith",
+ "age": 39,
+ "email": "stacey.smith@example.com"
+ },
+ {
+ "$id": "x0zajitea1z2dfo0",
+ "name": "Laura Beck",
+ "age": 20,
+ "email": "laura.beck@example.com"
+ },
+ {
+ "$id": "abeecki7mdff1tv0",
+ "name": "Molly Clark",
+ "age": 51,
+ "email": "molly.clark@example.com"
+ },
+ {
+ "$id": "yizama8r3i1to548",
+ "name": "Carmen Morris",
+ "age": 41,
+ "email": "carmen.morris@example.com"
+ },
+ {
+ "$id": "8690yh971g4rgspj",
+ "name": "Amanda Munoz",
+ "age": 20,
+ "email": "amanda.munoz@example.com"
+ },
+ {
+ "$id": "cd9vk5v97t359ul2",
+ "name": "Rachel Collins",
+ "age": 44,
+ "email": "rachel.collins@example.com"
+ },
+ {
+ "$id": "wrkgmx1v0w9ja4l8",
+ "name": "John Alexander",
+ "age": 18,
+ "email": "john.alexander@example.com"
+ },
+ {
+ "$id": "kxp3ucqo6ped4ss7",
+ "name": "Stacy Hunter",
+ "age": 22,
+ "email": "stacy.hunter@example.com"
+ },
+ {
+ "$id": "dbvv8okae2qgo0gm",
+ "name": "Eric Massey",
+ "age": 40,
+ "email": "eric.massey@example.com"
+ },
+ {
+ "$id": "9tn3nm6ppnayisje",
+ "name": "Scott Garcia",
+ "age": 20,
+ "email": "scott.garcia@example.com"
+ },
+ {
+ "$id": "1xuc5t60xpcvd4qi",
+ "name": "Cassandra Nelson",
+ "age": 35,
+ "email": "cassandra.nelson@example.com"
+ },
+ {
+ "$id": "qao1nulwn0kqyfkc",
+ "name": "Aaron Johnson",
+ "age": 50,
+ "email": "aaron.johnson@example.com"
+ },
+ {
+ "$id": "kd2q6owvuwsy5knx",
+ "name": "Shannon Sherman",
+ "age": 45,
+ "email": "shannon.sherman@example.com"
+ },
+ {
+ "$id": "wsl37kjo0bib4wrc",
+ "name": "April Garcia",
+ "age": 60,
+ "email": "april.garcia@example.com"
+ },
+ {
+ "$id": "ujlz7k84xzfx4khs",
+ "name": "Evan Lynn",
+ "age": 20,
+ "email": "evan.lynn@example.com"
+ }
+]
\ No newline at end of file
diff --git a/tests/resources/json/missing-column.json b/tests/resources/json/missing-column.json
new file mode 100644
index 0000000000..ac7a8e1a85
--- /dev/null
+++ b/tests/resources/json/missing-column.json
@@ -0,0 +1,402 @@
+[
+ {
+ "$id": "hxfcwpcas5xokpwe",
+ "name": "Diamond Mendez"
+ },
+ {
+ "$id": "gw8nxwf6esn3tfwf",
+ "name": "Michael Huff"
+ },
+ {
+ "$id": "xb6bxg56lral1qy9",
+ "name": "Alyssa Rodriguez"
+ },
+ {
+ "$id": "imerjq5j36y3agh2",
+ "name": "Barbara Smith"
+ },
+ {
+ "$id": "07yq9qdlhmbzmr35",
+ "name": "Evelyn Edwards"
+ },
+ {
+ "$id": "ksqo631sbhwj5ltg",
+ "name": "Tina Richardson"
+ },
+ {
+ "$id": "j7zlndgu0gbshp15",
+ "name": "Joel Hernandez"
+ },
+ {
+ "$id": "mfntvnljrcmf7h6v",
+ "name": "Zachary Cooper"
+ },
+ {
+ "$id": "5f9b01nziqu2h8ed",
+ "name": "Brittany Spears"
+ },
+ {
+ "$id": "4vxzbnzraqznk5u8",
+ "name": "Holly White"
+ },
+ {
+ "$id": "d4ywy3mtphaatbpf",
+ "name": "Kimberly Barnes"
+ },
+ {
+ "$id": "88odnk6nthyyvbal",
+ "name": "Stephen Miller"
+ },
+ {
+ "$id": "08oekee3fn7mzaa5",
+ "name": "Yvonne Newman"
+ },
+ {
+ "$id": "quw55kn9895i5e4v",
+ "name": "Carol Kane"
+ },
+ {
+ "$id": "nge6bm8ykripei6f",
+ "name": "Doris Foster"
+ },
+ {
+ "$id": "4k16i33s0xl2ypx9",
+ "name": "Joseph Stokes"
+ },
+ {
+ "$id": "q0j5rxbgid66snyf",
+ "name": "Steve Williams"
+ },
+ {
+ "$id": "n1oxun7mqq3p103y",
+ "name": "James Carey"
+ },
+ {
+ "$id": "0dbvs840jkf8i0ye",
+ "name": "Kathryn Henry"
+ },
+ {
+ "$id": "5sfaidgs1h87v15v",
+ "name": "Christopher Landry"
+ },
+ {
+ "$id": "vg3punvfu5khmf41",
+ "name": "Jennifer Mcgee"
+ },
+ {
+ "$id": "f933qydr9u5b2r11",
+ "name": "Cathy Church"
+ },
+ {
+ "$id": "wjv87y1inf8yk32s",
+ "name": "Jose Lopez"
+ },
+ {
+ "$id": "uljysdvdlcyrbrwk",
+ "name": "William Rose"
+ },
+ {
+ "$id": "ot8xtzh77j55wq0s",
+ "name": "Sarah Ford"
+ },
+ {
+ "$id": "9t76vnsv2u36s43t",
+ "name": "Alisha Jones"
+ },
+ {
+ "$id": "66y4tnty62hw8c02",
+ "name": "Kristin Kelly"
+ },
+ {
+ "$id": "2punfblazi5v16ar",
+ "name": "Brendan Stout"
+ },
+ {
+ "$id": "sxhr4nf5w2gx4wbg",
+ "name": "Kelly Cruz"
+ },
+ {
+ "$id": "68dvrqfwqnkq5el9",
+ "name": "Samantha Martin"
+ },
+ {
+ "$id": "20192l6dbeinhkh0",
+ "name": "David Santos"
+ },
+ {
+ "$id": "si0l4dgay09ebfmf",
+ "name": "Elizabeth Carroll"
+ },
+ {
+ "$id": "lhse40vbldqb6ap1",
+ "name": "Corey Owens"
+ },
+ {
+ "$id": "h5t3pslykyx3kxfm",
+ "name": "Shelby Mueller"
+ },
+ {
+ "$id": "ldc0luydrw6jub0f",
+ "name": "Dr. Sylvia Myers"
+ },
+ {
+ "$id": "voc9628xg4dsgw2y",
+ "name": "Scott Freeman"
+ },
+ {
+ "$id": "o4y0gk3gqv1ax2fz",
+ "name": "Christopher Atkinson"
+ },
+ {
+ "$id": "u1n3x4e4u7e0vzj6",
+ "name": "Sean Diaz"
+ },
+ {
+ "$id": "s36eskwtm0w7lwr7",
+ "name": "Bobby Dyer"
+ },
+ {
+ "$id": "4hjnag1p5iwvtixd",
+ "name": "Daniel Hall"
+ },
+ {
+ "$id": "m91d80oxsa216zbh",
+ "name": "Jennifer Ramirez"
+ },
+ {
+ "$id": "5hj6858zo2g85n6v",
+ "name": "Angela Jackson"
+ },
+ {
+ "$id": "8m8oihv9a1e7nn92",
+ "name": "Kelly Lewis"
+ },
+ {
+ "$id": "7azy39la0no0mxi7",
+ "name": "Jessica Munoz"
+ },
+ {
+ "$id": "47pmjkhnnqhyit8c",
+ "name": "Kelly George"
+ },
+ {
+ "$id": "6j6cpy4kgneg1mmh",
+ "name": "Anthony Johnson"
+ },
+ {
+ "$id": "tnlmtvap1zz89km9",
+ "name": "Regina Fields"
+ },
+ {
+ "$id": "6cyuvnwwqdmrpfzh",
+ "name": "Sharon Schaefer"
+ },
+ {
+ "$id": "p1v4pyu2pqodc0ey",
+ "name": "Jacob French"
+ },
+ {
+ "$id": "6npynnhjt2jd05xo",
+ "name": "Jessica Costa"
+ },
+ {
+ "$id": "wcxedf13n2e9qi4l",
+ "name": "George Hardy"
+ },
+ {
+ "$id": "yf2xlcmszk2tqeig",
+ "name": "Andrea Allison"
+ },
+ {
+ "$id": "3bf2zzv7poststwa",
+ "name": "Kevin Ferguson"
+ },
+ {
+ "$id": "c2iataz0hhv39q63",
+ "name": "Joseph Johnson"
+ },
+ {
+ "$id": "3e8npxhov4a39pvq",
+ "name": "Ashley Martinez"
+ },
+ {
+ "$id": "t7dp41tysipytywq",
+ "name": "Charles Nixon"
+ },
+ {
+ "$id": "z8cztq7c47phyfhk",
+ "name": "Carol Dudley"
+ },
+ {
+ "$id": "2636f9d8r4ipm3h6",
+ "name": "David Weber"
+ },
+ {
+ "$id": "eh3f6wxtvkjq6ykq",
+ "name": "Scott Robinson"
+ },
+ {
+ "$id": "raskbwpsje69a59h",
+ "name": "Anthony Hardy"
+ },
+ {
+ "$id": "90hn1p0b4cs9e2og",
+ "name": "Mackenzie Owens"
+ },
+ {
+ "$id": "am3swwfbo076x0v1",
+ "name": "Brian Foster"
+ },
+ {
+ "$id": "5uw7utb9lq5cfncw",
+ "name": "Hannah Forbes"
+ },
+ {
+ "$id": "cs6mbfzkzifefx6r",
+ "name": "Lauren Reed"
+ },
+ {
+ "$id": "ftw3uvztziiz9x00",
+ "name": "Morgan Smith"
+ },
+ {
+ "$id": "uhrqseeo43mozpaq",
+ "name": "Samantha Alexander"
+ },
+ {
+ "$id": "pvvmzyfc1lxor11e",
+ "name": "Tiffany Roberts"
+ },
+ {
+ "$id": "jia7bdag4abz123s",
+ "name": "Emily Hayes"
+ },
+ {
+ "$id": "h6oozcngbz8o5x4y",
+ "name": "Rebecca Villegas"
+ },
+ {
+ "$id": "9v6z1pn2f9twcy12",
+ "name": "Donald Shah"
+ },
+ {
+ "$id": "wzz3jduioso77o7f",
+ "name": "Denise Cain"
+ },
+ {
+ "$id": "u51plhgvjodkswnr",
+ "name": "Kristine Ramirez"
+ },
+ {
+ "$id": "t1uhkmiytfyc13vc",
+ "name": "Stacey Adkins"
+ },
+ {
+ "$id": "iqaqnf0ybg2ct507",
+ "name": "Daniel Hunt"
+ },
+ {
+ "$id": "idwrwv2uu4hcpv2i",
+ "name": "Roberta Johnson"
+ },
+ {
+ "$id": "2yd2hd6auetjacyo",
+ "name": "Jason Williamson"
+ },
+ {
+ "$id": "egrmdbibnjhi914x",
+ "name": "Sandra Robinson"
+ },
+ {
+ "$id": "15m1pz2bb0ercgyk",
+ "name": "Steve Rice"
+ },
+ {
+ "$id": "0i21bhkxdagjurb7",
+ "name": "Kimberly Fritz"
+ },
+ {
+ "$id": "726ofi7h5snreq67",
+ "name": "Brianna Reynolds"
+ },
+ {
+ "$id": "csqxse3wym56eim6",
+ "name": "Alexander Williams"
+ },
+ {
+ "$id": "qeaoylnrsf8p3byg",
+ "name": "Andrew Thomas"
+ },
+ {
+ "$id": "edsswobumzyzbvhf",
+ "name": "Austin Williams"
+ },
+ {
+ "$id": "hdzhzpt0ahy5hkib",
+ "name": "Nicholas Williams"
+ },
+ {
+ "$id": "w1qmvmg4roa8xnwu",
+ "name": "Mrs. Michelle Cisneros"
+ },
+ {
+ "$id": "3z3o73x7adyuo6w0",
+ "name": "Stacey Smith"
+ },
+ {
+ "$id": "sse2u5zlgoqrgmcf",
+ "name": "Laura Beck"
+ },
+ {
+ "$id": "rvovijmvch58r4yx",
+ "name": "Molly Clark"
+ },
+ {
+ "$id": "doe06nrx8sg5mcuv",
+ "name": "Carmen Morris"
+ },
+ {
+ "$id": "jbjdwuvj5s4kw04y",
+ "name": "Amanda Munoz"
+ },
+ {
+ "$id": "6k2ewkla7js0yw23",
+ "name": "Rachel Collins"
+ },
+ {
+ "$id": "fcxuyr4kkhrnigu1",
+ "name": "John Alexander"
+ },
+ {
+ "$id": "d25fuwlos5mk07o0",
+ "name": "Stacy Hunter"
+ },
+ {
+ "$id": "1vdai2rxmwd57oet",
+ "name": "Eric Massey"
+ },
+ {
+ "$id": "pq4jnt9izu1wlrzd",
+ "name": "Scott Garcia"
+ },
+ {
+ "$id": "lz9kfc0lty5xcz14",
+ "name": "Cassandra Nelson"
+ },
+ {
+ "$id": "pu7w6tyab5jd4we9",
+ "name": "Aaron Johnson"
+ },
+ {
+ "$id": "8dupswd2kqwdyn8v",
+ "name": "Shannon Sherman"
+ },
+ {
+ "$id": "ye466l71jthiz2p6",
+ "name": "April Garcia"
+ },
+ {
+ "$id": "xogsmfwb73l16qdt",
+ "name": "Evan Lynn"
+ }
+]
\ No newline at end of file
diff --git a/tests/resources/json/vectorsdb-documents.json b/tests/resources/json/vectorsdb-documents.json
new file mode 100644
index 0000000000..f1bada8a7e
--- /dev/null
+++ b/tests/resources/json/vectorsdb-documents.json
@@ -0,0 +1,262 @@
+[
+ {
+ "$id": "vec01",
+ "metadata": {
+ "title": "Vector Document 1",
+ "score": 0.643,
+ "category": "art"
+ },
+ "embeddings": [
+ -0.516361,
+ 0.261456,
+ -0.77323,
+ 0.909775,
+ -0.003065,
+ -0.626888,
+ 0.704171,
+ -0.366385,
+ 0.198681,
+ 0.854914,
+ -0.227548,
+ -0.14278,
+ -0.548405,
+ -0.822939,
+ 0.407267,
+ 0.570791
+ ]
+ },
+ {
+ "$id": "vec02",
+ "metadata": {
+ "title": "Vector Document 2",
+ "score": 0.322,
+ "category": "art"
+ },
+ "embeddings": [
+ 0.103211,
+ 0.028378,
+ 0.806001,
+ -0.412638,
+ -0.200009,
+ 0.448239,
+ -0.781144,
+ 0.621957,
+ -0.868352,
+ 0.217013,
+ 0.308217,
+ -0.851528,
+ -0.340766,
+ 0.805996,
+ -0.065638,
+ -0.363951
+ ]
+ },
+ {
+ "$id": "vec03",
+ "metadata": {
+ "title": "Vector Document 3",
+ "score": 0.503,
+ "category": "science"
+ },
+ "embeddings": [
+ 0.971901,
+ -0.475154,
+ 0.60526,
+ -0.151618,
+ -0.938199,
+ -0.139977,
+ 0.154581,
+ -0.868021,
+ 0.069567,
+ 0.233545,
+ -0.164826,
+ 0.239036,
+ 0.8875,
+ 0.488075,
+ 0.787231,
+ 0.090293
+ ]
+ },
+ {
+ "$id": "vec04",
+ "metadata": {
+ "title": "Vector Document 4",
+ "score": 0.943,
+ "category": "science"
+ },
+ "embeddings": [
+ 0.372035,
+ -0.868405,
+ -0.974987,
+ -0.836673,
+ 0.030057,
+ -0.667698,
+ 0.095189,
+ 0.518373,
+ -0.173732,
+ 0.966379,
+ 0.509861,
+ -0.172607,
+ 0.420855,
+ -0.534562,
+ 0.600872,
+ 0.194391
+ ]
+ },
+ {
+ "$id": "vec05",
+ "metadata": {
+ "title": "Vector Document 5",
+ "score": 0.924,
+ "category": "music"
+ },
+ "embeddings": [
+ -0.318783,
+ -0.876486,
+ 0.843971,
+ -0.472869,
+ -0.350164,
+ 0.936237,
+ -0.741591,
+ 0.298213,
+ -0.075429,
+ 0.243415,
+ 0.929625,
+ 0.96649,
+ 0.251843,
+ -0.371953,
+ 0.348079,
+ 0.090382
+ ]
+ },
+ {
+ "$id": "vec06",
+ "metadata": {
+ "title": "Vector Document 6",
+ "score": 0.385,
+ "category": "science"
+ },
+ "embeddings": [
+ -0.608111,
+ 0.549885,
+ 0.720346,
+ 0.260442,
+ -0.023344,
+ 0.800346,
+ -0.956586,
+ -0.407161,
+ 0.516883,
+ 0.230456,
+ 0.376704,
+ -0.347203,
+ 0.925657,
+ -0.486608,
+ 0.330032,
+ 0.323414
+ ]
+ },
+ {
+ "$id": "vec07",
+ "metadata": {
+ "title": "Vector Document 7",
+ "score": 0.61,
+ "category": "science"
+ },
+ "embeddings": [
+ 0.45451,
+ -0.251783,
+ -0.479459,
+ 0.167412,
+ 0.890343,
+ 0.415136,
+ -0.506263,
+ 0.318171,
+ -0.729294,
+ -0.907919,
+ 0.607033,
+ 0.652333,
+ 0.97129,
+ -0.118671,
+ 0.110045,
+ -0.514242
+ ]
+ },
+ {
+ "$id": "vec08",
+ "metadata": {
+ "title": "Vector Document 8",
+ "score": 0.107,
+ "category": "history"
+ },
+ "embeddings": [
+ -0.883255,
+ -0.294593,
+ -0.153187,
+ 0.595936,
+ 0.341818,
+ -0.410719,
+ 0.017348,
+ -0.350047,
+ -0.888906,
+ 0.344646,
+ 0.184335,
+ -0.429053,
+ 0.540542,
+ -0.408493,
+ -0.982748,
+ -0.255031
+ ]
+ },
+ {
+ "$id": "vec09",
+ "metadata": {
+ "title": "Vector Document 9",
+ "score": 0.914,
+ "category": "art"
+ },
+ "embeddings": [
+ 0.31891,
+ 0.502493,
+ -0.245712,
+ -0.325282,
+ -0.514772,
+ 0.097323,
+ 0.812412,
+ -0.762069,
+ 0.846688,
+ -0.391482,
+ 0.879953,
+ 0.986352,
+ -0.562588,
+ -0.566111,
+ 0.163109,
+ 0.119346
+ ]
+ },
+ {
+ "$id": "vec10",
+ "metadata": {
+ "title": "Vector Document 10",
+ "score": 0.169,
+ "category": "science"
+ },
+ "embeddings": [
+ -0.563645,
+ -0.19119,
+ -0.853168,
+ -0.526952,
+ -0.459635,
+ 0.850766,
+ -0.345261,
+ 0.547467,
+ 0.455409,
+ -0.507607,
+ -0.228436,
+ -0.587395,
+ 0.109146,
+ 0.190046,
+ 0.861559,
+ -0.724741
+ ]
+ }
+]
\ No newline at end of file
diff --git a/tests/unit/Auth/KeyTest.php b/tests/unit/Auth/KeyTest.php
index fc1779efad..58fe3113e1 100644
--- a/tests/unit/Auth/KeyTest.php
+++ b/tests/unit/Auth/KeyTest.php
@@ -25,7 +25,7 @@ class KeyTest extends TestCase
$roleScopes = Config::getParam('roles', [])[User::ROLE_APPS]['scopes'];
$guestRoleScopes = Config::getParam('roles', [])[User::ROLE_GUESTS]['scopes'];
- $key = static::generateKey($projectId, $usage, $scopes);
+ $key = self::generateKey($projectId, $usage, $scopes);
$decoded = Key::decode(
project: new Document(['$id' => $projectId]),
team: new Document(),
@@ -50,7 +50,7 @@ class KeyTest extends TestCase
'previewAuthDisabled' => true,
'deploymentStatusIgnored' => true,
];
- $key = static::generateKey($projectId, $usage, $scopes, extra: $extra);
+ $key = self::generateKey($projectId, $usage, $scopes, extra: $extra);
$decoded = Key::decode(
project: new Document(['$id' => $projectId]),
team: new Document(),
@@ -88,7 +88,7 @@ class KeyTest extends TestCase
$this->assertEquals('UNKNOWN', $decoded->getName());
// Decode expired dynamic key
- $expiredKey = static::generateKey($projectId, $usage, $scopes, maxAge: 1, timestamp: time() - 60);
+ $expiredKey = self::generateKey($projectId, $usage, $scopes, maxAge: 1, timestamp: time() - 60);
\sleep(2);
$decoded = Key::decode(
project: new Document(['$id' => $projectId]),
diff --git a/tests/unit/Event/EventTest.php b/tests/unit/Event/EventTest.php
index d5936e4b8f..d050ce5f64 100644
--- a/tests/unit/Event/EventTest.php
+++ b/tests/unit/Event/EventTest.php
@@ -5,7 +5,6 @@ namespace Tests\Unit\Event;
use Appwrite\Event\Event;
use InvalidArgumentException;
use PHPUnit\Framework\TestCase;
-use Utopia\Queue\Publisher;
require_once __DIR__ . '/../../../app/init.php';
@@ -13,7 +12,7 @@ class EventTest extends TestCase
{
protected ?Event $object = null;
protected string $queue = '';
- protected Publisher $publisher;
+ protected MockPublisher $publisher;
public function setUp(): void
{
diff --git a/tests/unit/Functions/Validator/HeadersTest.php b/tests/unit/Functions/Validator/HeadersTest.php
index 4a45f57427..563131d480 100644
--- a/tests/unit/Functions/Validator/HeadersTest.php
+++ b/tests/unit/Functions/Validator/HeadersTest.php
@@ -76,11 +76,6 @@ class HeadersTest extends TestCase
];
$this->assertFalse($this->object->isValid($headers));
- $headers = [
- null => 'value',
- ];
- $this->assertFalse($this->object->isValid($headers));
-
$headers = [
'X-Header' => null,
];
diff --git a/tests/unit/Utopia/RequestTest.php b/tests/unit/Utopia/RequestTest.php
index 78a3717c38..d5cd5d800a 100644
--- a/tests/unit/Utopia/RequestTest.php
+++ b/tests/unit/Utopia/RequestTest.php
@@ -147,6 +147,21 @@ class RequestTest extends TestCase
$this->assertSame('unexpected', $params['extra']);
}
+ public function testRouteIsScopedToRequestInstance(): void
+ {
+ $firstRequest = new Request(new SwooleRequest());
+ $secondRequest = new Request(new SwooleRequest());
+
+ $firstRoute = new Route(Request::METHOD_GET, '/first');
+ $secondRoute = new Route(Request::METHOD_GET, '/second');
+
+ $firstRequest->setRoute($firstRoute);
+ $secondRequest->setRoute($secondRoute);
+
+ $this->assertSame($firstRoute, $firstRequest->getRoute());
+ $this->assertSame($secondRoute, $secondRequest->getRoute());
+ }
+
/**
* Helper to attach a route with multiple SDK methods to the request.
*/
diff --git a/tests/unit/Utopia/Response/Filters/V16Test.php b/tests/unit/Utopia/Response/Filters/V16Test.php
index e771146e3a..2ba60d35e9 100644
--- a/tests/unit/Utopia/Response/Filters/V16Test.php
+++ b/tests/unit/Utopia/Response/Filters/V16Test.php
@@ -3,6 +3,7 @@
namespace Tests\Unit\Utopia\Response\Filters;
use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Response\Filter;
use Appwrite\Utopia\Response\Filters\V16;
use Cron\CronExpression;
use PHPUnit\Framework\Attributes\DataProvider;
@@ -11,10 +12,7 @@ use Utopia\Database\DateTime;
class V16Test extends TestCase
{
- /**
- * @var Filter
- */
- protected $filter = null;
+ protected Filter $filter;
public function setUp(): void
{
diff --git a/tests/unit/Utopia/Response/Filters/V17Test.php b/tests/unit/Utopia/Response/Filters/V17Test.php
index 21d91e1314..0bdc4de53e 100644
--- a/tests/unit/Utopia/Response/Filters/V17Test.php
+++ b/tests/unit/Utopia/Response/Filters/V17Test.php
@@ -3,16 +3,14 @@
namespace Tests\Unit\Utopia\Response\Filters;
use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Response\Filter;
use Appwrite\Utopia\Response\Filters\V17;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
class V17Test extends TestCase
{
- /**
- * @var Filter
- */
- protected $filter = null;
+ protected Filter $filter;
public function setUp(): void
{
diff --git a/tests/unit/Utopia/Response/Filters/V18Test.php b/tests/unit/Utopia/Response/Filters/V18Test.php
index da169a7d0e..2e09b34515 100644
--- a/tests/unit/Utopia/Response/Filters/V18Test.php
+++ b/tests/unit/Utopia/Response/Filters/V18Test.php
@@ -3,16 +3,14 @@
namespace Tests\Unit\Utopia\Response\Filters;
use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Response\Filter;
use Appwrite\Utopia\Response\Filters\V18;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
class V18Test extends TestCase
{
- /**
- * @var Filter
- */
- protected $filter = null;
+ protected Filter $filter;
public function setUp(): void
{
diff --git a/tests/unit/Utopia/Response/Filters/V19Test.php b/tests/unit/Utopia/Response/Filters/V19Test.php
index eaeefba2fc..a53dbfe355 100644
--- a/tests/unit/Utopia/Response/Filters/V19Test.php
+++ b/tests/unit/Utopia/Response/Filters/V19Test.php
@@ -3,16 +3,14 @@
namespace Tests\Unit\Utopia\Response\Filters;
use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Response\Filter;
use Appwrite\Utopia\Response\Filters\V19;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
class V19Test extends TestCase
{
- /**
- * @var Filter
- */
- protected $filter = null;
+ protected Filter $filter;
public function setUp(): void
{
diff --git a/tests/unit/Utopia/ResponseTest.php b/tests/unit/Utopia/ResponseTest.php
index 452119fafb..be8cfdc216 100644
--- a/tests/unit/Utopia/ResponseTest.php
+++ b/tests/unit/Utopia/ResponseTest.php
@@ -5,6 +5,7 @@ namespace Tests\Unit\Utopia;
use Appwrite\Utopia\Response;
use Exception;
use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
use Swoole\Http\Response as SwooleResponse;
use Tests\Unit\Utopia\Response\Filters\First;
use Tests\Unit\Utopia\Response\Filters\Second;
@@ -176,4 +177,26 @@ class ResponseTest extends TestCase
$this->assertArrayHasKey('required', $single);
$this->assertArrayNotHasKey('hidden', $singleFromArray);
}
+
+ public function testShowSensitiveRestoresPreviousState(): void
+ {
+ $isShowingSensitive = new ReflectionProperty(Response::class, 'showSensitive');
+
+ $this->assertFalse($isShowingSensitive->getValue($this->response));
+
+ $payload = $this->response->showSensitive(function () use ($isShowingSensitive) {
+ return [
+ 'outer' => $isShowingSensitive->getValue($this->response),
+ 'inner' => $this->response->showSensitive(fn () => [
+ 'state' => $isShowingSensitive->getValue($this->response),
+ ]),
+ 'afterInner' => $isShowingSensitive->getValue($this->response),
+ ];
+ });
+
+ $this->assertTrue($payload['outer']);
+ $this->assertTrue($payload['inner']['state']);
+ $this->assertTrue($payload['afterInner']);
+ $this->assertFalse($isShowingSensitive->getValue($this->response));
+ }
}
-