upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Merge pull request #12836 from nextcloud/backport/12624/stable15

Browse source 
[stable15] Validate all rich objects
This commit is contained in:
Morris Jobke 2018-12-05 22:35:47 +01:00 committed by GitHub
commit fc6dd2d4cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/lib/CalDAV/Activity/Provider/Base.php
View file

@ -160,7 +160,7 @@ abstract class Base implements IProvider {
}
return [
'type' => 'group',
'type' => 'user-group',
'id' => $gid,
'name' => $this->groupDisplayNames[$gid],
];

2
apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php
View file

@ -182,7 +182,7 @@ class BaseTest extends TestCase {
*/
public function testGenerateGroupParameter($gid) {
$this->assertEquals([
'type' => 'group',
'type' => 'user-group',
'id' => $gid,
'name' => $gid,
], $this->invokePrivate($this->provider, 'generateGroupParameter', [$gid]));

2
apps/files_sharing/lib/Activity/Providers/Groups.php
View file

@ -150,7 +150,7 @@ class Groups extends Base {
}
return [
'type' => 'group',
'type' => 'user-group',
'id' => $gid,
'name' => $this->groupDisplayNames[$gid],
];

10
lib/private/RichObjectStrings/Validator.php
View file

@ -71,11 +71,17 @@ class Validator implements IValidator {
foreach ($matches[1] as $parameter) {
if (!isset($parameters[$parameter])) {
throw new InvalidObjectExeption('Parameter is undefined');
} else {
$this->validateParameter($parameters[$parameter]);
}
}
}
foreach ($parameters as $parameter) {
if (!\is_array($parameter)) {
throw new InvalidObjectExeption('Parameter is malformed');
}
$this->validateParameter($parameter);
}
}
/**