Merge branch 'MDL-76614' of https://github.com/timhunt/moodle

admin/tool/recyclebin/tests/course_bin_test.php

@@ -16,6 +16,9 @@
 
 namespace tool_recyclebin;
 
+use mod_quiz\quiz_attempt;
+use stdClass;
+
 /**
  * Recycle bin course tests.
  *
@@ -237,7 +240,7 @@ public function test_coursemodule_restore_with_userdata($settings) {
         $attempts = quiz_get_user_attempts($cm->instance, $student->id);
         $this->assertEquals(1, count($attempts));
         $attempt = array_pop($attempts);
-        $attemptobj = \quiz_attempt::create($attempt->id);
+        $attemptobj = quiz_attempt::create($attempt->id);
         $this->assertEquals($student->id, $attemptobj->get_userid());
         $this->assertEquals(true, $attemptobj->is_finished());
     }
@@ -300,17 +303,17 @@ private function create_quiz_attempt($quiz, $student) {
         quiz_add_quiz_question($numq->id, $quiz);
 
         // Create quiz attempt.
-        $quizobj = \quiz::create($quiz->id, $student->id);
+        $quizobj = \mod_quiz\quiz_settings::create($quiz->id, $student->id);
         $quba = \question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
         $quba->set_preferred_behaviour($quizobj->get_quiz()->preferredbehaviour);
         $timenow = time();
         $attempt = quiz_create_attempt($quizobj, 1, false, $timenow, false, $student->id);
         quiz_start_new_attempt($quizobj, $quba, $attempt, 1, $timenow);
         quiz_attempt_save_started($quizobj, $quba, $attempt);
-        $attemptobj = \quiz_attempt::create($attempt->id);
+        $attemptobj = quiz_attempt::create($attempt->id);
         $tosubmit = array(1 => array('answer' => '0'));
         $attemptobj->process_submitted_actions($timenow, false, $tosubmit);
-        $attemptobj = \quiz_attempt::create($attempt->id);
+        $attemptobj = quiz_attempt::create($attempt->id);
         $attemptobj->process_finish($timenow, false);
     }
 }

backup/moodle2/tests/restore_stepslib_date_test.php

@@ -16,6 +16,8 @@
 
 namespace core_backup;
 
+use mod_quiz\quiz_attempt;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
@@ -379,7 +381,7 @@ public function test_question_attempt_steps_date_restore() {
         // Make a user to do the quiz.
         $user1 = $this->getDataGenerator()->create_user();
 
-        $quizobj = \quiz::create($quiz->id, $user1->id);
+        $quizobj = \mod_quiz\quiz_settings::create($quiz->id, $user1->id);
 
         // Start the attempt.
         $quba = \question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
@@ -393,7 +395,7 @@ public function test_question_attempt_steps_date_restore() {
         quiz_attempt_save_started($quizobj, $quba, $attempt);
 
         // Process some responses from the student.
-        $attemptobj = \quiz_attempt::create($attempt->id);
+        $attemptobj = quiz_attempt::create($attempt->id);
 
         $prefix1 = $quba->get_field_prefix(1);
         $prefix2 = $quba->get_field_prefix(2);
@@ -404,7 +406,7 @@ public function test_question_attempt_steps_date_restore() {
         $attemptobj->process_submitted_actions($timenow, false, $tosubmit);
 
         // Finish the attempt.
-        $attemptobj = \quiz_attempt::create($attempt->id);
+        $attemptobj = quiz_attempt::create($attempt->id);
         $attemptobj->process_finish($timenow, false);
 
         $questionattemptstepdates = [];
@@ -419,7 +421,7 @@ public function test_question_attempt_steps_date_restore() {
 
         // Get the quiz for this new restored course.
         $quizdata = $DB->get_record('quiz', ['course' => $newcourseid]);
-        $quizobj = \quiz::create($quizdata->id, $user1->id);
+        $quizobj = \mod_quiz\quiz_settings::create($quizdata->id, $user1->id);
 
         $questionusage = $DB->get_record('question_usages', [
                 'component' => 'mod_quiz',

lib/questionlib.php

@@ -841,7 +841,7 @@ function question_move_category_to_context($categoryid, $oldcontextid, $newconte
 /**
  * Given a list of ids, load the basic information about a set of questions from
  * the questions table. The $join and $extrafields arguments can be used together
- * to pull in extra data. See, for example, the usage in mod/quiz/attemptlib.php, and
+ * to pull in extra data. See, for example, the usage in {@see \mod_quiz\quiz_attempt}, and
  * read the code below to see how the SQL is assembled. Throws exceptions on error.
  *
  * @param array $questionids array of question ids to load. If null, then all