diff --git a/composer.json b/composer.json index 61e59f023e..a4b8564dd9 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "utopia-php/cache": "0.13.*", "utopia-php/cli": "0.15.*", "utopia-php/config": "1.*.*", - "utopia-php/database": "dev-cache-documents-xlist as 4.3.0", + "utopia-php/database": "4.*", "utopia-php/detector": "0.2.*", "utopia-php/domains": "0.9.*", "utopia-php/emails": "0.6.*", diff --git a/composer.lock b/composer.lock index 65191657c7..0e86068e1a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "128b3f18bc80fb8abdbbcad375140158", + "content-hash": "1167f8ad5c99b75e2c76109ccd1e5772", "packages": [ { "name": "adhocore/jwt", @@ -3896,16 +3896,16 @@ }, { "name": "utopia-php/database", - "version": "dev-cache-documents-xlist", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "02c3b242549ce4d252df3db4fc9a10113fa65d5e" + "reference": "fe7a1326ad623609e65587fe8c01a630a7075fee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/02c3b242549ce4d252df3db4fc9a10113fa65d5e", - "reference": "02c3b242549ce4d252df3db4fc9a10113fa65d5e", + "url": "https://api.github.com/repos/utopia-php/database/zipball/fe7a1326ad623609e65587fe8c01a630a7075fee", + "reference": "fe7a1326ad623609e65587fe8c01a630a7075fee", "shasum": "" }, "require": { @@ -3948,9 +3948,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/cache-documents-xlist" + "source": "https://github.com/utopia-php/database/tree/4.3.0" }, - "time": "2025-11-18T14:05:50+00:00" + "time": "2025-11-14T03:43:10+00:00" }, { "name": "utopia-php/detector", @@ -4679,16 +4679,16 @@ }, { "name": "utopia-php/platform", - "version": "0.7.12", + "version": "0.7.13", "source": { "type": "git", "url": "https://github.com/utopia-php/platform.git", - "reference": "04255de21db75e90b170040f4d1b457ba721e7a5" + "reference": "77a863a920122e2c6a6bc6ee5548d366a3f4c6c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/platform/zipball/04255de21db75e90b170040f4d1b457ba721e7a5", - "reference": "04255de21db75e90b170040f4d1b457ba721e7a5", + "url": "https://api.github.com/repos/utopia-php/platform/zipball/77a863a920122e2c6a6bc6ee5548d366a3f4c6c7", + "reference": "77a863a920122e2c6a6bc6ee5548d366a3f4c6c7", "shasum": "" }, "require": { @@ -4701,6 +4701,7 @@ }, "require-dev": { "laravel/pint": "1.*", + "phpstan/phpstan": "2.*", "phpunit/phpunit": "9.*" }, "type": "library", @@ -4723,9 +4724,9 @@ ], "support": { "issues": "https://github.com/utopia-php/platform/issues", - "source": "https://github.com/utopia-php/platform/tree/0.7.12" + "source": "https://github.com/utopia-php/platform/tree/0.7.13" }, - "time": "2025-09-05T15:53:12+00:00" + "time": "2025-12-08T10:02:40+00:00" }, { "name": "utopia-php/pools", @@ -8940,18 +8941,9 @@ "time": "2024-03-07T20:33:40+00:00" } ], - "aliases": [ - { - "package": "utopia-php/database", - "version": "dev-cache-documents-xlist", - "alias": "4.3.0", - "alias_normalized": "4.3.0.0" - } - ], + "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "utopia-php/database": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { 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 5c3691a622..fcec52066a 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 @@ -148,7 +148,7 @@ class XList extends Action $hostname = $dbForProject->getAdapter()->getHostname(); $cacheKeyBase = \sprintf( '%s-cache-%s:%s:%s:collection:%s:%s', - $dbForProject->cacheName, + $dbForProject->getCacheName(), $hostname ?? '', $dbForProject->getNamespace(), $dbForProject->getTenant(), @@ -161,7 +161,7 @@ class XList extends Action $documentsCacheHit = $totalDocumentsCacheHit = false; - $cachedDocuments = $dbForProject->cache->load($documentsCacheKey, $ttl); + $cachedDocuments = $dbForProject->getCache()->load($documentsCacheKey, $ttl); if ($cachedDocuments !== null && $cachedDocuments !== false && @@ -177,17 +177,17 @@ class XList extends Action $documentsArray = \array_map(function ($doc) { return $doc->getArrayCopy(); }, $documents); - $dbForProject->cache->save($documentsCacheKey, $documentsArray); + $dbForProject->getCache()->save($documentsCacheKey, $documentsArray); } if ($includeTotal) { - $cachedTotal = $dbForProject->cache->load($totalCacheKey, $ttl); + $cachedTotal = $dbForProject->getCache()->load($totalCacheKey, $ttl); if ($cachedTotal !== null && $cachedTotal !== false) { $total = $cachedTotal; $totalDocumentsCacheHit = true; } else { $total = $dbForProject->count($collectionTableId, $queries, APP_LIMIT_COUNT); - $dbForProject->cache->save($totalCacheKey, $total); + $dbForProject->getCache()->save($totalCacheKey, $total); } } else { $total = 0;