Merge from development

Author: trampgeek

.github/workflows/ci.yml

@@ -9,22 +9,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - php: '8.3'
+            moodle-branch: 'MOODLE_405_STABLE'
+            database: 'mariadb'
           - php: '8.2'
             moodle-branch: 'MOODLE_404_STABLE'
             database: 'pgsql'
           - php: '8.1'
             moodle-branch: 'MOODLE_403_STABLE'
             database: 'mariadb'
-          - php: '8.0'
-            moodle-branch: 'MOODLE_402_STABLE'
-            database: 'pgsql'
-          - php: '7.4'
-            moodle-branch: 'MOODLE_401_STABLE'
-            database: 'pgsql'
-          - php: '7.3'
-            moodle-branch: 'MOODLE_400_STABLE'
-            database: 'mariadb'
-
     services:
       postgres:
         image: postgres:13

amd/build/ui_ace_gapfiller.min.js

@@ -592,6 +592,8 @@ define(['jquery'], function($) {
         // Create markers
         this.editor.session.addMarker(this.range, "ace-gap-outline", "text", true);
         this.editor.session.addMarker(this.range, "ace-gap-background", "text", false);
+        const startPosition = this.range.start;
+        this.editor.session.insert(startPosition, "<!-- BEGIN CODE GAP -->");
     }
 
     Gap.prototype.cursorInGap = function(cursor) {

amd/build/ui_ace_gapfiller.min.js.map

@@ -143,4 +143,84 @@ public function process_coderunner_options($data) {
         }
         // Nothing to remap if the question already existed.
     }
+
+    // Add the extra methods required by MDL-83541.
+    // #[Override]  // This breaks the restore at run time if used with older versions of moodle so commented out.
+    public static function convert_backup_to_questiondata(array $backupdata): stdClass {
+        $questiondata = parent::convert_backup_to_questiondata($backupdata);
+        $qtype = $questiondata->qtype;
+
+        if (isset($backupdata["plugin_qtype_{$qtype}_question"]['coderunner_testcases'])) {
+            $questiondata->options->testcases = [];
+            foreach ($backupdata["plugin_qtype_{$qtype}_question"]['coderunner_testcases']['coderunner_testcase'] as $record) {
+                $testcase = new stdClass();
+                $fields = [ 'testcode', 'testtype', 'expected', 'useasexample', 'display',
+                    'hiderestiffail', 'mark', 'stdin', 'extra'];
+                foreach ($fields as $field) {
+                    if (isset($record[$field])) {   // Old backups don't have testtype.
+                        $testcase->$field = $record[$field];
+                    }
+                }
+                $questiondata->options->testcases[] = $testcase;
+            }
+        }
+
+        if (isset($backupdata["plugin_qtype_{$qtype}_question"]['coderunner_options'])) {
+            $questiondata->options = (object) array_merge(
+                (array) $questiondata->options,
+                $backupdata["plugin_qtype_{$qtype}_question"]['coderunner_options']['coderunner_option'][0]
+            );
+        }
+
+        return $questiondata;
+    }
+
+    // #[Override]  // This breaks the restore at run time if used with older versions of moodle so commented out.
+    protected function define_excluded_identity_hash_fields(): array {
+        return [
+            '/answers',
+            '/hints',
+            '/prototype',
+            '/options/customise',
+            '/options/templateparamsevald',
+            '/options/testcases/id',
+            '/options/testcases/questionid',
+        ];
+    }
+
+    // #[Override]  // This breaks the restore at run time if used with older versions of moodle so commented out.
+    public static function remove_excluded_question_data(stdClass $questiondata, array $excludefields = []): stdClass {
+        if (isset($questiondata->options->customise)) {
+            unset($questiondata->options->customise);
+        }
+        if (isset($questiondata->prototype)) {
+            unset($questiondata->prototype);
+        }
+        if (isset($questiondata->answers)) {
+            unset($questiondata->answers);
+        }
+        if (isset($questiondata->options->answers)) {
+            unset($questiondata->options->answers);
+        }
+        if (isset($questiondata->hints)) {
+            unset($questiondata->hints);
+        }
+
+        // Hack: convert all cases of allowmultiplestdins being false to null.
+        if (isset($questiondata->options) && ! ($questiondata->options->allowmultiplestdins ?? null)) {
+            $questiondata->options->allowmultiplestdins = null;
+        }
+
+        if (isset($questiondata->options->testcases)) {
+            foreach ($questiondata->options->testcases as $testcase) {
+                if (isset($testcase->id)) {
+                    unset($testcase->id);
+                }
+                if (isset($testcase->questionid)) {
+                    unset($testcase->questionid);
+                }
+            }
+        }
+        return parent::remove_excluded_question_data($questiondata, $excludefields);
+    }
 }

amd/src/ui_ace_gapfiller.js

@@ -25,33 +25,58 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace qtype_coderunner;
+
 define('NO_OUTPUT_BUFFERING', true);
 
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir . '/questionlib.php');
 
 // Get the parameters from the URL.
-$contextid = required_param('contextid', PARAM_INT);
+$contextid = required_param('contextid', PARAM_INT); // Set to 0 if providing a list of question IDs to check.
 $categoryid = optional_param('categoryid', null, PARAM_INT);
+$randomseed = optional_param('randomseed', -1, PARAM_INT);
+$repeatrandomonly = optional_param('repeatrandomonly', 1, PARAM_INT);
+$nruns = optional_param('nruns', 1, PARAM_INT);
+$questionids = optional_param('questionids', '', PARAM_RAW);  // A list of specific questions to check, eg, for rechecking failed tests.
+$clearcachefirst = optional_param('clearcachefirst', 0, PARAM_INT);
+
 
 // Login and check permissions.
