fixup! MDL-83541 qtypes: Define excluded hash fields and test hints

Rename $tags to $backupdata (qtypes)
marxjohnson · Feb 18, 2025 · ae4b9aa · ae4b9aa
1 parent 502a0c2
commit ae4b9aa
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/question/type/calculated/backup/moodle2/restore_qtype_calculated_plugin.class.php b/question/type/calculated/backup/moodle2/restore_qtype_calculated_plugin.class.php
@@ -115,11 +115,11 @@ public function process_calculated_option($data) {
     }
 
     #[\Override]
-    public static function convert_backup_to_questiondata(array $tags): \stdClass {
-        $questiondata = parent::convert_backup_to_questiondata($tags);
+    public static function convert_backup_to_questiondata(array $backupdata): \stdClass {
+        $questiondata = parent::convert_backup_to_questiondata($backupdata);
         $qtype = $questiondata->qtype;
-        foreach ($tags["plugin_qtype_{$qtype}_question"]['calculated_records']['calculated_record'] as $record) {
-            foreach($questiondata->options->answers as &$answer) {
+        foreach ($backupdata["plugin_qtype_{$qtype}_question"]['calculated_records']['calculated_record'] as $record) {
+            foreach ($questiondata->options->answers as &$answer) {
                 if ($answer->id == $record['answer']) {
                     $answer->tolerance = $record['tolerance'];
                     $answer->tolerancetype = $record['tolerancetype'];
@@ -129,10 +129,10 @@ public static function convert_backup_to_questiondata(array $tags): \stdClass {
                 }
             }
         }
-        if (isset($tags["plugin_qtype_{$qtype}_question"]['calculated_options'])) {
+        if (isset($backupdata["plugin_qtype_{$qtype}_question"]['calculated_options'])) {
             $questiondata->options = (object) array_merge(
                 (array) $questiondata->options,
-                $tags["plugin_qtype_{$qtype}_question"]['calculated_options']['calculated_option'][0],
+                $backupdata["plugin_qtype_{$qtype}_question"]['calculated_options']['calculated_option'][0],
             );
         }
         return $questiondata;

diff --git a/question/type/ddimageortext/backup/moodle2/restore_qtype_ddimageortext_plugin.class.php b/question/type/ddimageortext/backup/moodle2/restore_qtype_ddimageortext_plugin.class.php
@@ -168,15 +168,15 @@ public static function define_decode_contents() {
     }
 
     #[\Override]
-    public static function convert_backup_to_questiondata(array $tags): \stdClass {
-        $questiondata = parent::convert_backup_to_questiondata($tags);
+    public static function convert_backup_to_questiondata(array $backupdata): \stdClass {
+        $questiondata = parent::convert_backup_to_questiondata($backupdata);
         $questiondata->options->drags = array_map(
             fn($drag) => (object) $drag,
-            $tags['plugin_qtype_ddimageortext_question']['drags']['drag'],
+            $backupdata['plugin_qtype_ddimageortext_question']['drags']['drag'],
         );
         $questiondata->options->drops = array_map(
             fn($drop) => (object) $drop,
-            $tags['plugin_qtype_ddimageortext_question']['drops']['drop'],
+            $backupdata['plugin_qtype_ddimageortext_question']['drops']['drop'],
         );
         return $questiondata;
     }

diff --git a/question/type/ddmarker/backup/moodle2/restore_qtype_ddmarker_plugin.class.php b/question/type/ddmarker/backup/moodle2/restore_qtype_ddmarker_plugin.class.php
@@ -170,15 +170,15 @@ public static function define_decode_contents() {
     }
 
     #[\Override]
-    public static function convert_backup_to_questiondata(array $tags): \stdClass {
-        $questiondata = parent::convert_backup_to_questiondata($tags);
+    public static function convert_backup_to_questiondata(array $backupdata): \stdClass {
+        $questiondata = parent::convert_backup_to_questiondata($backupdata);
         $questiondata->options->drags = array_map(
             fn($drag) => (object) $drag,
-            $tags['plugin_qtype_ddmarker_question']['drags']['drag'],
+            $backupdata['plugin_qtype_ddmarker_question']['drags']['drag'],
         );
         $questiondata->options->drops = array_map(
             fn($drop) => (object) $drop,
-            $tags['plugin_qtype_ddmarker_question']['drops']['drop'],
+            $backupdata['plugin_qtype_ddmarker_question']['drops']['drop'],
         );
         return $questiondata;
     }

diff --git a/question/type/match/backup/moodle2/restore_qtype_match_plugin.class.php b/question/type/match/backup/moodle2/restore_qtype_match_plugin.class.php
@@ -248,12 +248,12 @@ public static function define_decode_contents() {
     }
 
     #[\Override]
-    public static function convert_backup_to_questiondata(array $tags): \stdClass {
-        $questiondata = parent::convert_backup_to_questiondata($tags);
-        $questiondata->options = (object) $tags["plugin_qtype_match_question"]['matchoptions'][0];
+    public static function convert_backup_to_questiondata(array $backupdata): \stdClass {
+        $questiondata = parent::convert_backup_to_questiondata($backupdata);
+        $questiondata->options = (object) $backupdata["plugin_qtype_match_question"]['matchoptions'][0];
         $questiondata->options->subquestions = array_map(
             fn($match) => (object) $match,
-            $tags["plugin_qtype_match_question"]['matches']['match'],
+            $backupdata["plugin_qtype_match_question"]['matches']['match'],
         );
         return $questiondata;
     }

diff --git a/question/type/numerical/backup/moodle2/restore_qtype_numerical_plugin.class.php b/question/type/numerical/backup/moodle2/restore_qtype_numerical_plugin.class.php
@@ -82,10 +82,10 @@ public function process_numerical($data) {
     }
 
     #[\Override]
-    public static function convert_backup_to_questiondata(array $tags): \stdClass {
-        $questiondata = parent::convert_backup_to_questiondata($tags);
-        foreach ($tags['plugin_qtype_numerical_question']['numerical_records']['numerical_record'] as $record) {
-            foreach($questiondata->options->answers as &$answer) {
+    public static function convert_backup_to_questiondata(array $backupdata): \stdClass {
+        $questiondata = parent::convert_backup_to_questiondata($backupdata);
+        foreach ($backupdata['plugin_qtype_numerical_question']['numerical_records']['numerical_record'] as $record) {
+            foreach ($questiondata->options->answers as &$answer) {
                 if ($answer->id == $record['answer']) {
                     $answer->tolerance = $record['tolerance'];
                     continue 2;