fix: wrap shared-tables tests in try/finally to prevent state leaks

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: abnegate

tests/e2e/Adapter/Scopes/CollectionTests.php

@@ -1355,58 +1355,60 @@ public function testSharedTablesMultiTenantCreateCollection(): void
             return;
         }
 
-        $tenant1 = $database->getAdapter()->getIdAttributeType() === Database::VAR_INTEGER ? 10 : 'tenant_10';
-        $tenant2 = $database->getAdapter()->getIdAttributeType() === Database::VAR_INTEGER ? 20 : 'tenant_20';
-        $colName = 'multiTenantCol';
-
-        $database->setTenant($tenant1);
+        try {
+            $tenant1 = $database->getAdapter()->getIdAttributeType() === Database::VAR_INTEGER ? 10 : 'tenant_10';
+            $tenant2 = $database->getAdapter()->getIdAttributeType() === Database::VAR_INTEGER ? 20 : 'tenant_20';
+            $colName = 'multiTenantCol';
 
-        $database->createCollection($colName, [
-            new Document([
-                '$id' => 'name',
-                'type' => Database::VAR_STRING,
-                'size' => 128,
-                'required' => true,
-            ]),
-        ]);
+            $database->setTenant($tenant1);
 
-        $col1 = $database->getCollection($colName);
-        $this->assertFalse($col1->isEmpty());
-        $this->assertEquals(1, \count($col1->getAttribute('attributes')));
+            $database->createCollection($colName, [
+                new Document([
+                    '$id' => 'name',
+                    'type' => Database::VAR_STRING,
+                    'size' => 128,
+                    'required' => true,
+                ]),
+            ]);
 
-        $database->setTenant($tenant2);
+            $col1 = $database->getCollection($colName);
+            $this->assertFalse($col1->isEmpty());
+            $this->assertEquals(1, \count($col1->getAttribute('attributes')));
 
-        $database->createCollection($colName, [
-            new Document([
-                '$id' => 'name',
-                'type' => Database::VAR_STRING,
-                'size' => 128,
-                'required' => true,
-            ]),
-        ]);
+            $database->setTenant($tenant2);
 
-        $col2 = $database->getCollection($colName);
-        $this->assertFalse($col2->isEmpty());
-        $this->assertEquals(1, \count($col2->getAttribute('attributes')));
+            $database->createCollection($colName, [
+                new Document([
+                    '$id' => 'name',
+                    'type' => Database::VAR_STRING,
+                    'size' => 128,
+                    'required' => true,
+                ]),
+            ]);
 
-        $database->setTenant($tenant1);
-        $col1Again = $database->getCollection($colName);
-        $this->assertFalse($col1Again->isEmpty());
+            $col2 = $database->getCollection($colName);
+            $this->assertFalse($col2->isEmpty());
+            $this->assertEquals(1, \count($col2->getAttribute('attributes')));
 
-        if ($createdDb) {
-            $database->delete();
-        } else {
             $database->setTenant($tenant1);
-            $database->deleteCollection($colName);
-            $database->setTenant($tenant2);
-            $database->deleteCollection($colName);
-        }
+            $col1Again = $database->getCollection($colName);
+            $this->assertFalse($col1Again->isEmpty());
 
-        $database
-            ->setSharedTables($sharedTables)
-            ->setNamespace($namespace)
-            ->setDatabase($schema)
-            ->setTenant($originalTenant);
+            if ($createdDb) {
+                $database->delete();
+            } else {
+                $database->setTenant($tenant1);
+                $database->deleteCollection($colName);
+                $database->setTenant($tenant2);
+                $database->deleteCollection($colName);
+            }
+        } finally {
+            $database
+                ->setSharedTables($sharedTables)
+                ->setNamespace($namespace)
+                ->setDatabase($schema)
+                ->setTenant($originalTenant);
+        }
     }
 
     public function testSharedTablesMultiTenantCreate(): void
@@ -1417,47 +1419,47 @@ public function testSharedTablesMultiTenantCreate(): void
         $namespace = $database->getNamespace();
         $schema = $database->getDatabase();
         $originalTenant = $database->getTenant();
-        $createdDb = false;
 
-        $tenant1 = $database->getAdapter()->getIdAttributeType() === Database::VAR_INTEGER ? 100 : 'tenant_100';
-        $tenant2 = $database->getAdapter()->getIdAttributeType() === Database::VAR_INTEGER ? 200 : 'tenant_200';
-
-        if ($sharedTables) {
-            // Already in shared-tables mode; create() should be idempotent.
-            // No assertion on exists() since SQLite always returns false for
-            // database-level exists. The test verifies create() doesn't throw.
-            $database->setTenant($tenant1);
-            $database->create();
-            $database->setTenant($tenant2);
-            $database->create();
-            $this->assertTrue(true);
-        } elseif ($database->getAdapter()->getSupportForSchemas()) {
-            $dbName = 'stMultiCreate';
-            if ($database->exists($dbName)) {
-                $database->setDatabase($dbName)->delete();
+        try {
+            $tenant1 = $database->getAdapter()->getIdAttributeType() === Database::VAR_INTEGER ? 100 : 'tenant_100';
+            $tenant2 = $database->getAdapter()->getIdAttributeType() === Database::VAR_INTEGER ? 200 : 'tenant_200';
+
+            if ($sharedTables) {
+                // Already in shared-tables mode; create() should be idempotent.
+                // No assertion on exists() since SQLite always returns false for
+                // database-level exists. The test verifies create() doesn't throw.
+                $database->setTenant($tenant1);
+                $database->create();
+                $database->setTenant($tenant2);
+                $database->create();
+                $this->assertTrue(true);
+            } elseif ($database->getAdapter()->getSupportForSchemas()) {
+                $dbName = 'stMultiCreate';
+                if ($database->exists($dbName)) {
+                    $database->setDatabase($dbName)->delete();
+                }
+                $database
+                    ->setDatabase($dbName)
+                    ->setNamespace('')
+                    ->setSharedTables(true)
+                    ->setTenant($tenant1)
+                    ->create();
+                $this->assertTrue($database->exists($dbName));
+                $database->setTenant($tenant2);
+                $database->create();
+                $this->assertTrue($database->exists($dbName));
+                $database->delete();
+            } else {
+                $this->expectNotToPerformAssertions();
+                return;
             }
+        } finally {
             $database
-                ->setDatabase($dbName)
-                ->setNamespace('')
-                ->setSharedTables(true)
-                ->setTenant($tenant1)
-                ->create();
-            $this->assertTrue($database->exists($dbName));
-            $database->setTenant($tenant2);
-            $database->create();
-            $this->assertTrue($database->exists($dbName));
-            $database->delete();
-            $createdDb = true;
-        } else {
-            $this->expectNotToPerformAssertions();
-            return;
+                ->setSharedTables($sharedTables)
+                ->setNamespace($namespace)
+                ->setDatabase($schema)
+                ->setTenant($originalTenant);
         }
-
-        $database
-            ->setSharedTables($sharedTables)
-            ->setNamespace($namespace)
-            ->setDatabase($schema)
-            ->setTenant($originalTenant);
     }
 
     public function testEvents(): void