From cce2272d20d0e2c83ef4ccfd88fac37b91236b4e Mon Sep 17 00:00:00 2001 From: fogelito Date: Thu, 23 Jul 2026 15:40:22 +0300 Subject: [PATCH 01/12] Run tests --- composer.json | 2 +- composer.lock | 69 +++++++++++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index 56e88d11dd..0cb367651e 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,7 @@ "utopia-php/compression": "0.1.*", "utopia-php/config": "1.*", "utopia-php/console": "0.1.*", - "utopia-php/database": "^6.0.0", + "utopia-php/database": "dev-cache-empty-get-document as 6.4.4", "utopia-php/detector": "0.2.*", "utopia-php/domains": "^2.2", "utopia-php/emails": "0.7.*", diff --git a/composer.lock b/composer.lock index d543a8dac7..2a69396aa7 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": "45a96f275db3fcab689375890cd5b41d", + "content-hash": "0442ef49d895dff3eba1d92090ed5be8", "packages": [ { "name": "adhocore/jwt", @@ -3167,7 +3167,7 @@ }, { "name": "utopia-php/audit", - "version": "2.9.0", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/utopia-php/audit.git", @@ -3206,7 +3206,7 @@ ], "support": { "issues": "https://github.com/utopia-php/audit/issues", - "source": "https://github.com/utopia-php/audit/tree/2.9.0" + "source": "https://github.com/utopia-php/audit/tree/2.9.1" }, "time": "2026-07-15T10:27:51+00:00" }, @@ -3635,16 +3635,16 @@ }, { "name": "utopia-php/database", - "version": "6.4.4", + "version": "dev-cache-empty-get-document", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "a1796fd360d58abcc3bb3e1b615fcebc04ba9100" + "reference": "6968bd0ce88aa963548f87e127fa8fd1f22180a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/a1796fd360d58abcc3bb3e1b615fcebc04ba9100", - "reference": "a1796fd360d58abcc3bb3e1b615fcebc04ba9100", + "url": "https://api.github.com/repos/utopia-php/database/zipball/6968bd0ce88aa963548f87e127fa8fd1f22180a6", + "reference": "6968bd0ce88aa963548f87e127fa8fd1f22180a6", "shasum": "" }, "require": { @@ -3689,9 +3689,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/6.4.4" + "source": "https://github.com/utopia-php/database/tree/cache-empty-get-document" }, - "time": "2026-07-17T08:21:36+00:00" + "time": "2026-07-23T11:43:56+00:00" }, { "name": "utopia-php/detector", @@ -4108,16 +4108,16 @@ }, { "name": "utopia-php/image", - "version": "0.8.7", + "version": "0.8.9", "source": { "type": "git", "url": "https://github.com/utopia-php/image.git", - "reference": "ed06c72998869f5d66026c7e4b7e1bcc1bbf45c7" + "reference": "6647714267e43bae25c8e8ae7021264eca4a1e84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/image/zipball/ed06c72998869f5d66026c7e4b7e1bcc1bbf45c7", - "reference": "ed06c72998869f5d66026c7e4b7e1bcc1bbf45c7", + "url": "https://api.github.com/repos/utopia-php/image/zipball/6647714267e43bae25c8e8ae7021264eca4a1e84", + "reference": "6647714267e43bae25c8e8ae7021264eca4a1e84", "shasum": "" }, "require": { @@ -4125,11 +4125,6 @@ "ext-imagick": "*", "php": ">=8.1" }, - "require-dev": { - "laravel/pint": "1.24.*", - "phpstan/phpstan": "2.1.*", - "phpunit/phpunit": "10.5.*" - }, "suggest": { "ext-imagick": "Imagick extension is required for Imagick adapter" }, @@ -4153,9 +4148,9 @@ ], "support": { "issues": "https://github.com/utopia-php/image/issues", - "source": "https://github.com/utopia-php/image/tree/0.8.7" + "source": "https://github.com/utopia-php/image/tree/0.8.9" }, - "time": "2026-07-13T12:12:06+00:00" + "time": "2026-07-20T18:04:09+00:00" }, { "name": "utopia-php/locale", @@ -5403,31 +5398,31 @@ "packages-dev": [ { "name": "appwrite/sdk-generator", - "version": "2.4.13", + "version": "2.4.16", "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator.git", - "reference": "7ead3b6ff1746ae950cacca55bc9800708d5beff" + "reference": "86710bff786da01ed269c87add272f9035fce898" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/7ead3b6ff1746ae950cacca55bc9800708d5beff", - "reference": "7ead3b6ff1746ae950cacca55bc9800708d5beff", + "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/86710bff786da01ed269c87add272f9035fce898", + "reference": "86710bff786da01ed269c87add272f9035fce898", "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", - "matthiasmullie/minify": "1.3.*", + "matthiasmullie/minify": "^1.3", "php": ">=8.5", - "twig/twig": "3.28.*" + "twig/twig": "^3.28" }, "require-dev": { - "brianium/paratest": "7.*", - "phpunit/phpunit": "11.*", + "brianium/paratest": "^7", + "phpunit/phpunit": "^11", "rector/rector": "^2.4", - "squizlabs/php_codesniffer": "4.*" + "squizlabs/php_codesniffer": "^4" }, "type": "library", "autoload": { @@ -5449,9 +5444,9 @@ "description": "SDK generator for Appwrite APIs across multiple programming languages and platforms", "support": { "issues": "https://github.com/appwrite/sdk-generator/issues", - "source": "https://github.com/appwrite/sdk-generator/tree/2.4.13" + "source": "https://github.com/appwrite/sdk-generator/tree/2.4.16" }, - "time": "2026-07-13T07:30:15+00:00" + "time": "2026-07-23T11:30:01+00:00" }, { "name": "brianium/paratest", @@ -8394,9 +8389,17 @@ "time": "2026-07-03T20:44:34+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "utopia-php/database", + "version": "dev-cache-empty-get-document", + "alias": "6.4.4", + "alias_normalized": "6.4.4.0" + } + ], "minimum-stability": "dev", "stability-flags": { + "utopia-php/database": 20, "utopia-php/http": 5, "utopia-php/platform": 5 }, @@ -8420,5 +8423,5 @@ "platform-dev": { "ext-fileinfo": "*" }, - "plugin-api-version": "2.9.0" + "plugin-api-version": "2.6.0" } From e4337538c25a312ef0eff15992a1fa391e792d5e Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sat, 25 Jul 2026 03:35:07 +0000 Subject: [PATCH 02/12] fix: preserve multiline .env secrets across install/upgrade The Docker Env parser treated each physical line as a separate assignment, so quoted multiline values (notably _APP_VCS_GITHUB_PRIVATE_KEY PEMs) were split and corrupted when the installer rewrote .env during upgrades. Parse double-quoted values with escapes/multiline support, encode newlines when writing .env, and stop rejecting multiline install inputs. Co-authored-by: Chirag Aggarwal --- app/views/install/env.phtml | 4 +- src/Appwrite/Docker/Env.php | 137 ++++++++++++++++++++---- src/Appwrite/Platform/Tasks/Install.php | 10 +- tests/unit/Docker/EnvTest.php | 56 +++++++++- 4 files changed, 174 insertions(+), 33 deletions(-) diff --git a/app/views/install/env.phtml b/app/views/install/env.phtml index 51bda7a6fb..f956144d97 100644 --- a/app/views/install/env.phtml +++ b/app/views/install/env.phtml @@ -6,7 +6,9 @@ foreach ($vars as $key => $value) { if ($value === null || $value === '') { echo $key . "=\n"; } else { - echo $key . '="' . addcslashes((string) $value, '"\\$`') . '"' . "\n"; + // Escape newlines and special chars so multiline secrets (e.g. GitHub App + // private keys) survive install/upgrade rewrites as a single .env line. + echo $key . '="' . \Appwrite\Docker\Env::encodeValue((string) $value) . '"' . "\n"; } } ?> \ No newline at end of file diff --git a/src/Appwrite/Docker/Env.php b/src/Appwrite/Docker/Env.php index 7e44a6c5cf..9a055eaa9a 100644 --- a/src/Appwrite/Docker/Env.php +++ b/src/Appwrite/Docker/Env.php @@ -5,31 +5,117 @@ namespace Appwrite\Docker; class Env { /** - * @var array + * @var array */ protected $vars = []; public function __construct(string $data) { - $data = explode("\n", $data); + $length = \strlen($data); + $offset = 0; - foreach ($data as &$row) { - $row = explode('=', $row, 2); - $key = trim($row[0]); - $value = (isset($row[1])) ? (function (string $v): string { - $v = trim($v); - if ( - (\str_starts_with($v, '"') && \str_ends_with($v, '"')) || - (\str_starts_with($v, "'") && \str_ends_with($v, "'")) - ) { - return \substr($v, 1, -1); - } - return $v; - })(trim($row[1])) : null; - - if ($key) { - $this->vars[$key] = $value; + while ($offset < $length) { + // Skip blank lines and comments. + if ($data[$offset] === "\n" || $data[$offset] === "\r") { + $offset++; + continue; } + + if ($data[$offset] === '#') { + $nextLine = \strpos($data, "\n", $offset); + $offset = $nextLine === false ? $length : $nextLine + 1; + continue; + } + + $equals = \strpos($data, '=', $offset); + if ($equals === false) { + break; + } + + $key = \trim(\substr($data, $offset, $equals - $offset)); + $offset = $equals + 1; + + if ($key === '') { + // Skip malformed lines without a key. + $nextLine = \strpos($data, "\n", $offset); + $offset = $nextLine === false ? $length : $nextLine + 1; + continue; + } + + // Consume optional whitespace before the value. + while ($offset < $length && ($data[$offset] === ' ' || $data[$offset] === "\t")) { + $offset++; + } + + if ($offset >= $length || $data[$offset] === "\n" || $data[$offset] === "\r") { + $this->vars[$key] = ''; + if ($offset < $length) { + $offset++; + } + continue; + } + + $quote = $data[$offset]; + if ($quote === '"' || $quote === "'") { + $offset++; + $value = ''; + while ($offset < $length) { + $char = $data[$offset]; + + if ($char === $quote) { + $offset++; + break; + } + + if ($quote === '"' && $char === '\\' && $offset + 1 < $length) { + $next = $data[$offset + 1]; + $value .= match ($next) { + 'n' => "\n", + 'r' => "\r", + 't' => "\t", + '\\' => '\\', + '"' => '"', + "'" => "'", + '$' => '$', + '`' => '`', + default => $next, + }; + $offset += 2; + continue; + } + + $value .= $char; + $offset++; + } + + // Consume trailing characters until end of line (comments/whitespace). + while ($offset < $length && $data[$offset] !== "\n" && $data[$offset] !== "\r") { + $offset++; + } + if ($offset < $length) { + $offset++; + } + + $this->vars[$key] = $value; + continue; + } + + // Unquoted value: read until end of line, trim trailing whitespace. + $end = \strpos($data, "\n", $offset); + if ($end === false) { + $raw = \substr($data, $offset); + $offset = $length; + } else { + $raw = \substr($data, $offset, $end - $offset); + $offset = $end + 1; + } + + // Strip inline comments preceded by whitespace. + if (\preg_match('/\s+#/', $raw, $matches, PREG_OFFSET_CAPTURE) === 1) { + $raw = \substr($raw, 0, $matches[0][1]); + } + + $this->vars[$key] = \rtrim($raw, " \t\r"); } } @@ -66,6 +152,14 @@ class Env return $this->vars; } + /** + * Encode a value for a double-quoted .env assignment. + */ + public static function encodeValue(string $value): string + { + return \addcslashes($value, "\"\\\n\r\t\$`"); + } + /** * @return string */ @@ -74,7 +168,12 @@ class Env $output = ''; foreach ($this->vars as $key => $value) { - $output .= $key . '=' . $value . "\n"; + if ($value === null || $value === '') { + $output .= $key . "=\n"; + continue; + } + + $output .= $key . '="' . self::encodeValue((string) $value) . "\"\n"; } return $output; diff --git a/src/Appwrite/Platform/Tasks/Install.php b/src/Appwrite/Platform/Tasks/Install.php index 7462934ec4..ac5b2c1a03 100644 --- a/src/Appwrite/Platform/Tasks/Install.php +++ b/src/Appwrite/Platform/Tasks/Install.php @@ -426,14 +426,8 @@ class Install extends Action } } - foreach ($input as $key => $value) { - if (!is_string($value)) { - continue; - } - if (str_contains($value, "\n") || str_contains($value, "\r")) { - throw new \InvalidArgumentException('Invalid value for ' . $key); - } - } + // Multiline values (e.g. GitHub App PEM private keys) are allowed; env.phtml + // encodes them as escaped single-line double-quoted assignments. // Set database-specific connection details $database = $input['_APP_DB_ADAPTER'] ?? 'postgresql'; diff --git a/tests/unit/Docker/EnvTest.php b/tests/unit/Docker/EnvTest.php index 4f11d31947..530b6d2ae0 100644 --- a/tests/unit/Docker/EnvTest.php +++ b/tests/unit/Docker/EnvTest.php @@ -36,10 +36,56 @@ final class EnvTest extends TestCase public function testExport(): void { - $this->assertSame("_APP_X=value1 -_APP_Y=value2 -_APP_Z=value3 -_APP_W=value5= -", $this->object->export()); + $this->assertSame( + "_APP_X=\"value1\"\n_APP_Y=\"value2\"\n_APP_Z=\"value3\"\n_APP_W=\"value5=\"\n", + $this->object->export() + ); + } + + public function testMultilineDoubleQuotedPrivateKey(): void + { + $pem = "-----BEGIN RSA PRIVATE KEY-----\nABCDEF\n-----END RSA PRIVATE KEY-----"; + $data = "_APP_VCS_GITHUB_PRIVATE_KEY=\"-----BEGIN RSA PRIVATE KEY-----\nABCDEF\n-----END RSA PRIVATE KEY-----\"\n_APP_OTHER=ok\n"; + + $env = new Env($data); + + $this->assertSame($pem, $env->getVar('_APP_VCS_GITHUB_PRIVATE_KEY')); + $this->assertSame('ok', $env->getVar('_APP_OTHER')); + } + + public function testEscapedNewlineInDoubleQuotedValue(): void + { + $data = "_APP_VCS_GITHUB_PRIVATE_KEY=\"-----BEGIN RSA PRIVATE KEY-----\\nABCDEF\\n-----END RSA PRIVATE KEY-----\"\n"; + + $env = new Env($data); + + $this->assertSame( + "-----BEGIN RSA PRIVATE KEY-----\nABCDEF\n-----END RSA PRIVATE KEY-----", + $env->getVar('_APP_VCS_GITHUB_PRIVATE_KEY') + ); + } + + public function testRoundTripPreservesMultilineSecret(): void + { + $pem = "-----BEGIN RSA PRIVATE KEY-----\nLINE1\nLINE2\n-----END RSA PRIVATE KEY-----"; + $env = new Env(''); + $env->setVar('_APP_VCS_GITHUB_PRIVATE_KEY', $pem); + $env->setVar('_APP_DOMAIN', 'example.com'); + + $exported = $env->export(); + $reloaded = new Env($exported); + + $this->assertSame($pem, $reloaded->getVar('_APP_VCS_GITHUB_PRIVATE_KEY')); + $this->assertSame('example.com', $reloaded->getVar('_APP_DOMAIN')); + $this->assertStringNotContainsString("\nLINE1\n", $exported); + $this->assertStringContainsString('\\nLINE1\\n', $exported); + } + + public function testEncodeValueEscapesSpecialCharacters(): void + { + $this->assertSame( + 'say\\"hi\\nnext\\$path', + Env::encodeValue("say\"hi\nnext\$path") + ); } } From b1d2bd3c83fb266de84043871bbffa8e0f0c1c60 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sun, 26 Jul 2026 03:35:10 +0000 Subject: [PATCH 03/12] fix(compose): restore unless-stopped restart for MongoDB and tasks on-failure:3 does not restart containers after a host/Docker daemon reboot, so mongodb and scheduler/maintenance tasks stayed down while the rest of the stack recovered. Revert these services to unless-stopped to match production expectations for the installer compose template. Fixes #13002 Co-authored-by: Chirag Aggarwal --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a23a2e1b8b..ddcf62e216 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -935,7 +935,7 @@ services: - _APP_MIGRATION_HOST appwrite-task-maintenance: entrypoint: maintenance - restart: on-failure:3 + restart: unless-stopped logging: driver: json-file options: @@ -982,7 +982,7 @@ services: - _APP_DATABASE_SHARED_TABLES appwrite-task-interval: entrypoint: interval - restart: on-failure:3 + restart: unless-stopped logging: driver: json-file options: @@ -1024,7 +1024,7 @@ services: appwrite-task-scheduler-functions: entrypoint: schedule-functions - restart: on-failure:3 + restart: unless-stopped logging: driver: json-file options: @@ -1063,7 +1063,7 @@ services: - _APP_DATABASE_SHARED_TABLES appwrite-task-scheduler-executions: entrypoint: schedule-executions - restart: on-failure:3 + restart: unless-stopped logging: driver: json-file options: @@ -1102,7 +1102,7 @@ services: - _APP_DATABASE_SHARED_TABLES appwrite-task-scheduler-messages: entrypoint: schedule-messages - restart: on-failure:3 + restart: unless-stopped logging: driver: json-file options: @@ -1290,7 +1290,7 @@ services: options: max-file: "5" max-size: 10m - restart: on-failure:3 + restart: unless-stopped networks: - appwrite volumes: From 0807cca2a9b41a4ab5f87215e8074739e31eb9ca Mon Sep 17 00:00:00 2001 From: fogelito Date: Sun, 26 Jul 2026 09:54:23 +0300 Subject: [PATCH 04/12] Add test --- composer.lock | 93 ++++++++++--------- .../e2e/Services/Databases/DatabasesBase.php | 49 ++++++++++ 2 files changed, 97 insertions(+), 45 deletions(-) diff --git a/composer.lock b/composer.lock index fa94a2fb54..dc6d9a8565 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": "a811ab43bece6d9d01be1caab8a08a75", + "content-hash": "1737ce10d83c99185ebde7bcaf4fc70d", "packages": [ { "name": "adhocore/jwt", @@ -3167,7 +3167,7 @@ }, { "name": "utopia-php/audit", - "version": "2.9.0", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/utopia-php/audit.git", @@ -3206,7 +3206,7 @@ ], "support": { "issues": "https://github.com/utopia-php/audit/issues", - "source": "https://github.com/utopia-php/audit/tree/2.9.0" + "source": "https://github.com/utopia-php/audit/tree/2.9.1" }, "time": "2026-07-15T10:27:51+00:00" }, @@ -3635,16 +3635,16 @@ }, { "name": "utopia-php/database", - "version": "6.4.4", + "version": "dev-cache-empty-get-document", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "a1796fd360d58abcc3bb3e1b615fcebc04ba9100" + "reference": "6968bd0ce88aa963548f87e127fa8fd1f22180a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/a1796fd360d58abcc3bb3e1b615fcebc04ba9100", - "reference": "a1796fd360d58abcc3bb3e1b615fcebc04ba9100", + "url": "https://api.github.com/repos/utopia-php/database/zipball/6968bd0ce88aa963548f87e127fa8fd1f22180a6", + "reference": "6968bd0ce88aa963548f87e127fa8fd1f22180a6", "shasum": "" }, "require": { @@ -3689,9 +3689,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/6.4.4" + "source": "https://github.com/utopia-php/database/tree/cache-empty-get-document" }, - "time": "2026-07-17T08:21:36+00:00" + "time": "2026-07-23T11:43:56+00:00" }, { "name": "utopia-php/detector", @@ -4108,16 +4108,16 @@ }, { "name": "utopia-php/image", - "version": "0.8.7", + "version": "0.8.9", "source": { "type": "git", "url": "https://github.com/utopia-php/image.git", - "reference": "ed06c72998869f5d66026c7e4b7e1bcc1bbf45c7" + "reference": "6647714267e43bae25c8e8ae7021264eca4a1e84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/image/zipball/ed06c72998869f5d66026c7e4b7e1bcc1bbf45c7", - "reference": "ed06c72998869f5d66026c7e4b7e1bcc1bbf45c7", + "url": "https://api.github.com/repos/utopia-php/image/zipball/6647714267e43bae25c8e8ae7021264eca4a1e84", + "reference": "6647714267e43bae25c8e8ae7021264eca4a1e84", "shasum": "" }, "require": { @@ -4125,11 +4125,6 @@ "ext-imagick": "*", "php": ">=8.1" }, - "require-dev": { - "laravel/pint": "1.24.*", - "phpstan/phpstan": "2.1.*", - "phpunit/phpunit": "10.5.*" - }, "suggest": { "ext-imagick": "Imagick extension is required for Imagick adapter" }, @@ -4153,9 +4148,9 @@ ], "support": { "issues": "https://github.com/utopia-php/image/issues", - "source": "https://github.com/utopia-php/image/tree/0.8.7" + "source": "https://github.com/utopia-php/image/tree/0.8.9" }, - "time": "2026-07-13T12:12:06+00:00" + "time": "2026-07-20T18:04:09+00:00" }, { "name": "utopia-php/locale", @@ -5421,31 +5416,31 @@ "packages-dev": [ { "name": "appwrite/sdk-generator", - "version": "2.4.13", + "version": "2.4.19", "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator.git", - "reference": "7ead3b6ff1746ae950cacca55bc9800708d5beff" + "reference": "d0e58c93a8d7021a69d2a5d6b30fa826a5404fb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/7ead3b6ff1746ae950cacca55bc9800708d5beff", - "reference": "7ead3b6ff1746ae950cacca55bc9800708d5beff", + "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/d0e58c93a8d7021a69d2a5d6b30fa826a5404fb9", + "reference": "d0e58c93a8d7021a69d2a5d6b30fa826a5404fb9", "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", - "matthiasmullie/minify": "1.3.*", + "matthiasmullie/minify": "^1.3", "php": ">=8.5", - "twig/twig": "3.28.*" + "twig/twig": "^3.28" }, "require-dev": { - "brianium/paratest": "7.*", - "phpunit/phpunit": "11.*", + "brianium/paratest": "^7", + "phpunit/phpunit": "^11", "rector/rector": "^2.4", - "squizlabs/php_codesniffer": "4.*" + "squizlabs/php_codesniffer": "^4" }, "type": "library", "autoload": { @@ -5467,9 +5462,9 @@ "description": "SDK generator for Appwrite APIs across multiple programming languages and platforms", "support": { "issues": "https://github.com/appwrite/sdk-generator/issues", - "source": "https://github.com/appwrite/sdk-generator/tree/2.4.13" + "source": "https://github.com/appwrite/sdk-generator/tree/2.4.19" }, - "time": "2026-07-13T07:30:15+00:00" + "time": "2026-07-24T06:18:23+00:00" }, { "name": "brianium/paratest", @@ -6586,16 +6581,16 @@ }, { "name": "phpunit/phpunit", - "version": "12.5.31", + "version": "12.5.32", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0608d157a284f15cc73b99a3327eff06b66a176d" + "reference": "c02591dd7840ed124a98d7770753329ad28e9f8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0608d157a284f15cc73b99a3327eff06b66a176d", - "reference": "0608d157a284f15cc73b99a3327eff06b66a176d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c02591dd7840ed124a98d7770753329ad28e9f8f", + "reference": "c02591dd7840ed124a98d7770753329ad28e9f8f", "shasum": "" }, "require": { @@ -6664,7 +6659,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.31" + "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.32" }, "funding": [ { @@ -6672,7 +6667,7 @@ "type": "other" } ], - "time": "2026-07-06T14:54:16+00:00" + "time": "2026-07-25T06:54:13+00:00" }, { "name": "rector/rector", @@ -7697,16 +7692,16 @@ }, { "name": "swoole/ide-helper", - "version": "6.0.2", + "version": "6.2.2", "source": { "type": "git", "url": "https://github.com/swoole/ide-helper.git", - "reference": "6f12243dce071714c5febe059578d909698f9a52" + "reference": "ad91a281e135f498426fb2e5297376581a4e2dca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swoole/ide-helper/zipball/6f12243dce071714c5febe059578d909698f9a52", - "reference": "6f12243dce071714c5febe059578d909698f9a52", + "url": "https://api.github.com/repos/swoole/ide-helper/zipball/ad91a281e135f498426fb2e5297376581a4e2dca", + "reference": "ad91a281e135f498426fb2e5297376581a4e2dca", "shasum": "" }, "type": "library", @@ -7723,9 +7718,9 @@ "description": "IDE help files for Swoole.", "support": { "issues": "https://github.com/swoole/ide-helper/issues", - "source": "https://github.com/swoole/ide-helper/tree/6.0.2" + "source": "https://github.com/swoole/ide-helper/tree/6.2.2" }, - "time": "2025-03-23T07:31:41+00:00" + "time": "2026-07-25T08:15:29+00:00" }, { "name": "symfony/console", @@ -8412,9 +8407,17 @@ "time": "2026-07-03T20:44:34+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "utopia-php/database", + "version": "dev-cache-empty-get-document", + "alias": "6.4.4", + "alias_normalized": "6.4.4.0" + } + ], "minimum-stability": "dev", "stability-flags": { + "utopia-php/database": 20, "utopia-php/http": 5, "utopia-php/platform": 5 }, @@ -8438,5 +8441,5 @@ "platform-dev": { "ext-fileinfo": "*" }, - "plugin-api-version": "2.9.0" + "plugin-api-version": "2.6.0" } diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php index 4beed77479..fa4340b574 100644 --- a/tests/e2e/Services/Databases/DatabasesBase.php +++ b/tests/e2e/Services/Databases/DatabasesBase.php @@ -3732,6 +3732,55 @@ trait DatabasesBase } } + public function testGetDocumentCacheEmpty(): void + { + $data = $this->setupIndexes(); + $databaseId = $data['databaseId']; + $containerId = $data['moviesId']; + + $documentId = ID::unique(); + + // Read a document that does not exist yet -> negatively caches the miss. + $missing = $this->client->call(Client::METHOD_GET, $this->getRecordUrl($databaseId, $containerId, $documentId), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders())); + + $this->assertEquals(404, $missing['headers']['status-code']); + + // Create that same id. This must purge the cached "not found". + $created = $this->client->call(Client::METHOD_POST, $this->getRecordUrl($databaseId, $containerId), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders()), [ + $this->getRecordIdParam() => $documentId, + 'data' => [ + 'title' => 'Cached Empty', + 'releaseYear' => 2020, + 'birthDay' => null, + ], + 'permissions' => [ + Permission::read(Role::user($this->getUser()['$id'])), + Permission::update(Role::user($this->getUser()['$id'])), + Permission::delete(Role::user($this->getUser()['$id'])), + ], + ]); + + $this->assertEquals(201, $created['headers']['status-code']); + $this->assertEquals($documentId, $created['body']['$id']); + + // The freshly created document must be visible right away. Without cache + // invalidation on create this would still return 404 from the marker. + $fetched = $this->client->call(Client::METHOD_GET, $this->getRecordUrl($databaseId, $containerId, $documentId), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders())); + + $this->assertEquals(200, $fetched['headers']['status-code']); + $this->assertEquals($documentId, $fetched['body']['$id']); + $this->assertEquals('Cached Empty', $fetched['body']['title']); + } + public function testGetDocumentWithQueries(): void { $data = $this->getDocumentsList(); From ae70e469172e08deabde653da55adce47d8d5e29 Mon Sep 17 00:00:00 2001 From: fogelito Date: Sun, 26 Jul 2026 11:21:43 +0300 Subject: [PATCH 05/12] Update test --- .../e2e/Services/Databases/DatabasesBase.php | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php index fa4340b574..1b5d0c4d73 100644 --- a/tests/e2e/Services/Databases/DatabasesBase.php +++ b/tests/e2e/Services/Databases/DatabasesBase.php @@ -3734,9 +3734,34 @@ trait DatabasesBase public function testGetDocumentCacheEmpty(): void { - $data = $this->setupIndexes(); - $databaseId = $data['databaseId']; - $containerId = $data['moviesId']; + $databaseId = $this->setupDatabase()['databaseId']; + + // Dedicated collection so the inserted document cannot change the + // document counts asserted by the shared movies-collection tests. + $collection = $this->client->call(Client::METHOD_POST, $this->getContainerUrl($databaseId), [ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'], + ], [ + $this->getContainerIdParam() => ID::unique(), + 'name' => 'CacheEmpty', + $this->getSecurityParam() => true, + 'permissions' => [ + Permission::create(Role::user($this->getUser()['$id'])), + ], + ]); + + $this->assertEquals(201, $collection['headers']['status-code']); + $containerId = $collection['body']['$id']; + + if ($this->getSupportForAttributes()) { + $this->createAttribute($databaseId, $containerId, 'string', [ + 'key' => 'title', + 'size' => 256, + 'required' => false, + ]); + $this->waitForAttribute($databaseId, $containerId, 'title'); + } $documentId = ID::unique(); @@ -3756,13 +3781,9 @@ trait DatabasesBase $this->getRecordIdParam() => $documentId, 'data' => [ 'title' => 'Cached Empty', - 'releaseYear' => 2020, - 'birthDay' => null, ], 'permissions' => [ Permission::read(Role::user($this->getUser()['$id'])), - Permission::update(Role::user($this->getUser()['$id'])), - Permission::delete(Role::user($this->getUser()['$id'])), ], ]); From c7f24a13d80ba2881a91e058e7bf79bf2eb51bbf Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 27 Jul 2026 05:32:36 +0000 Subject: [PATCH 06/12] fix: harden multiline .env parsing for comments and escapes Preserve unknown backslash escapes and keep assignment lookup line-scoped so blank/indented comment lines cannot swallow the next key. Co-authored-by: Chirag Aggarwal --- src/Appwrite/Docker/Env.php | 105 ++++++++++++++++++++-------------- tests/unit/Docker/EnvTest.php | 32 +++++++++++ 2 files changed, 93 insertions(+), 44 deletions(-) diff --git a/src/Appwrite/Docker/Env.php b/src/Appwrite/Docker/Env.php index 9a055eaa9a..128b3fba92 100644 --- a/src/Appwrite/Docker/Env.php +++ b/src/Appwrite/Docker/Env.php @@ -15,60 +15,66 @@ class Env $offset = 0; while ($offset < $length) { - // Skip blank lines and comments. - if ($data[$offset] === "\n" || $data[$offset] === "\r") { - $offset++; + $lineEnd = \strpos($data, "\n", $offset); + if ($lineEnd === false) { + $lineEnd = $length; + } + + $line = \substr($data, $offset, $lineEnd - $offset); + // Normalize Windows newlines for line-oriented parsing of keys. + if (\str_ends_with($line, "\r")) { + $line = \substr($line, 0, -1); + } + + $trimmed = \ltrim($line, " \t"); + + // Skip blank lines and comments (including indented comments). + if ($trimmed === '' || $trimmed[0] === '#') { + $offset = $lineEnd < $length ? $lineEnd + 1 : $length; continue; } - if ($data[$offset] === '#') { - $nextLine = \strpos($data, "\n", $offset); - $offset = $nextLine === false ? $length : $nextLine + 1; - continue; - } - - $equals = \strpos($data, '=', $offset); + $equals = \strpos($line, '='); if ($equals === false) { - break; - } - - $key = \trim(\substr($data, $offset, $equals - $offset)); - $offset = $equals + 1; - - if ($key === '') { - // Skip malformed lines without a key. - $nextLine = \strpos($data, "\n", $offset); - $offset = $nextLine === false ? $length : $nextLine + 1; + // Skip malformed lines without an assignment on this line. + $offset = $lineEnd < $length ? $lineEnd + 1 : $length; continue; } + $key = \trim(\substr($line, 0, $equals)); + if ($key === '') { + $offset = $lineEnd < $length ? $lineEnd + 1 : $length; + continue; + } + + // Value starts after '=' in the full buffer so quoted values may span lines. + $valueOffset = $offset + $equals + 1; + // Consume optional whitespace before the value. - while ($offset < $length && ($data[$offset] === ' ' || $data[$offset] === "\t")) { - $offset++; + while ($valueOffset < $length && ($data[$valueOffset] === ' ' || $data[$valueOffset] === "\t")) { + $valueOffset++; } - if ($offset >= $length || $data[$offset] === "\n" || $data[$offset] === "\r") { + if ($valueOffset >= $length || $data[$valueOffset] === "\n" || $data[$valueOffset] === "\r") { $this->vars[$key] = ''; - if ($offset < $length) { - $offset++; - } + $offset = $valueOffset < $length ? (($data[$valueOffset] === "\r" && $valueOffset + 1 < $length && $data[$valueOffset + 1] === "\n") ? $valueOffset + 2 : $valueOffset + 1) : $length; continue; } - $quote = $data[$offset]; + $quote = $data[$valueOffset]; if ($quote === '"' || $quote === "'") { - $offset++; + $valueOffset++; $value = ''; - while ($offset < $length) { - $char = $data[$offset]; + while ($valueOffset < $length) { + $char = $data[$valueOffset]; if ($char === $quote) { - $offset++; + $valueOffset++; break; } - if ($quote === '"' && $char === '\\' && $offset + 1 < $length) { - $next = $data[$offset + 1]; + if ($quote === '"' && $char === '\\' && $valueOffset + 1 < $length) { + $next = $data[$valueOffset + 1]; $value .= match ($next) { 'n' => "\n", 'r' => "\r", @@ -78,44 +84,55 @@ class Env "'" => "'", '$' => '$', '`' => '`', - default => $next, + // Preserve unknown escapes as a literal backslash + next char + // (e.g. Windows paths or patterns like `\d`, `\q`). + default => '\\' . $next, }; - $offset += 2; + $valueOffset += 2; continue; } $value .= $char; - $offset++; + $valueOffset++; } // Consume trailing characters until end of line (comments/whitespace). - while ($offset < $length && $data[$offset] !== "\n" && $data[$offset] !== "\r") { - $offset++; + while ($valueOffset < $length && $data[$valueOffset] !== "\n" && $data[$valueOffset] !== "\r") { + $valueOffset++; } - if ($offset < $length) { - $offset++; + if ($valueOffset < $length) { + if ($data[$valueOffset] === "\r" && $valueOffset + 1 < $length && $data[$valueOffset + 1] === "\n") { + $valueOffset += 2; + } else { + $valueOffset++; + } } $this->vars[$key] = $value; + $offset = $valueOffset; continue; } // Unquoted value: read until end of line, trim trailing whitespace. - $end = \strpos($data, "\n", $offset); + $end = \strpos($data, "\n", $valueOffset); if ($end === false) { - $raw = \substr($data, $offset); + $raw = \substr($data, $valueOffset); $offset = $length; } else { - $raw = \substr($data, $offset, $end - $offset); + $raw = \substr($data, $valueOffset, $end - $valueOffset); $offset = $end + 1; } + if (\str_ends_with($raw, "\r")) { + $raw = \substr($raw, 0, -1); + } + // Strip inline comments preceded by whitespace. if (\preg_match('/\s+#/', $raw, $matches, PREG_OFFSET_CAPTURE) === 1) { $raw = \substr($raw, 0, $matches[0][1]); } - $this->vars[$key] = \rtrim($raw, " \t\r"); + $this->vars[$key] = \rtrim($raw, " \t"); } } diff --git a/tests/unit/Docker/EnvTest.php b/tests/unit/Docker/EnvTest.php index 530b6d2ae0..d669b01bab 100644 --- a/tests/unit/Docker/EnvTest.php +++ b/tests/unit/Docker/EnvTest.php @@ -88,4 +88,36 @@ final class EnvTest extends TestCase Env::encodeValue("say\"hi\nnext\$path") ); } + + public function testUnknownEscapesPreserveBackslash(): void + { + // .env contains unknown escapes \q and \d; both must keep the backslash. + $data = "_APP_PATTERN=\"prefix\\q and \\d digits\"\n"; + + $env = new Env($data); + + $this->assertSame('prefix\\q and \\d digits', $env->getVar('_APP_PATTERN')); + } + + public function testIndentedCommentDoesNotCaptureNextAssignment(): void + { + $data = " # indented note\n_APP_DOMAIN=example.com\n \n_APP_OPTIONS_FORCE_HTTPS=enabled\n"; + + $env = new Env($data); + + $this->assertSame('example.com', $env->getVar('_APP_DOMAIN')); + $this->assertSame('enabled', $env->getVar('_APP_OPTIONS_FORCE_HTTPS')); + $this->assertArrayNotHasKey(' # indented note', $env->list()); + $this->assertArrayNotHasKey('# indented note', $env->list()); + } + + public function testLineWithoutAssignmentIsSkipped(): void + { + $data = "NOT_AN_ASSIGNMENT\n_APP_DOMAIN=example.com\n"; + + $env = new Env($data); + + $this->assertSame('example.com', $env->getVar('_APP_DOMAIN')); + $this->assertCount(1, $env->list()); + } } From 0b329f324727cb5335ed3a403b61fbb28ce0b3c9 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 27 Jul 2026 05:42:37 +0000 Subject: [PATCH 07/12] fix: keep unterminated .env quotes from swallowing keys If a quoted assignment never closes, take only the remainder of that line so install/upgrade cannot drop later environment variables. Co-authored-by: Chirag Aggarwal --- src/Appwrite/Docker/Env.php | 40 ++++++++++++++++++++++++++++------- tests/unit/Docker/EnvTest.php | 11 ++++++++++ 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/Appwrite/Docker/Env.php b/src/Appwrite/Docker/Env.php index 128b3fba92..ef614d7a32 100644 --- a/src/Appwrite/Docker/Env.php +++ b/src/Appwrite/Docker/Env.php @@ -63,18 +63,22 @@ class Env $quote = $data[$valueOffset]; if ($quote === '"' || $quote === "'") { - $valueOffset++; + $contentStart = $valueOffset + 1; + $scanOffset = $contentStart; $value = ''; - while ($valueOffset < $length) { - $char = $data[$valueOffset]; + $closed = false; + + while ($scanOffset < $length) { + $char = $data[$scanOffset]; if ($char === $quote) { - $valueOffset++; + $scanOffset++; + $closed = true; break; } - if ($quote === '"' && $char === '\\' && $valueOffset + 1 < $length) { - $next = $data[$valueOffset + 1]; + if ($quote === '"' && $char === '\\' && $scanOffset + 1 < $length) { + $next = $data[$scanOffset + 1]; $value .= match ($next) { 'n' => "\n", 'r' => "\r", @@ -88,14 +92,34 @@ class Env // (e.g. Windows paths or patterns like `\d`, `\q`). default => '\\' . $next, }; - $valueOffset += 2; + $scanOffset += 2; continue; } $value .= $char; - $valueOffset++; + $scanOffset++; } + if (!$closed) { + // Unterminated quote: keep only the remainder of the starting line so + // later assignments are not absorbed into this value during upgrade. + $end = \strpos($data, "\n", $contentStart); + if ($end === false) { + $raw = \substr($data, $contentStart); + $offset = $length; + } else { + $raw = \substr($data, $contentStart, $end - $contentStart); + $offset = $end + 1; + } + if (\str_ends_with($raw, "\r")) { + $raw = \substr($raw, 0, -1); + } + $this->vars[$key] = $raw; + continue; + } + + $valueOffset = $scanOffset; + // Consume trailing characters until end of line (comments/whitespace). while ($valueOffset < $length && $data[$valueOffset] !== "\n" && $data[$valueOffset] !== "\r") { $valueOffset++; diff --git a/tests/unit/Docker/EnvTest.php b/tests/unit/Docker/EnvTest.php index d669b01bab..fa00cc4446 100644 --- a/tests/unit/Docker/EnvTest.php +++ b/tests/unit/Docker/EnvTest.php @@ -120,4 +120,15 @@ final class EnvTest extends TestCase $this->assertSame('example.com', $env->getVar('_APP_DOMAIN')); $this->assertCount(1, $env->list()); } + + public function testUnterminatedQuoteDoesNotAbsorbLaterAssignments(): void + { + $data = "_APP_BROKEN=\"partial-value\n_APP_DOMAIN=example.com\n_APP_OPTIONS_FORCE_HTTPS=enabled\n"; + + $env = new Env($data); + + $this->assertSame('partial-value', $env->getVar('_APP_BROKEN')); + $this->assertSame('example.com', $env->getVar('_APP_DOMAIN')); + $this->assertSame('enabled', $env->getVar('_APP_OPTIONS_FORCE_HTTPS')); + } } From cb48a23ab38bdaf3eaf74af52337dfa9747f610f Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 27 Jul 2026 05:47:12 +0000 Subject: [PATCH 08/12] fix: do not treat later KEY=" as closing an open quote When a quoted value never closes, a subsequent assignment's opening quote must trigger line-local recovery instead of terminating the value. Co-authored-by: Chirag Aggarwal --- src/Appwrite/Docker/Env.php | 22 ++++++++++++++++++++++ tests/unit/Docker/EnvTest.php | 11 +++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/Appwrite/Docker/Env.php b/src/Appwrite/Docker/Env.php index ef614d7a32..37591b5c86 100644 --- a/src/Appwrite/Docker/Env.php +++ b/src/Appwrite/Docker/Env.php @@ -67,11 +67,21 @@ class Env $scanOffset = $contentStart; $value = ''; $closed = false; + $crossedNewline = false; while ($scanOffset < $length) { $char = $data[$scanOffset]; + if ($char === "\n" || $char === "\r") { + $crossedNewline = true; + } + if ($char === $quote) { + // A later line's opening quote (KEY=") must not close an + // earlier unterminated value, or upgrade will drop that key. + if ($crossedNewline && self::isAssignmentOpener($data, $scanOffset)) { + break; + } $scanOffset++; $closed = true; break; @@ -201,6 +211,18 @@ class Env return \addcslashes($value, "\"\\\n\r\t\$`"); } + /** + * True when $quoteOffset points at a quote that opens a new KEY="..." assignment. + */ + private static function isAssignmentOpener(string $data, int $quoteOffset): bool + { + $lineStart = \strrpos(\substr($data, 0, $quoteOffset), "\n"); + $lineStart = $lineStart === false ? 0 : $lineStart + 1; + $before = \substr($data, $lineStart, $quoteOffset - $lineStart); + + return \preg_match('/^\s*[A-Za-z_][A-Za-z0-9_]*\s*=\s*$/', $before) === 1; + } + /** * @return string */ diff --git a/tests/unit/Docker/EnvTest.php b/tests/unit/Docker/EnvTest.php index fa00cc4446..7307a6aeb5 100644 --- a/tests/unit/Docker/EnvTest.php +++ b/tests/unit/Docker/EnvTest.php @@ -131,4 +131,15 @@ final class EnvTest extends TestCase $this->assertSame('example.com', $env->getVar('_APP_DOMAIN')); $this->assertSame('enabled', $env->getVar('_APP_OPTIONS_FORCE_HTTPS')); } + + public function testUnterminatedQuoteDoesNotAbsorbLaterQuotedAssignment(): void + { + $data = "_APP_BROKEN=\"partial-value\n_APP_DOMAIN=\"example.com\"\n_APP_OPTIONS_FORCE_HTTPS=enabled\n"; + + $env = new Env($data); + + $this->assertSame('partial-value', $env->getVar('_APP_BROKEN')); + $this->assertSame('example.com', $env->getVar('_APP_DOMAIN')); + $this->assertSame('enabled', $env->getVar('_APP_OPTIONS_FORCE_HTTPS')); + } } From caed7aad24d4a03115f41f162cda461e30578d21 Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Mon, 27 Jul 2026 13:24:03 +0530 Subject: [PATCH 09/12] fix(screenshots): capture site previews above viewport resolution The browser service defaults to a device scale factor of 1 and `domcontentloaded`, and the client never overrode them. Site previews were captured at exactly 1280x720 physical pixels, so any surface rendering them wider than 640 CSS px on a high-density screen was upscaling, and pages were captured before webfonts and images settled. Capture at 1.5x instead. Stored PNGs grow from ~143KB to ~235KB while delivered previews are unchanged, since the preview endpoint re-encodes to a requested size and format. --- src/Appwrite/Screenshots/Client.php | 23 ++++++++++++++++++++ tests/unit/Screenshots/ClientTest.php | 31 +++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/src/Appwrite/Screenshots/Client.php b/src/Appwrite/Screenshots/Client.php index 096d737393..573b4c89fe 100644 --- a/src/Appwrite/Screenshots/Client.php +++ b/src/Appwrite/Screenshots/Client.php @@ -9,6 +9,23 @@ use Utopia\Psr7\Request\Factory; class Client { + public const VIEWPORT_WIDTH = 1280; + + public const VIEWPORT_HEIGHT = 720; + + /** + * Captured pixels per CSS pixel. Above 1 the page is rendered at a higher + * resolution than the viewport, so previews stay sharp when the console + * displays them on high-density screens or scales them up. + */ + public const SCALE = 1.5; + + /** + * Wait for subresources such as webfonts and images, not just the DOM, + * otherwise pages are captured mid-render. + */ + public const WAIT_UNTIL = 'load'; + private Factory $factory; /** @@ -33,6 +50,12 @@ class Client 'theme' => $theme, 'headers' => $headers, 'sleep' => $sleep, + 'viewport' => [ + 'width' => self::VIEWPORT_WIDTH, + 'height' => self::VIEWPORT_HEIGHT, + ], + 'deviceScaleFactor' => self::SCALE, + 'waitUntil' => self::WAIT_UNTIL, ])); $status = $response->getStatusCode(); diff --git a/tests/unit/Screenshots/ClientTest.php b/tests/unit/Screenshots/ClientTest.php index 6dcfdce28e..b90ab15c27 100644 --- a/tests/unit/Screenshots/ClientTest.php +++ b/tests/unit/Screenshots/ClientTest.php @@ -58,9 +58,40 @@ final class ClientTest extends TestCase 'theme' => 'dark', 'headers' => ['x-appwrite-hostname' => 'example.com'], 'sleep' => 500, + 'viewport' => ['width' => 1280, 'height' => 720], + 'deviceScaleFactor' => 1.5, + 'waitUntil' => 'load', ], \json_decode((string)$this->request->getBody(), true)); } + public function testCreateCapturesAboveViewportResolution(): void + { + $response = (new Response(200, body: new Stream('png-bytes'))) + ->withHeader('Content-Type', 'image/png'); + + $this->client($response)->create('http://appwrite/', 'light'); + + $body = \json_decode((string)$this->request->getBody(), true); + + // Left unset, the browser service defaults to a scale factor of 1, which + // captures exactly one pixel per CSS pixel and renders soft previews. + $this->assertGreaterThan(1, $body['deviceScaleFactor']); + $this->assertSame(1280, $body['viewport']['width']); + $this->assertSame(720, $body['viewport']['height']); + } + + public function testCreateWaitsForSubresources(): void + { + $response = (new Response(200, body: new Stream('png-bytes'))) + ->withHeader('Content-Type', 'image/png'); + + $this->client($response)->create('http://appwrite/', 'light'); + + // The browser service defaults to `domcontentloaded`, which fires before + // webfonts and images have settled. + $this->assertSame('load', \json_decode((string)$this->request->getBody(), true)['waitUntil']); + } + public function testCreateError(): void { $response = (new Response(400, body: new Stream('{"error":"Timeout exceeded"}'))) From 27e79e5d0cea466963800783fa44ce862ac4bd36 Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Mon, 27 Jul 2026 13:33:33 +0530 Subject: [PATCH 10/12] fix(screenshots): keep default navigation wait Waiting for `load` risks exhausting the 30s request budget on sites with slow or hanging load-blocking subresources, which fails the capture outright instead of producing a slightly early one. The existing sleep already covers most of the settling this was meant to buy. --- src/Appwrite/Screenshots/Client.php | 7 ------- tests/unit/Screenshots/ClientTest.php | 11 ++++++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Appwrite/Screenshots/Client.php b/src/Appwrite/Screenshots/Client.php index 573b4c89fe..f33708090f 100644 --- a/src/Appwrite/Screenshots/Client.php +++ b/src/Appwrite/Screenshots/Client.php @@ -20,12 +20,6 @@ class Client */ public const SCALE = 1.5; - /** - * Wait for subresources such as webfonts and images, not just the DOM, - * otherwise pages are captured mid-render. - */ - public const WAIT_UNTIL = 'load'; - private Factory $factory; /** @@ -55,7 +49,6 @@ class Client 'height' => self::VIEWPORT_HEIGHT, ], 'deviceScaleFactor' => self::SCALE, - 'waitUntil' => self::WAIT_UNTIL, ])); $status = $response->getStatusCode(); diff --git a/tests/unit/Screenshots/ClientTest.php b/tests/unit/Screenshots/ClientTest.php index b90ab15c27..ac5efba65f 100644 --- a/tests/unit/Screenshots/ClientTest.php +++ b/tests/unit/Screenshots/ClientTest.php @@ -60,7 +60,6 @@ final class ClientTest extends TestCase 'sleep' => 500, 'viewport' => ['width' => 1280, 'height' => 720], 'deviceScaleFactor' => 1.5, - 'waitUntil' => 'load', ], \json_decode((string)$this->request->getBody(), true)); } @@ -80,16 +79,18 @@ final class ClientTest extends TestCase $this->assertSame(720, $body['viewport']['height']); } - public function testCreateWaitsForSubresources(): void + public function testCreateDoesNotBlockOnSubresources(): void { $response = (new Response(200, body: new Stream('png-bytes'))) ->withHeader('Content-Type', 'image/png'); $this->client($response)->create('http://appwrite/', 'light'); - // The browser service defaults to `domcontentloaded`, which fires before - // webfonts and images have settled. - $this->assertSame('load', \json_decode((string)$this->request->getBody(), true)['waitUntil']); + // The browser service navigates with `domcontentloaded` unless told + // otherwise. Waiting for `load` risks exhausting the request timeout on + // sites with slow or hanging subresources, which yields no screenshot at + // all rather than an early one. + $this->assertArrayNotHasKey('waitUntil', \json_decode((string)$this->request->getBody(), true)); } public function testCreateError(): void From 798cc81ee0b7916634e34ab901e7706cdbc5b9e1 Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Mon, 27 Jul 2026 13:47:36 +0530 Subject: [PATCH 11/12] test(screenshots): regenerate site reference images at 1.5x assertSamePixels compares exact Imagick signatures, so the 1280x720 goldens could never match a 1920x1080 capture. Regenerated with appwrite/browser:0.3.3 using the payload the client now sends. Reproducing the old captures against the committed 1280x720 goldens yields identical signatures, so the render is deterministic and the new images are byte-reproducible in CI. --- .../sites/static-themed/screenshot-dark.png | Bin 14704 -> 25322 bytes .../sites/static-themed/screenshot-light.png | Bin 14674 -> 25241 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/resources/sites/static-themed/screenshot-dark.png b/tests/resources/sites/static-themed/screenshot-dark.png index 199a09b9029950970eb985ec107de228617d6e26..52b5319b9c9743f6d32546375a6d62baa77372fc 100644 GIT binary patch literal 25322 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 U%&ysZh_Hsc^I=`=Jo}~&iWR@dj+(d+>9|n- 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
}QSz*915rMtTK( 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 diff --git a/tests/resources/sites/static-themed/screenshot-light.png b/tests/resources/sites/static-themed/screenshot-light.png index 4eae73c5b79e7237090c673dcc720be7c5f0510f..4b451b353f61b22687b12c842c1f45d1e69f076a 100644 GIT binary patch literal 25241 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

6AfK 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 From b901874f25954508fbd2bcb8a0dca41eacd19c70 Mon Sep 17 00:00:00 2001 From: fogelito Date: Mon, 27 Jul 2026 13:29:45 +0300 Subject: [PATCH 12/12] Bump database 6.5.1 --- composer.json | 2 +- composer.lock | 58 ++++++++++++++++++++++----------------------------- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index 9227cb02b4..c0c528c006 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,7 @@ "utopia-php/compression": "0.1.*", "utopia-php/config": "1.*", "utopia-php/console": "0.1.*", - "utopia-php/database": "dev-cache-empty-get-document as 6.4.4", + "utopia-php/database": "^6.0.0", "utopia-php/detector": "0.2.*", "utopia-php/domains": "^2.2", "utopia-php/emails": "0.7.*", diff --git a/composer.lock b/composer.lock index dc6d9a8565..ed4c86cfe7 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": "1737ce10d83c99185ebde7bcaf4fc70d", + "content-hash": "a811ab43bece6d9d01be1caab8a08a75", "packages": [ { "name": "adhocore/jwt", @@ -3635,16 +3635,16 @@ }, { "name": "utopia-php/database", - "version": "dev-cache-empty-get-document", + "version": "6.5.1", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "6968bd0ce88aa963548f87e127fa8fd1f22180a6" + "reference": "7fd133e99698feb300a689be8767efa975c2cf13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/6968bd0ce88aa963548f87e127fa8fd1f22180a6", - "reference": "6968bd0ce88aa963548f87e127fa8fd1f22180a6", + "url": "https://api.github.com/repos/utopia-php/database/zipball/7fd133e99698feb300a689be8767efa975c2cf13", + "reference": "7fd133e99698feb300a689be8767efa975c2cf13", "shasum": "" }, "require": { @@ -3689,9 +3689,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/cache-empty-get-document" + "source": "https://github.com/utopia-php/database/tree/6.5.1" }, - "time": "2026-07-23T11:43:56+00:00" + "time": "2026-07-27T09:40:21+00:00" }, { "name": "utopia-php/detector", @@ -4055,16 +4055,16 @@ }, { "name": "utopia-php/http", - "version": "2.0.0-rc18", + "version": "2.0.0-rc19", "source": { "type": "git", "url": "https://github.com/utopia-php/http.git", - "reference": "3bfc500c6a53ffb87d4dcb95b4712b6a91b24439" + "reference": "7a9419858c6c612a8d783024ad46740f857e4430" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/http/zipball/3bfc500c6a53ffb87d4dcb95b4712b6a91b24439", - "reference": "3bfc500c6a53ffb87d4dcb95b4712b6a91b24439", + "url": "https://api.github.com/repos/utopia-php/http/zipball/7a9419858c6c612a8d783024ad46740f857e4430", + "reference": "7a9419858c6c612a8d783024ad46740f857e4430", "shasum": "" }, "require": { @@ -4102,9 +4102,9 @@ ], "support": { "issues": "https://github.com/utopia-php/http/issues", - "source": "https://github.com/utopia-php/http/tree/2.0.0-rc18" + "source": "https://github.com/utopia-php/http/tree/2.0.0-rc19" }, - "time": "2026-07-13T16:18:22+00:00" + "time": "2026-07-27T07:23:46+00:00" }, { "name": "utopia-php/image", @@ -6172,11 +6172,11 @@ }, { "name": "phpstan/phpstan", - "version": "2.2.5", + "version": "2.2.6", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/909c1e5fef7989ac0d0c1c5c42e32a5c4f6198a0", - "reference": "909c1e5fef7989ac0d0c1c5c42e32a5c4f6198a0", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a6e9b5a9420f6109c091e87d82683bd1a80b87ed", + "reference": "a6e9b5a9420f6109c091e87d82683bd1a80b87ed", "shasum": "" }, "require": { @@ -6232,7 +6232,7 @@ "type": "github" } ], - "time": "2026-07-05T06:31:06+00:00" + "time": "2026-07-26T21:22:49+00:00" }, { "name": "phpunit/php-code-coverage", @@ -6671,21 +6671,21 @@ }, { "name": "rector/rector", - "version": "2.5.7", + "version": "2.5.8", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "ba22f8c087848278fed6b4910d4cf1108096d8d3" + "reference": "861c77fd2a6d45317a401f4e0b617f947e8b6f96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/ba22f8c087848278fed6b4910d4cf1108096d8d3", - "reference": "ba22f8c087848278fed6b4910d4cf1108096d8d3", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/861c77fd2a6d45317a401f4e0b617f947e8b6f96", + "reference": "861c77fd2a6d45317a401f4e0b617f947e8b6f96", "shasum": "" }, "require": { "php": "^7.4|^8.0", - "phpstan/phpstan": "^2.2.2" + "phpstan/phpstan": "^2.2.6" }, "conflict": { "rector/rector-doctrine": "*", @@ -6719,7 +6719,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/2.5.7" + "source": "https://github.com/rectorphp/rector/tree/2.5.8" }, "funding": [ { @@ -6727,7 +6727,7 @@ "type": "github" } ], - "time": "2026-07-13T15:24:18+00:00" + "time": "2026-07-27T06:19:16+00:00" }, { "name": "sebastian/cli-parser", @@ -8407,17 +8407,9 @@ "time": "2026-07-03T20:44:34+00:00" } ], - "aliases": [ - { - "package": "utopia-php/database", - "version": "dev-cache-empty-get-document", - "alias": "6.4.4", - "alias_normalized": "6.4.4.0" - } - ], + "aliases": [], "minimum-stability": "dev", "stability-flags": { - "utopia-php/database": 20, "utopia-php/http": 5, "utopia-php/platform": 5 },