mirror of
https://github.com/appwrite/appwrite.git
synced 2026-05-26 13:51:13 +00:00
Fix PHPUnit 11 migration test issues
- Add missing @depends testCreateDatabase to testUpdateWithExistingRelationships in DatabasesBase.php - Fix data provider keys in LegacyPermissionsMemberTest and TablesDBPermissionsMemberTest to match parameter names (any->anyCount, users->usersCount, doconly->docOnlyCount) - Convert provideCustomExecutions data provider to positional arrays to avoid PHPUnit 11 named argument conflicts with @depends - Restore @depends testUpdateAccountPhone for testCreatePhoneVerification in GraphQL AccountTest Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -5832,6 +5832,7 @@ trait DatabasesBase
|
||||
}
|
||||
|
||||
/**
|
||||
* @depends testCreateDatabase
|
||||
* @param array $data
|
||||
* @return void
|
||||
* @throws \Exception
|
||||
|
||||
@@ -35,75 +35,75 @@ class LegacyPermissionsMemberTest extends Scope
|
||||
return [
|
||||
[
|
||||
'permissions' => [Permission::read(Role::any())],
|
||||
'any' => 1,
|
||||
'users' => 1,
|
||||
'doconly' => 1,
|
||||
'anyCount' => 1,
|
||||
'usersCount' => 1,
|
||||
'docOnlyCount' => 1,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::users())],
|
||||
'any' => 2,
|
||||
'users' => 2,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 2,
|
||||
'usersCount' => 2,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('random')))],
|
||||
'any' => 3,
|
||||
'users' => 3,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 3,
|
||||
'usersCount' => 3,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('lorem'))), Permission::update(Role::user('lorem')), Permission::delete(Role::user('lorem'))],
|
||||
'any' => 4,
|
||||
'users' => 4,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 4,
|
||||
'usersCount' => 4,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('dolor'))), Permission::update(Role::user('dolor')), Permission::delete(Role::user('dolor'))],
|
||||
'any' => 5,
|
||||
'users' => 5,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 5,
|
||||
'usersCount' => 5,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('dolor'))), Permission::read(Role::user('lorem')), Permission::update(Role::user('dolor')), Permission::delete(Role::user('dolor'))],
|
||||
'any' => 6,
|
||||
'users' => 6,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 6,
|
||||
'usersCount' => 6,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::update(Role::any()), Permission::delete(Role::any())],
|
||||
'any' => 7,
|
||||
'users' => 7,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 7,
|
||||
'usersCount' => 7,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::any()), Permission::update(Role::any()), Permission::delete(Role::any())],
|
||||
'any' => 8,
|
||||
'users' => 8,
|
||||
'doconly' => 3,
|
||||
'anyCount' => 8,
|
||||
'usersCount' => 8,
|
||||
'docOnlyCount' => 3,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::any()), Permission::update(Role::users()), Permission::delete(Role::users())],
|
||||
'any' => 9,
|
||||
'users' => 9,
|
||||
'doconly' => 4,
|
||||
'anyCount' => 9,
|
||||
'usersCount' => 9,
|
||||
'docOnlyCount' => 4,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('user1')))],
|
||||
'any' => 10,
|
||||
'users' => 10,
|
||||
'doconly' => 5,
|
||||
'anyCount' => 10,
|
||||
'usersCount' => 10,
|
||||
'docOnlyCount' => 5,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('user1'))), Permission::read(Role::user(ID::custom('user1')))],
|
||||
'any' => 11,
|
||||
'users' => 11,
|
||||
'doconly' => 6,
|
||||
'anyCount' => 11,
|
||||
'usersCount' => 11,
|
||||
'docOnlyCount' => 6,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::users()), Permission::update(Role::users()), Permission::delete(Role::users())],
|
||||
'any' => 12,
|
||||
'users' => 12,
|
||||
'doconly' => 7,
|
||||
'anyCount' => 12,
|
||||
'usersCount' => 12,
|
||||
'docOnlyCount' => 7,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
@@ -35,75 +35,75 @@ class TablesDBPermissionsMemberTest extends Scope
|
||||
return [
|
||||
[
|
||||
'permissions' => [Permission::read(Role::any())],
|
||||
'any' => 1,
|
||||
'users' => 1,
|
||||
'doconly' => 1,
|
||||
'anyCount' => 1,
|
||||
'usersCount' => 1,
|
||||
'docOnlyCount' => 1,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::users())],
|
||||
'any' => 2,
|
||||
'users' => 2,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 2,
|
||||
'usersCount' => 2,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('random')))],
|
||||
'any' => 3,
|
||||
'users' => 3,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 3,
|
||||
'usersCount' => 3,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('lorem'))), Permission::update(Role::user('lorem')), Permission::delete(Role::user('lorem'))],
|
||||
'any' => 4,
|
||||
'users' => 4,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 4,
|
||||
'usersCount' => 4,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('dolor'))), Permission::update(Role::user('dolor')), Permission::delete(Role::user('dolor'))],
|
||||
'any' => 5,
|
||||
'users' => 5,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 5,
|
||||
'usersCount' => 5,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('dolor'))), Permission::read(Role::user('lorem')), Permission::update(Role::user('dolor')), Permission::delete(Role::user('dolor'))],
|
||||
'any' => 6,
|
||||
'users' => 6,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 6,
|
||||
'usersCount' => 6,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::update(Role::any()), Permission::delete(Role::any())],
|
||||
'any' => 7,
|
||||
'users' => 7,
|
||||
'doconly' => 2,
|
||||
'anyCount' => 7,
|
||||
'usersCount' => 7,
|
||||
'docOnlyCount' => 2,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::any()), Permission::update(Role::any()), Permission::delete(Role::any())],
|
||||
'any' => 8,
|
||||
'users' => 8,
|
||||
'doconly' => 3,
|
||||
'anyCount' => 8,
|
||||
'usersCount' => 8,
|
||||
'docOnlyCount' => 3,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::any()), Permission::update(Role::users()), Permission::delete(Role::users())],
|
||||
'any' => 9,
|
||||
'users' => 9,
|
||||
'doconly' => 4,
|
||||
'anyCount' => 9,
|
||||
'usersCount' => 9,
|
||||
'docOnlyCount' => 4,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('user1')))],
|
||||
'any' => 10,
|
||||
'users' => 10,
|
||||
'doconly' => 5,
|
||||
'anyCount' => 10,
|
||||
'usersCount' => 10,
|
||||
'docOnlyCount' => 5,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::user(ID::custom('user1'))), Permission::read(Role::user(ID::custom('user1')))],
|
||||
'any' => 11,
|
||||
'users' => 11,
|
||||
'doconly' => 6,
|
||||
'anyCount' => 11,
|
||||
'usersCount' => 11,
|
||||
'docOnlyCount' => 6,
|
||||
],
|
||||
[
|
||||
'permissions' => [Permission::read(Role::users()), Permission::update(Role::users()), Permission::delete(Role::users())],
|
||||
'any' => 12,
|
||||
'users' => 12,
|
||||
'doconly' => 7,
|
||||
'anyCount' => 12,
|
||||
'usersCount' => 12,
|
||||
'docOnlyCount' => 7,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1493,13 +1493,14 @@ class FunctionsCustomServerTest extends Scope
|
||||
public static function provideCustomExecutions(): array
|
||||
{
|
||||
// Most disabled to keep tests fast
|
||||
// Using positional arrays to avoid PHPUnit 11 named argument conflicts with @depends
|
||||
return [
|
||||
// ['folder' => 'php-fn', 'name' => 'php-8.0', 'entrypoint' => 'index.php', 'runtimeName' => 'PHP', 'runtimeVersion' => '8.0'],
|
||||
['folder' => 'node', 'name' => 'node-22', 'entrypoint' => 'index.js', 'runtimeName' => 'Node.js', 'runtimeVersion' => '22'],
|
||||
// ['folder' => 'python', 'name' => 'python-3.9', 'entrypoint' => 'main.py', 'runtimeName' => 'Python', 'runtimeVersion' => '3.9'],
|
||||
// ['folder' => 'ruby', 'name' => 'ruby-3.1', 'entrypoint' => 'main.rb', 'runtimeName' => 'Ruby', 'runtimeVersion' => '3.1'],
|
||||
// [ 'folder' => 'dart', 'name' => 'dart-2.15', 'entrypoint' => 'main.dart', 'runtimeName' => 'Dart', 'runtimeVersion' => '2.15' ],
|
||||
// [ 'folder' => 'swift', 'name' => 'swift-5.5', 'entrypoint' => 'index.swift', 'runtimeName' => 'Swift', 'runtimeVersion' => '5.5' ],
|
||||
// ['php-fn', 'php-8.0', 'index.php', 'PHP', '8.0'],
|
||||
['node', 'node-22', 'index.js', 'Node.js', '22'],
|
||||
// ['python', 'python-3.9', 'main.py', 'Python', '3.9'],
|
||||
// ['ruby', 'ruby-3.1', 'main.rb', 'Ruby', '3.1'],
|
||||
// ['dart', 'dart-2.15', 'main.dart', 'Dart', '2.15'],
|
||||
// ['swift', 'swift-5.5', 'index.swift', 'Swift', '5.5'],
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@@ -116,6 +116,7 @@ class AccountTest extends Scope
|
||||
}
|
||||
|
||||
/**
|
||||
* @depends testUpdateAccountPhone
|
||||
* @return array
|
||||
* @throws \Exception
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user