mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-29 11:46:19 +01:00
Code Issues Projects Releases Wiki Activity

MDL-62248 core_privacy: Test writer writes user prefs in right contexts

Browse Source
This commit is contained in:
Frédéric Massart 2018-04-30 15:22:50 +08:00
parent af099b484c
commit 97b05c8f1e
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
privacy/classes/tests/request/content_writer.php
View File

@ -67,9 +67,9 @@ class content_writer implements \core_privacy\local\request\content_writer {
protected $customfiles;
/**
* @var array The site-wide user preferences which have been exported.
* @var \stdClass The user preferences which have been exported.
*/
protected $userprefs = [];
protected $userprefs;
/**
* Whether any data has been exported at all within the current context.
@ -80,7 +80,7 @@ class content_writer implements \core_privacy\local\request\content_writer {
$hasmetadata = !empty($this->metadata->{$this->context->id});
$hasfiles = !empty($this->files->{$this->context->id});
$hascustomfiles = !empty($this->customfiles->{$this->context->id});
$hasuserprefs = !empty($this->userprefs);
$hasuserprefs = !empty($this->userprefs->{$this->context->id});
return $hasdata || $hasrelateddata || $hasmetadata || $hasfiles || $hascustomfiles || $hasuserprefs;
}
@ -97,6 +97,7 @@ class content_writer implements \core_privacy\local\request\content_writer {
$this->metadata = (object) [];
$this->files = (object) [];
$this->customfiles = (object) [];
$this->userprefs = (object) [];
}
/**
@ -142,6 +143,13 @@ class content_writer implements \core_privacy\local\request\content_writer {
];
}
if (isset($this->userprefs->{$this->context->id}) && empty((array) $this->userprefs->{$this->context->id})) {
$this->userprefs->{$this->context->id} = (object) [
'children' => (object) [],
'data' => [],
];
}
return $this;
}
@ -386,11 +394,13 @@ class content_writer implements \core_privacy\local\request\content_writer {
string $value,
string $description
) : \core_privacy\local\request\content_writer {
if (!isset($this->userprefs[$component])) {
$this->userprefs[$component] = (object) [];
$prefs = $this->fetch_root($this->userprefs, []);
if (!isset($prefs->{$component})) {
$prefs->{$component} = (object) [];
}
$this->userprefs[$component]->$key = (object) [
$prefs->{$component}->$key = (object) [
'value' => $value,
'description' => $description,
];
@ -405,8 +415,9 @@ class content_writer implements \core_privacy\local\request\content_writer {
* @return \stdClass
*/
public function get_user_preferences(string $component) {
if (isset($this->userprefs[$component])) {
return $this->userprefs[$component];
$prefs = $this->fetch_root($this->userprefs, []);
if (isset($prefs->{$component})) {
return $prefs->{$component};
} else {
return (object) [];
}