fix: use correct query package branch and resolve PHPStan errors

- Switch utopia-php/query from dev-main to dev-feat-builder (has Parser/Type classes)
- Fix ordered_imports lint issues in Swoole.php and EdgeIntegrationTest.php
- Add PHPDoc type annotations to satisfy PHPStan level=max
- Fix unpack() false check, null-safe fclose, and remove unused property

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: abnegate

composer.json

@@ -13,7 +13,7 @@
         "php": ">=8.4",
         "ext-swoole": ">=6.0",
         "ext-redis": "*",
-        "utopia-php/query": "dev-main"
+        "utopia-php/query": "dev-feat-builder"
     },
     "require-dev": {
         "phpunit/phpunit": "12.*",

src/Adapter.php

@@ -117,6 +117,9 @@ public function recordBytes(
         $this->byteCounters[$resourceId]['outbound'] += $outbound;
     }
 
+    /**
+     * @param  array<string, mixed>  $metadata  Activity metadata
+     */
     public function track(string $resourceId, array $metadata = []): void
     {
         $now = time();

src/Adapter/TCP.php

@@ -382,7 +382,12 @@ protected function parseMongoDatabaseId(string $data): string
             throw new \Exception('Invalid MongoDB database name');
         }
 
-        $strLen = \unpack('V', \substr($data, $offset, 4))[1];
+        $unpacked = \unpack('V', \substr($data, $offset, 4));
+        if ($unpacked === false) {
+            throw new \Exception('Invalid MongoDB database name');
+        }
+        /** @var int $strLen */
+        $strLen = $unpacked[1];
         $offset += 4;
 
         if ($offset + $strLen > \strlen($data)) {

src/Server/TCP/Swoole.php

@@ -6,9 +6,9 @@
 use Swoole\Coroutine\Client;
 use Swoole\Server;
 use Utopia\Proxy\Adapter\TCP as TCPAdapter;
-use Utopia\Query\Type as QueryType;
 use Utopia\Proxy\Resolver;
 use Utopia\Proxy\Resolver\ReadWriteResolver;
+use Utopia\Query\Type as QueryType;
 
 /**
  * High-performance TCP proxy server (Swoole Implementation)
@@ -352,6 +352,7 @@ public function onReceive(Server $server, int $fd, int $reactorId, string $data)
     protected function startForwarding(Server $server, int $clientFd, Client $backendClient): void
     {
         $bufferSize = $this->config->recvBufferSize;
+        /** @var \Swoole\Coroutine\Socket $backendSocket */
         $backendSocket = $backendClient->exportSocket();
 
         $databaseId = $this->clientDatabaseIds[$clientFd] ?? null;
@@ -360,6 +361,7 @@ protected function startForwarding(Server $server, int $clientFd, Client $backen
 
         Coroutine::create(function () use ($server, $clientFd, $backendSocket, $bufferSize, $databaseId, $adapter) {
             while ($server->exist($clientFd)) {
+                /** @var string|false $data */
                 $data = $backendSocket->recv($bufferSize);
                 if ($data === false || $data === '') {
                     break;

src/Server/TCP/SwooleCoroutine.php

@@ -136,6 +136,7 @@ public function onWorkerStart(int $workerId = 0): void
 
     protected function handleConnection(Connection $connection, int $port): void
     {
+        /** @var \Swoole\Coroutine\Socket $clientSocket */
         $clientSocket = $connection->exportSocket();
         $clientId = spl_object_id($connection);
         $adapter = $this->adapters[$port];
@@ -146,6 +147,7 @@ protected function handleConnection(Connection $connection, int $port): void
         }
 
         // Wait for first packet to establish backend connection
+        /** @var string|false $data */
         $data = $clientSocket->recv($bufferSize);
         if ($data === false || $data === '') {
             $clientSocket->close();
@@ -163,6 +165,7 @@ protected function handleConnection(Connection $connection, int $port): void
 
             // The TLS handshake is handled by Swoole at the transport layer.
             // Read the real startup message that follows.
+            /** @var string|false $data */
             $data = $clientSocket->recv($bufferSize);
             if ($data === false || $data === '') {
                 $clientSocket->close();
@@ -174,6 +177,7 @@ protected function handleConnection(Connection $connection, int $port): void
         try {
             $databaseId = $adapter->parseDatabaseId($data, $clientId);
             $backendClient = $adapter->getBackendConnection($databaseId, $clientId);
+            /** @var \Swoole\Coroutine\Socket $backendSocket */
             $backendSocket = $backendClient->exportSocket();
 
             // Notify connect
@@ -182,6 +186,7 @@ protected function handleConnection(Connection $connection, int $port): void
             // Start backend -> client forwarding in separate coroutine
             Coroutine::create(function () use ($clientSocket, $backendSocket, $bufferSize, $adapter, $databaseId): void {
                 while (true) {
+                    /** @var string|false $data */
                     $data = $backendSocket->recv($bufferSize);
                     if ($data === false || $data === '') {
                         break;
@@ -206,6 +211,7 @@ protected function handleConnection(Connection $connection, int $port): void
 
         // Client -> backend forwarding in current coroutine
         while (true) {
+            /** @var string|false $data */
             $data = $clientSocket->recv($bufferSize);
             if ($data === false || $data === '') {
                 break;

tests/Integration/EdgeIntegrationTest.php

@@ -6,11 +6,11 @@
 use Utopia\Proxy\Adapter\TCP as TCPAdapter;
 use Utopia\Proxy\ConnectionResult;
 use Utopia\Proxy\Protocol;
-use Utopia\Query\Type as QueryType;
 use Utopia\Proxy\Resolver;
 use Utopia\Proxy\Resolver\Exception as ResolverException;
 use Utopia\Proxy\Resolver\ReadWriteResolver;
 use Utopia\Proxy\Resolver\Result;
+use Utopia\Query\Type as QueryType;
 
 /**
  * Integration test for the protocol-proxy's ability to resolve database
@@ -644,6 +644,7 @@ public function testStatsAggregateAcrossOperations(): void
         $this->assertGreaterThan(0.0, $stats['cacheHitRate']);
         $this->assertSame(0, $stats['routingErrors']);
 
+        /** @var array<string, mixed> $resolverStats */
         $resolverStats = $stats['resolver'];
         $this->assertSame(1, $resolverStats['connects']);
         $this->assertSame(1, $resolverStats['disconnects']);

tests/Performance/PerformanceTest.php

@@ -38,7 +38,6 @@ final class PerformanceTest extends TestCase
 {
     private string $host;
     private int $port;
-    private int $mysqlPort;
     private int $iterations;
     private int $warmupIterations;
     private string $databaseId;
@@ -98,7 +97,6 @@ protected function setUp(): void
 
         $this->host = getenv('PERF_PROXY_HOST') ?: '127.0.0.1';
         $this->port = (int) (getenv('PERF_PROXY_PORT') ?: 5432);
-        $this->mysqlPort = (int) (getenv('PERF_PROXY_MYSQL_PORT') ?: 3306);
         $this->iterations = (int) (getenv('PERF_ITERATIONS') ?: 1000);
         $this->warmupIterations = (int) (getenv('PERF_WARMUP_ITERATIONS') ?: 100);
         $this->databaseId = getenv('PERF_DATABASE_ID') ?: 'test-db';
@@ -484,7 +482,10 @@ public function testConnectionPoolExhaustion(): void
         // Verify we can still connect after closing some connections
         $closedCount = min(100, count($sockets));
         for ($i = 0; $i < $closedCount; $i++) {
-            fclose(array_pop($sockets));
+            $sock = array_pop($sockets);
+            if ($sock !== null) {
+                fclose($sock);
+            }
         }
 
         // Small delay for the proxy to process disconnections