refactor: have render_context take a moodleform again

Specifically requiring a question_edit_form is too much of a headache in UTs.

Author: MHajoha

classes/local/form/context/render_context.php

@@ -47,16 +47,21 @@ abstract class render_context {
     /**
      * Initializes a new render context.
      *
-     * @param question_edit_form $moodleform Target {@see question_edit_form} instance, such as {@see \qtype_questionpy_edit_form}
+     * @param moodleform $moodleform The target {@see moodleform} instance. In reality, this is a
+     *                               {@see \qtype_questionpy_edit_form}, but a raw {@see moodleform} is much easier to
+     *                               produce in unit tests).
      * @param MoodleQuickForm $mform Target {@see MoodleQuickForm} instance, as passed to
      *                               {@see \question_edit_form::definition_inner}
      * @param object $question The current question being edited
      * @param string $prefix Prefix for the names of elements in this context
      * @param array $data The current form data as of last save, in {@see self::register_rich_conversion() QPy server format}
      */
     public function __construct(
-        /** @var moodleform target {@see moodleform} instance, such as {@see \qtype_questionpy_edit_form} */
-        public question_edit_form $moodleform,
+        /**
+         * @var moodleform The target {@see moodleform} instance. In reality, this is a {@see \qtype_questionpy_edit_form}, but a
+         * raw {@see moodleform} is much easier to produce in unit tests).
+         */
+        public moodleform $moodleform,
         /**
          * @var MoodleQuickForm target {@see MoodleQuickForm} instance, as passed to
          *                      {@see \question_edit_form::definition_inner}

classes/local/form/elements/file_upload_element.php

@@ -123,7 +123,7 @@ public function render_to(render_context $context): void {
                 }
 
                 $ofs = di::get(options_file_service::class);
-                $ofs->prepare_draft_area($context->moodleform->context->id, $questionid, $files, $USER->id, $draftitemid);
+                $ofs->prepare_draft_area($context->question->contextid, $questionid, $files, $USER->id, $draftitemid);
             }
 
             utils::array_set_nested($alldata, $element->getName(), $draftitemid);

classes/local/form/elements/wysiwyg_editor_element.php

@@ -18,6 +18,7 @@
 
 use coding_exception;
 use context_user;
+use core\context;
 use core\di;
 use moodle_exception;
 use moodle_url;
@@ -88,7 +89,7 @@ public function render_to(render_context $context): void {
             [
                 'maxfiles' => EDITOR_UNLIMITED_FILES,
                 'subdirs' => self::SUBDIRS,
-                'context' => $context->moodleform->context,
+                'context' => context::instance_by_id($context->question->contextid),
             ]
         );
         $context->set_type($this->name, PARAM_RAW);
@@ -115,7 +116,7 @@ public function render_to(render_context $context): void {
             // do this _before_ replacing URLs.
             if ($format != FORMAT_HTML && $this->includehtml) {
                 $html = format_text($markup, $format, options: [
-                    'context' => $context->moodleform->context,
+                    'context' => context::instance_by_id($context->question->contextid),
                     // We leave cleaning to when the content is output. (Placeholder values are cleaned by default, for instance.)
                     'noclean' => true,
                     // If filter is true (default), format_text replaces draftfile URLs with brokenfile.
@@ -173,7 +174,7 @@ public function render_to(render_context $context): void {
                 }
 
                 $ofs = di::get(options_file_service::class);
-                $ofs->prepare_draft_area($context->moodleform->context->id, $questionid, $mydata->files, $USER->id, $draftitemid);
+                $ofs->prepare_draft_area($context->question->contextid, $questionid, $mydata->files, $USER->id, $draftitemid);
             }
 
             $filenamebyfileref = array_flip(array_map(fn($fmeta) => $fmeta->fileref, $mydata->files));

tests/local/form/elements/test_moodleform.php

@@ -23,6 +23,7 @@
 
 use qtype_questionpy\local\form\context\root_render_context;
 use qtype_questionpy\local\form\qpy_renderable;
+use stdClass;
 
 /**
  * Stub {@see \moodleform} implementation for tests.
@@ -54,7 +55,11 @@ public function __construct(qpy_renderable $element) {
      * Output can be retrieved using {@see render}, which calls this method.
      */
     protected function definition() {
-        $context = new root_render_context($this, $this->_form, 'qpy_form', []);
+        global $PAGE;
+        $question = (object) [
+            'contextid' => $PAGE->context->id,
+        ];
+        $context = new root_render_context($this, $this->_form, $question, 'qpy_form', []);
         $context->uuidgen = fn() => '24daab97-7eeb-422d-a2f3-f4e770fb11f6';
         $this->element->render_to($context);
     }