mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-77954' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2023-04-19 11:16:50 +08:00
commit a089496f96
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/classes/moodlenet/activity_packager.php
View File

@ -20,6 +20,7 @@ use backup;
use backup_controller;
use backup_root_task;
use cm_info;
use core\context\user;
defined('MOODLE_INTERNAL') || die();
@ -52,7 +53,6 @@ class activity_packager {
throw new \coding_exception("Cannot backup module $cminfo->modname. This module doesn't support the backup feature.");
}
$this->cminfo = $cminfo;
$this->controller = new backup_controller (
backup::TYPE_1ACTIVITY,
$cminfo->id,
@ -147,15 +147,14 @@ class activity_packager {
}
// Create the location we want to copy this file to.
$time = time();
$fr = [
'contextid' => \context_course::instance($this->cminfo->course)->id,
'component' => 'core',
'filearea' => 'moodlenet_resource',
'contextid' => user::instance($this->userid)->id,
'userid' => $this->userid,
'component' => 'user',
'filearea' => 'draft',
'itemid' => file_get_unused_draft_itemid(),
'filepath' => '/',
'filename' => $this->cminfo->modname . '_backup.mbz',
// Add timestamp to itemid to make it unique, to avoid any collisions.
'itemid' => $this->cminfo->id . $time,
'timemodified' => $time,
];
// Create the local file based on the backup.
@ -167,10 +166,6 @@ class activity_packager {
// Delete the backup now it has been created in the file area.
$backupfile->delete();
if (!$packagedfiledata['storedfile']) {
throw new \moodle_exception("Failed to copy backup file to moodlenet_activity area.");
}
// Ensure we can handle files at the upper end of the limit supported by MoodleNet.
raise_memory_limit(activity_sender::MAX_FILESIZE);

9
lib/tests/moodlenet/activity_packager_test.php
View File

@ -16,6 +16,8 @@
namespace core\moodlenet;
use core\context\user;
/**
* Unit tests for {@see activity_packager}.
*
@ -107,7 +109,6 @@ class activity_packager_test extends \advanced_testcase {
$currenttime = time();
$generator = $this->getDataGenerator();
$course = $generator->create_course();
$coursecontext = \context_course::instance($course->id);
$assigndata = [
'course' => $course->id,
@ -131,9 +132,9 @@ class activity_packager_test extends \advanced_testcase {
// Check some known values in the returned stored_file object to confirm they match the file we have packaged.
$this->assertNotEmpty($package['storedfile']->get_contenthash());
$this->assertEquals($coursecontext->id, $package['storedfile']->get_contextid());
$this->assertEquals('core', $package['storedfile']->get_component());
$this->assertEquals('moodlenet_resource', $package['storedfile']->get_filearea());
$this->assertEquals(user::instance($USER->id)->id, $package['storedfile']->get_contextid());
$this->assertEquals('user', $package['storedfile']->get_component());
$this->assertEquals('draft', $package['storedfile']->get_filearea());
$this->assertEquals('assign_backup.mbz', $package['storedfile']->get_filename());
$this->assertGreaterThan(0, $package['storedfile']->get_filesize());
$timecreated = $package['storedfile']->get_timecreated();