Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into feat-audit-user-type-distinction

Browse Source
This commit is contained in:
Damodar Lohani
2026-03-19 17:44:50 +05:45
committed by GitHub
parent fe988f4489 d8748c9054
commit 92b7760e94
7 changed files with 47 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/init/models.php
+1 -1
View File
@@ -185,7 +185,7 @@ Response::setModel(new BaseList('Runtimes List', Response::MODEL_RUNTIME_LIST, '
Response::setModel(new BaseList('Deployments List', Response::MODEL_DEPLOYMENT_LIST, 'deployments', Response::MODEL_DEPLOYMENT));
Response::setModel(new BaseList('Executions List', Response::MODEL_EXECUTION_LIST, 'executions', Response::MODEL_EXECUTION));
Response::setModel(new BaseList('Projects List', Response::MODEL_PROJECT_LIST, 'projects', Response::MODEL_PROJECT, true, false));
Response::setModel(new BaseList('Webhooks List', Response::MODEL_WEBHOOK_LIST, 'webhooks', Response::MODEL_WEBHOOK, true, false));
Response::setModel(new BaseList('Webhooks List', Response::MODEL_WEBHOOK_LIST, 'webhooks', Response::MODEL_WEBHOOK, true, true));
Response::setModel(new BaseList('API Keys List', Response::MODEL_KEY_LIST, 'keys', Response::MODEL_KEY, true, true));
Response::setModel(new BaseList('Dev Keys List', Response::MODEL_DEV_KEY_LIST, 'devKeys', Response::MODEL_DEV_KEY, true, false));
Response::setModel(new BaseList('Auth Providers List', Response::MODEL_AUTH_PROVIDER_LIST, 'platforms', Response::MODEL_AUTH_PROVIDER, true, false));
composer.json
+1 -1
View File
@@ -61,7 +61,7 @@
"utopia-php/compression": "0.1.*",
"utopia-php/config": "1.*",
"utopia-php/console": "0.1.*",
"utopia-php/database": "dev-fix-collection-recreate as 5.3.15",
"utopia-php/database": "5.*",
"utopia-php/detector": "0.2.*",
"utopia-php/domains": "1.*",
"utopia-php/emails": "0.6.*",
composer.lock
Generated
+42 -50
View File
@@ -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": "13579de3d747c541fdcce4f709df8e57",
"content-hash": "1404c8821e43b3fe92e06a8ed658ed26",
"packages": [
{
"name": "adhocore/jwt",
@@ -686,23 +686,23 @@
},
{
"name": "google/protobuf",
"version": "v4.33.5",
"version": "v4.33.6",
"source": {
"type": "git",
"url": "https://github.com/protocolbuffers/protobuf-php.git",
"reference": "ebe8010a61b2ae0cff0d246fe1c4d44e9f7dfa6d"
"reference": "84b008c23915ed94536737eae46f41ba3bccfe67"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/ebe8010a61b2ae0cff0d246fe1c4d44e9f7dfa6d",
"reference": "ebe8010a61b2ae0cff0d246fe1c4d44e9f7dfa6d",
"url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/84b008c23915ed94536737eae46f41ba3bccfe67",
"reference": "84b008c23915ed94536737eae46f41ba3bccfe67",
"shasum": ""
},
"require": {
"php": ">=8.1.0"
},
"require-dev": {
"phpunit/phpunit": ">=5.0.0 <8.5.27"
"phpunit/phpunit": ">=10.5.62 <11.0.0"
},
"suggest": {
"ext-bcmath": "Need to support JSON deserialization"
@@ -724,9 +724,9 @@
"proto"
],
"support": {
"source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.33.5"
"source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.33.6"
},
"time": "2026-01-29T20:49:00+00:00"
"time": "2026-03-18T17:32:05+00:00"
},
{
"name": "halaxa/json-machine",
@@ -1996,16 +1996,16 @@
},
{
"name": "phpseclib/phpseclib",
"version": "3.0.49",
"version": "3.0.50",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "6233a1e12584754e6b5daa69fe1289b47775c1b9"
"reference": "aa6ad8321ed103dc3624fb600a25b66ebf78ec7b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/6233a1e12584754e6b5daa69fe1289b47775c1b9",
"reference": "6233a1e12584754e6b5daa69fe1289b47775c1b9",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/aa6ad8321ed103dc3624fb600a25b66ebf78ec7b",
"reference": "aa6ad8321ed103dc3624fb600a25b66ebf78ec7b",
"shasum": ""
},
"require": {
@@ -2086,7 +2086,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.49"
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.50"
},
"funding": [
{
@@ -2102,7 +2102,7 @@
"type": "tidelift"
}
],
"time": "2026-01-27T09:17:28+00:00"
"time": "2026-03-19T02:57:58+00:00"
},
{
"name": "psr/clock",
@@ -3850,16 +3850,16 @@
},
{
"name": "utopia-php/database",
"version": "dev-fix-collection-recreate",
"version": "5.3.16",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/database.git",
"reference": "5208630969dfdfbe8eda9c34c6b28ce711ece7c4"
"reference": "f121418c4dc7169576735620fd8c17093c3b851d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/database/zipball/5208630969dfdfbe8eda9c34c6b28ce711ece7c4",
"reference": "5208630969dfdfbe8eda9c34c6b28ce711ece7c4",
"url": "https://api.github.com/repos/utopia-php/database/zipball/f121418c4dc7169576735620fd8c17093c3b851d",
"reference": "f121418c4dc7169576735620fd8c17093c3b851d",
"shasum": ""
},
"require": {
@@ -3868,9 +3868,10 @@
"ext-pdo": "*",
"php": ">=8.4",
"utopia-php/cache": "1.*",
"utopia-php/framework": "0.33.*",
"utopia-php/console": "0.1.*",
"utopia-php/mongo": "1.*",
"utopia-php/pools": "1.*"
"utopia-php/pools": "1.*",
"utopia-php/validators": "0.2.*"
},
"require-dev": {
"fakerphp/faker": "1.23.*",
@@ -3880,7 +3881,7 @@
"phpunit/phpunit": "9.*",
"rregeer/phpunit-coverage-check": "0.3.*",
"swoole/ide-helper": "5.1.3",
"utopia-php/cli": "0.14.*"
"utopia-php/cli": "0.22.*"
},
"type": "library",
"autoload": {
@@ -3932,10 +3933,10 @@
"utopia"
],
"support": {
"source": "https://github.com/utopia-php/database/tree/fix-collection-recreate",
"source": "https://github.com/utopia-php/database/tree/5.3.16",
"issues": "https://github.com/utopia-php/database/issues"
},
"time": "2026-03-16T11:58:09+00:00"
"time": "2026-03-19T10:10:02+00:00"
},
{
"name": "utopia-php/detector",
@@ -4603,16 +4604,16 @@
},
{
"name": "utopia-php/mongo",
"version": "1.0.1",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/mongo.git",
"reference": "83dbcde768d5fb40241f5ca8aa5ed8ca140a7469"
"reference": "677a21c53f7a1316c528b4b45b3fce886cee7223"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/mongo/zipball/83dbcde768d5fb40241f5ca8aa5ed8ca140a7469",
"reference": "83dbcde768d5fb40241f5ca8aa5ed8ca140a7469",
"url": "https://api.github.com/repos/utopia-php/mongo/zipball/677a21c53f7a1316c528b4b45b3fce886cee7223",
"reference": "677a21c53f7a1316c528b4b45b3fce886cee7223",
"shasum": ""
},
"require": {
@@ -4658,9 +4659,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/mongo/issues",
"source": "https://github.com/utopia-php/mongo/tree/1.0.1"
"source": "https://github.com/utopia-php/mongo/tree/1.0.2"
},
"time": "2026-03-13T07:29:24+00:00"
"time": "2026-03-18T02:45:50+00:00"
},
{
"name": "utopia-php/platform",
@@ -5468,16 +5469,16 @@
"packages-dev": [
{
"name": "appwrite/sdk-generator",
"version": "1.11.6",
"version": "1.11.10",
"source": {
"type": "git",
"url": "https://github.com/appwrite/sdk-generator.git",
"reference": "f80e302d000cdc2f98b4bb5ff2fc3bd0bdff7b38"
"reference": "96e6b79a241fc615627a820107ca64bbd1b550a6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/f80e302d000cdc2f98b4bb5ff2fc3bd0bdff7b38",
"reference": "f80e302d000cdc2f98b4bb5ff2fc3bd0bdff7b38",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/96e6b79a241fc615627a820107ca64bbd1b550a6",
"reference": "96e6b79a241fc615627a820107ca64bbd1b550a6",
"shasum": ""
},
"require": {
@@ -5513,9 +5514,9 @@
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
"support": {
"issues": "https://github.com/appwrite/sdk-generator/issues",
"source": "https://github.com/appwrite/sdk-generator/tree/1.11.6"
"source": "https://github.com/appwrite/sdk-generator/tree/1.11.10"
},
"time": "2026-03-09T07:12:51+00:00"
"time": "2026-03-19T05:27:36+00:00"
},
{
"name": "brianium/paratest",
@@ -6224,11 +6225,11 @@
},
{
"name": "phpstan/phpstan",
"version": "2.1.40",
"version": "2.1.42",
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/9b2c7aeb83a75d8680ea5e7c9b7fca88052b766b",
"reference": "9b2c7aeb83a75d8680ea5e7c9b7fca88052b766b",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1279e1ce86ba768f0780c9d889852b4e02ff40d0",
"reference": "1279e1ce86ba768f0780c9d889852b4e02ff40d0",
"shasum": ""
},
"require": {
@@ -6273,7 +6274,7 @@
"type": "github"
}
],
"time": "2026-02-23T15:04:35+00:00"
"time": "2026-03-17T14:58:32+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -8462,18 +8463,9 @@
"time": "2024-11-07T12:36:22+00:00"
}
],
"aliases": [
{
"package": "utopia-php/database",
"version": "dev-fix-collection-recreate",
"alias": "5.3.15",
"alias_normalized": "5.3.15.0"
}
],
"aliases": [],
"minimum-stability": "dev",
"stability-flags": {
"utopia-php/database": 20
},
"stability-flags": {},
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
phpstan-baseline.neon
-12
View File
@@ -1,11 +1,5 @@
parameters:
ignoreErrors:
-
message: '#^Variable \$dbForPlatform might not be defined\.$#'
identifier: variable.undefined
count: 1
path: app/cli.php
-
message: '#^PHPDoc tag @var above a method has no effect\.$#'
identifier: varTag.misplaced
@@ -126,12 +120,6 @@ parameters:
count: 1
path: app/controllers/shared/api.php
-
message: '#^Variable \$database might not be defined\.$#'
identifier: variable.undefined
count: 4
path: app/http.php
-
message: '#^Variable \$register might not be defined\.$#'
identifier: variable.undefined
src/Appwrite/Platform/Installer/Server.php
+1 -2
View File
@@ -2,8 +2,6 @@
namespace Appwrite\Platform\Installer;
require_once __DIR__ . '/../../../../vendor/autoload.php';
use Appwrite\Platform\Installer\Http\Installer\Error;
use Appwrite\Platform\Installer\Runtime\State;
use Swoole\Http\Server as SwooleServer;
@@ -311,6 +309,7 @@ function shouldRunInstallerServer(): bool
}
if (shouldRunInstallerServer()) {
require_once __DIR__ . '/../../../../vendor/autoload.php';
$server = new Server();
$server->run();
}
src/Appwrite/Platform/Modules/VCS/Http/GitHub/Deployment.php
+1 -1
View File
@@ -431,7 +431,7 @@ trait Deployment
}
}
if ($resource->getCollection() === 'sites' && !empty($latestCommentId) && !empty($previewRuleId)) {
if ($resource->getCollection() === 'sites' && !empty($latestCommentId)) {
$retries = 0;
$lockAcquired = false;
src/Appwrite/Utopia/Response/Model/Webhook.php
+1 -1
View File
@@ -10,7 +10,7 @@ class Webhook extends Model
/**
* @var bool
*/
protected bool $public = false;
protected bool $public = true;
public function __construct()
{