test: fix test_upsert_question_should_save_draft_files

Author: MHajoha

classes/question_service.php

@@ -217,7 +217,10 @@ public function upsert_question(object $question): void {
 
         // Save the draft area files belonging to the question.
         // file_upload_element and wysiwyg_editor_element add to qpy_options_draftitems.
-        $draftitems = array_filter((array) $question->qpy_options_draftitems ?? [], fn($draftitemid) => is_int($draftitemid));
+        $draftitems = array_filter(
+            isset($question->qpy_options_draftitems) ? (array) $question->qpy_options_draftitems : [],
+            fn($draftitemid) => is_int($draftitemid)
+        );
         global $USER;
         if ($draftitems) {
             $this->ofs->save_draft_area_files($question->context->id, $question->id, $USER->id, $draftitems);

tests/phpunit_compat.php

@@ -23,7 +23,6 @@
 use coding_exception;
 use dml_exception;
 use moodle_exception;
-use phpunit_compat;
 use qtype_questionpy\local\api\api;
 use qtype_questionpy\local\api\lms_permissions;
 use qtype_questionpy\local\api\package_api;
@@ -37,8 +36,6 @@
 use qtype_questionpy\local\package\package_raw;
 use stdClass;
 
-require_once(__DIR__ . '/phpunit_compat.php');
-
 /**
  * Unit tests for {@see question_service}.
  *
@@ -405,10 +402,9 @@ public function test_upsert_question_should_save_draft_files(): void {
             ->willReturn(new question_response('en', '{}', scoring_method::automatically_scorable));
 
         global $USER;
-        $matcher = $this->exactly(2);
-        $this->ofs->expects($matcher)
+        $this->ofs->expects($this->once())
             ->method('save_draft_area_files')
-            ->with($PAGE->context->id, 42, $USER->id, phpunit_compat::consecutively($matcher, 1234, 2345));
+            ->with($PAGE->context->id, 42, $USER->id, [1234, 2345]);
 
         $this->questionservice->upsert_question(
             (object)[