L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-68262-main' of https://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2024-05-29 16:19:04 +08:00
parent 70c29d8d68 98ee60401c
commit 65053f6584
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/editpdf/classes/document_services.php
+6 -6
View File
@@ -414,7 +414,7 @@ EOD;
return [];
}
$tmpdir = \make_temp_directory('assignfeedback_editpdf/pageimages/' . self::hash($assignment, $userid, $attemptnumber));
$tmpdir = \make_request_directory('assignfeedback_editpdf/pageimages/' . self::hash($assignment, $userid, $attemptnumber));
$combined = $tmpdir . '/' . self::COMBINED_PDF_FILENAME;
$document->get_combined_file()->copy_content_to($combined); // Copy the file.
@@ -681,7 +681,7 @@ EOD;
$file = $document->get_combined_file();
$tmpdir = make_temp_directory('assignfeedback_editpdf/final/' . self::hash($assignment, $userid, $attemptnumber));
$tmpdir = make_request_directory('assignfeedback_editpdf/final/' . self::hash($assignment, $userid, $attemptnumber));
$combined = $tmpdir . '/' . self::COMBINED_PDF_FILENAME;
$file->copy_content_to($combined); // Copy the file.
@@ -702,7 +702,7 @@ EOD;
}
$fs = get_file_storage();
$stamptmpdir = make_temp_directory('assignfeedback_editpdf/stamps/' . self::hash($assignment, $userid, $attemptnumber));
$stamptmpdir = make_request_directory('assignfeedback_editpdf/stamps/' . self::hash($assignment, $userid, $attemptnumber));
$grade = $assignment->get_user_grade($userid, true, $attemptnumber);
// Copy any new stamps to this instance.
if ($files = $fs->get_area_files($assignment->get_context()->id,
@@ -1004,7 +1004,7 @@ EOD;
$degree = ($degree - 90) % 360;
}
$filename = $matches[0].'png';
$tmpdir = make_temp_directory(self::COMPONENT . '/' . self::PAGE_IMAGE_FILEAREA . '/'
$tmpdir = make_request_directory(self::COMPONENT . '/' . self::PAGE_IMAGE_FILEAREA . '/'
. self::hash($assignment, $userid, $attemptnumber));
$tempfile = $tmpdir . '/' . time() . '_' . $filename;
imagepng($content, $tempfile);
@@ -1041,7 +1041,7 @@ EOD;
private static function save_jpg_to_pdf($assignment, $userid, $attemptnumber, $file, $size=null) {
// Temporary file.
$filename = $file->get_filename();
$tmpdir = make_temp_directory('assignfeedback_editpdf' . DIRECTORY_SEPARATOR
$tmpdir = make_request_directory('assignfeedback_editpdf' . DIRECTORY_SEPARATOR
. self::TMP_JPG_TO_PDF_FILEAREA . DIRECTORY_SEPARATOR
. self::hash($assignment, $userid, $attemptnumber));
$tempfile = $tmpdir . DIRECTORY_SEPARATOR . $filename . ".pdf";
@@ -1092,7 +1092,7 @@ EOD;
*/
private static function save_rotated_image_file($assignment, $userid, $attemptnumber, $rotateddata, $filename) {
$filearea = self::TMP_ROTATED_JPG_FILEAREA;
$tmpdir = make_temp_directory('assignfeedback_editpdf' . DIRECTORY_SEPARATOR
$tmpdir = make_request_directory('assignfeedback_editpdf' . DIRECTORY_SEPARATOR
. $filearea . DIRECTORY_SEPARATOR
. self::hash($assignment, $userid, $attemptnumber));
$tempfile = $tmpdir . DIRECTORY_SEPARATOR . basename($filename);
mod/assign/feedback/editpdf/tests/document_services_test.php
+9 -16
View File
@@ -16,10 +16,6 @@
namespace assignfeedback_editpdf;
use mod_assign_test_generator;
use advanced_testcase;
use ReflectionMethod;
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -30,18 +26,17 @@ require_once($CFG->dirroot . '/mod/assign/tests/generator.php');
*
* @package assignfeedback_editpdf
* @category test
* @covers \assignfeedback_editpdf\document_services
* @copyright 2022 Mikhail Golenkov <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @covers \assignfeedback_editpdf\document_services
*/
class document_services_test extends advanced_testcase {
use mod_assign_test_generator;
final class document_services_test extends \advanced_testcase {
use \mod_assign_test_generator;
/**
* Test that the save file method saves the file.
* @covers ::save_file()
*/
public function test_save_file_saves_the_file() {
public function test_save_file_saves_the_file(): void {
global $DB;
$this->resetAfterTest();
@@ -50,11 +45,11 @@ class document_services_test extends advanced_testcase {
$user = $this->getDataGenerator()->create_user();
$this->getDataGenerator()->enrol_user($user->id, $course->id, 'student');
$method = new ReflectionMethod('\assignfeedback_editpdf\document_services', 'save_file');
$method = new \ReflectionMethod('\assignfeedback_editpdf\document_services', 'save_file');
$filearea = document_services::TMP_ROTATED_JPG_FILEAREA;
$content = 'some random content';
$tempfile = make_temp_directory('assignfeedback_editpdf') . DIRECTORY_SEPARATOR . 'mock.file';
$tempfile = make_request_directory('assignfeedback_editpdf') . DIRECTORY_SEPARATOR . 'mock.file';
file_put_contents($tempfile, $content);
// Invoke the method and confirm, that the file is saved.
@@ -69,9 +64,8 @@ class document_services_test extends advanced_testcase {
/**
* Test that save_rotated_image_file() method saves the file.
* @covers ::save_rotated_image_file()
*/
public function test_save_rotated_image_file_saves_the_file() {
public function test_save_rotated_image_file_saves_the_file(): void {
global $CFG, $DB;
$this->resetAfterTest();
@@ -80,7 +74,7 @@ class document_services_test extends advanced_testcase {
$user = $this->getDataGenerator()->create_user();
$this->getDataGenerator()->enrol_user($user->id, $course->id, 'student');
$method = new ReflectionMethod('\assignfeedback_editpdf\document_services', 'save_rotated_image_file');
$method = new \ReflectionMethod('\assignfeedback_editpdf\document_services', 'save_rotated_image_file');
$imagecontent = file_get_contents($CFG->dirroot . '/lib/filestorage/tests/fixtures/testimage.png');
$imageresource = imagecreatefromstring($imagecontent);
@@ -97,9 +91,8 @@ class document_services_test extends advanced_testcase {
/**
* Test that get_combined_document_for_attempt() method rotates the image only once.
* @covers ::get_combined_document_for_attempt()
*/
public function test_get_combined_document_for_attempt_rotates_image() {
public function test_get_combined_document_for_attempt_rotates_image(): void {
global $CFG, $DB;
$this->resetAfterTest();