Merge pull request #193 from utopia-php/fix-status-counters-stray-rows

fix: ignore unrequested row/document types in status counters
This commit is contained in:
Jake Barnby authored and GitHub committed 2026-06-04 16:16:58 +12:00
commit 7638a3a54a
2 files changed
+36

No files matched your search

+9
View File
@@ -251,6 +251,15 @@ class Transfer
foreach ($this->cache->getAll() as $resourceType => $resources) {
foreach ($resources as $k => $resource) {
if (($resourceType === Resource::TYPE_ROW || $resourceType === Resource::TYPE_DOCUMENT) && is_string($resource)) {
// Only report status for resource types that were requested,
// mirroring the isset() guard below. Row/document counts can be
// aggregated into the cache for an unrequested type, which would
// otherwise read an unseeded 'pending' key and leave a phantom,
// non-empty counter.
if (!isset($status[$resourceType])) {
continue;
}
$resource = intval($resource);
$status[$resourceType][$k] = $resource;
@@ -5,6 +5,8 @@ namespace Utopia\Tests\Unit\General;
use PHPUnit\Framework\TestCase;
use Utopia\Migration\Resource;
use Utopia\Migration\Resources\Database\Database;
use Utopia\Migration\Resources\Database\Row;
use Utopia\Migration\Resources\Database\Table;
use Utopia\Migration\Transfer;
use Utopia\Tests\Unit\Adapters\MockDestination;
use Utopia\Tests\Unit\Adapters\MockSource;
@@ -64,4 +66,29 @@ class TransferTest extends TestCase
$this->assertSame('test', $database->getDatabaseName());
$this->assertSame('test', $database->getId());
}
/**
* Row and document counts are aggregated into the cache by status. When such
* a count exists for a resource type that was not part of the migration
* request, getStatusCounters() must ignore it, exactly as it already does for
* non-row resources via the isset() guard. Otherwise it reads an unseeded
* 'pending' key (triggering an "Undefined array key" warning) and reports a
* phantom, non-empty counter for a type the caller never asked to migrate.
*/
public function testStatusCountersIgnoreUnrequestedRowCounts(): void
{
// No resource types were requested, so 'row'/'document' are unrequested.
// A row count still leaks into the cache: the destination tallies row and
// document counts by status as it imports them.
$table = new Table(new Database('db', 'db'), 'table', 'table');
$row = new Row('row-1', $table);
$row->setStatus(Resource::STATUS_SUCCESS);
$this->transfer->getCache()->add($row);
$counters = $this->transfer->getStatusCounters();
$this->assertArrayNotHasKey(Resource::TYPE_ROW, $counters);
$this->assertSame([], $counters);
}
}