Fix coding style issues and remove redundant function

Author: AnupamaSarjoshi

combinable/multichoice/renderer.php

@@ -31,14 +31,7 @@
 class qtype_combined_multichoice_embedded_renderer extends qtype_renderer
     implements qtype_combined_subquestion_renderer_interface {
 
-    /**
-     * Renders a sub-question.
-     *
-     * @param question_attempt $qa The question attempt.
-     * @param question_display_options $options Display options for the question.
-     * @param qtype_combined_combinable_base $subq The sub-question being rendered.
-     * @param int $placeno The placement number of the sub-question.
-     */
+    #[\Override]
     public function subquestion(question_attempt $qa,
                                 question_display_options $options,
                                 qtype_combined_combinable_base $subq,

tests/form_test.php

@@ -76,11 +76,11 @@ public function test_form_validation(): void {
         if (qtype_combined_test_helper::plugin_is_installed('mod_qbank')) {
             $qbank = $gen->create_module('qbank', ['course' => $course->id]);
             $context = \context_module::instance($qbank->cmid);
-            $contexts = qtype_combined_test_helper::question_edit_contexts($context);
+            $contexts = $this->get_question_edit_contexts($context);
             $category = question_get_default_category($context->id, true);
         } else {
             // TODO: remove this once Moodle 5.0 is the lowest supported version.
-            $contexts = qtype_combined_test_helper::question_edit_contexts(\context_course::instance($course->id));
+            $contexts = $this->get_question_edit_contexts(\context_course::instance($course->id));
             $category = question_make_default_categories($contexts->all());
         }
 

tests/helper.php

@@ -847,19 +847,4 @@ public static function plugin_is_installed(string $plugin): bool {
         }
         return true;
     }
-
-    /**
-     * Retrieve the context object.
-     * @param \context $context the current context.
-     *
-     * @return question_edit_contexts The context object.
-     */
-    public static function question_edit_contexts(\context $context): object {
-        if (class_exists('\core_question\local\bank\question_edit_contexts')) {
-            $contexts = new \core_question\local\bank\question_edit_contexts($context);
-        } else {
-            $contexts = new \question_edit_contexts($context);
-        }
-        return $contexts;
-    }
 }