Skip to content

Discard duplicate collection name from account serialization #31487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pytal merged 1 commit into from
Mar 17, 2022
Merged

Discard duplicate collection name from account serialization #31487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lib/private/Accounts/Account.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,16 @@ public function getFilteredProperties(string $scope = null, string $verified = n
return $result;
}

/** @return IAccountPropertyCollection[]|IAccountProperty[] */
/** @return array<string, IAccountProperty|array<int, IAccountProperty>> */
public function jsonSerialize(): array {
return $this->properties;
$properties = $this->properties;
foreach ($properties as $propertyName => $propertyObject) {
if ($propertyObject instanceof IAccountPropertyCollection) {
// Override collection serialization to discard duplicate name
$properties[$propertyName] = $propertyObject->jsonSerialize()[$propertyName];
}
}
return $properties;
}

public function getUser(): IUser {
Expand Down
16 changes: 15 additions & 1 deletion tests/lib/Accounts/AccountTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,26 @@ public function testJsonSerialize() {
$user = $this->createMock(IUser::class);
$properties = [
IAccountManager::PROPERTY_WEBSITE => new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, '[email protected]', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, '')
IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, '[email protected]', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, ''),
IAccountManager::COLLECTION_EMAIL => [
new AccountProperty(IAccountManager::COLLECTION_EMAIL, '[email protected]', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
new AccountProperty(IAccountManager::COLLECTION_EMAIL, '[email protected]', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
new AccountProperty(IAccountManager::COLLECTION_EMAIL, '[email protected]', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
],
];

$account = new Account($user);
$account->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED);
$account->setProperty(IAccountManager::PROPERTY_EMAIL, '[email protected]', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED);

$col = new AccountPropertyCollection(IAccountManager::COLLECTION_EMAIL);
$col->setProperties([
new AccountProperty($col->getName(), '[email protected]', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
new AccountProperty($col->getName(), '[email protected]', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
new AccountProperty($col->getName(), '[email protected]', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
]);
$account->setPropertyCollection($col);

$this->assertEquals($properties, $account->jsonSerialize());
}
}