-$context = context::instance_by_id($contextid);
 require_login();
+$context = \context::instance_by_id($contextid);
 require_capability('moodle/question:editall', $context);
-$PAGE->set_url('/question/type/coderunner/bulktest.php', ['contextid' => $context->id]);
+
+$urlparams = ['contextid' => $context->id, 'categoryid' => $categoryid, 'randomseed' => $randomseed,
+            'repeatrandomonly' => $repeatrandomonly, 'nruns' => $nruns, 'clearcachefirst' => $clearcachefirst, 'questionids' => $questionids];
+$PAGE->set_url('/question/type/coderunner/bulktest.php', $urlparams);
 $PAGE->set_context($context);
 $title = get_string('bulktesttitle', 'qtype_coderunner', $context->get_context_name());
 $PAGE->set_title($title);
 
+if ($questionids != '') {
+    $questionids = array_map('intval', explode(',', $questionids));
+} else {
+    $questionids = [];
+}
+
 if ($context->contextlevel == CONTEXT_MODULE) {
     // Calling $PAGE->set_context should be enough, but it seems that it is not.
     // Therefore, we get the right $cm and $course, and set things up ourselves.
     $cm = get_coursemodule_from_id(false, $context->instanceid, 0, false, MUST_EXIST);
     $PAGE->set_cm($cm, $DB->get_record('course', ['id' => $cm->course], '*', MUST_EXIST));
 }
 
+
 // Create the helper class.
-$bulktester = new qtype_coderunner_bulk_tester();
+$bulktester = new bulk_tester(
+    $context,
+    $categoryid,
+    $randomseed,
+    $repeatrandomonly,
+    $nruns,
+    $clearcachefirst
+);
 
 // Was: Release the session, so the user can do other things while this runs.
 // Seems like Moodle 4.5 doesn't like this - gives an error. So commented out.
@@ -60,11 +85,23 @@
 
 // Display.
 echo $OUTPUT->header();
-echo $OUTPUT->heading($title);
+echo $OUTPUT->heading($title, 4);
+
+// Release the session, so the user can do other things while this runs.
+\core\session\manager::write_close();
+
+
+ini_set('memory_limit', '1024M');  // For big question banks - TODO: make this a setting?
 
 // Run the tests.
-[$numpasses, $failingtests, $missinganswers] = $bulktester->run_all_tests_for_context($context, $categoryid);
+if (count($questionids) == 0) {
+    $bulktester->run_all_tests_for_context();
+} else {
+    $bulktester->run_all_tests_for_context($questionids);
+}
+
+// Prints the summary of failed/missing tests
+$bulktester->print_overall_result();
+
 
-// Display the final summary.
-$bulktester->print_overall_result($numpasses, $failingtests, $missinganswers);
 echo $OUTPUT->footer();

backup/moodle2/restore_qtype_coderunner_plugin.class.php

@@ -23,6 +23,13 @@
  * @copyright 2016 Richard Lobb, The University of Canterbury
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace qtype_coderunner;
+
+use context;
+use context_system;
+use context_course;
+use html_writer;
+use moodle_url;
 
 define('NO_OUTPUT_BUFFERING', true);
 
@@ -45,8 +52,7 @@
 $title = get_string('bulktesttitle', 'qtype_coderunner', $context->get_context_name());
 $PAGE->set_title($title);
 
-// Create the helper class.
-$bulktester = new qtype_coderunner_bulk_tester();
+
 $numpasses = 0;
 $allfailingtests = [];
 $allmissinganswers = [];
@@ -60,15 +66,20 @@
 echo $OUTPUT->heading($title, 1);
 
 // Run the tests.
-foreach ($bulktester->get_num_coderunner_questions_by_context() as $contextid => $numcoderunnerquestions) {
+ini_set('memory_limit', '2048M');  // For big question banks - TODO: make this a setting?
+$contextdata = bulk_tester::get_num_coderunner_questions_by_context();
+foreach ($contextdata as $contextid => $numcoderunnerquestions) {
     if ($skipping && $contextid != $startfromcontextid) {
         continue;
     }
     $skipping = false;
-
     $testcontext = context::instance_by_id($contextid);
     if (has_capability('moodle/question:editall', $context)) {
+        $PAGE->set_context($testcontext);  // Helps grading cache pickup right course id.
+        $bulktester = new bulk_tester($testcontext);
         echo $OUTPUT->heading(get_string('bulktesttitle', 'qtype_coderunner', $testcontext->get_context_name()));
+        $adminpluginscachelink = html_writer::link(new moodle_url('/cache/admin.php'), 'admin-plugins-cache', ['target' => '_blank']);
+        echo html_writer::tag('p', 'Note: Grading cache not cleared -- do it from ' . $adminpluginscachelink . ' if you really want to clear the cache for all course!');
         echo html_writer::tag('p', html_writer::link(
             new moodle_url(
                 '/question/type/coderunner/bulktestall.php',
@@ -77,13 +88,13 @@
             get_string('bulktestcontinuefromhere', 'qtype_coderunner')
         ));
 
-        [$passes, $failingtests, $missinganswers] = $bulktester->run_all_tests_for_context($testcontext);
+        [$passes, $failingtests, $missinganswers] = $bulktester->run_all_tests_for_context();
         $numpasses += $passes;
         $allfailingtests = array_merge($allfailingtests, $failingtests);
         $allmissinganswers = array_merge($allmissinganswers, $missinganswers);
     }
 }
 
 // Display the final summary.
-$bulktester->print_overall_result($numpasses, $allfailingtests, $allmissinganswers);
+bulk_tester::print_summary_after_bulktestall($numpasses, $allfailingtests, $allmissinganswers);
 echo $OUTPUT->footer();