src/Appwrite/Messaging/Adapter/Realtime.php (2)

87-94: Unused variable $list flagged by static analysis.

The variable $list from the foreach iteration is not used within the loop body. Consider using array_keys() or suppressing with underscore convention if your codebase supports it.

♻️ Suggested fix

-            foreach ($channels as $channel => $list) {
+            foreach (array_keys($channels) as $channel) {
                 if (!isset($this->subscriptions[$projectId][$role][$channel][$identifier])) {
                     $this->subscriptions[$projectId][$role][$channel][$identifier] = [];
                 }
                 foreach ($queryKeys as $queryKey) {
                     $this->subscriptions[$projectId][$role][$channel][$identifier][$queryKey] = true;
                 }
             }

---

115-122: Unused variable $list flagged by static analysis.

Same issue as in subscribe() - the $list variable is unused.

♻️ Suggested fix

-        foreach ($channels as $channel => $list) {
+        foreach (array_keys($channels) as $channel) {
             unset($this->subscriptions[$projectId][$role][$channel][$connection]); // dropping connection will drop the queries as well

             if (empty($this->subscriptions[$projectId][$role][$channel])) {
                 unset($this->subscriptions[$projectId][$role][$channel]);  // Remove channel when no connections
             }
         }

tests/e2e/Services/Realtime/RealtimeCustomClientQueryTest.php (1)

1588-1603: Consider consolidating attribute creation and sleep calls.

The consecutive sleep(2) calls after each attribute creation (lines 1590 and 1602) could be consolidated. Create both attributes first, then sleep once.

♻️ Suggested optimization

         // Attributes used by queries
         $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $projectId,
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
             'key' => 'status',
             'size' => 256,
             'required' => false,
         ]);

-        sleep(2);
-
         $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $projectId,
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
             'key' => 'category',
             'size' => 256,
             'required' => false,
         ]);

-        sleep(2);
+        sleep(3); // Wait for both attributes to be ready

app/realtime.php (1)

492-510: Count only successful sends in telemetry.

If a connection is closed or the send fails, the current logic still increments message counters. Consider guarding the increment with the send result so telemetry and stats reflect actual deliveries.

📊 Suggested adjustment

-                    $server->send(
+                    if ($server->send(
                         [$connectionId],
                         json_encode([
                             'type' => 'event',
                             'data' => $data
                         ])
-                    );
-                    $totalMessages++;
+                    )) {
+                        $totalMessages++;
+                    }

tests/e2e/Services/Realtime/RealtimeCustomClientQueryTest.php (1)

1431-1467: Clarify test logic with comments or restructure.

The test creates a document with status => 'active' (Line 1439) but then immediately creates another document with status => 'inactive' (Lines 1449-1461), and expects to receive the first document's event only at Line 1463.

The inline comments explain this behavior, but the assertion at Lines 1464-1467 validates the queryKeys for the active document, not the inactive one. This is correct but could be clearer. Consider adding an explicit assertion for the document ID to confirm which event was received.

📝 Suggested clarification

         $data = json_decode($client->receive(), true);
+        // Verify we received the active document event (from lines 1431-1444)
+        $this->assertEquals('active', $data['data']['payload']['status']);
         $this->assertIsArray($data['data']['queryKeys']);
         $this->assertEquals(1, count($data['data']['queryKeys']));
         $this->assertNotContains(Query::equal('status', ['inactive'])->toString(), $data['data']['queryKeys']);
         $this->assertContains(Query::equal('status', ['active'])->toString(), $data['data']['queryKeys']);