From d47af580bd99f5393c9e68c00814771dd91a093b Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Fri, 2 Sep 2016 10:52:02 +0800
Subject: [PATCH] MDL-55826 question: fix PHP7.1 strict warnings

---
 question/format.php | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/question/format.php b/question/format.php
index a2aeaa1c40d..20b92fec95a 100644
--- a/question/format.php
+++ b/question/format.php
@@ -621,9 +621,6 @@ class qformat_default {
         $question->questiontextformat = FORMAT_MOODLE;
         $question->generalfeedback = '';
         $question->generalfeedbackformat = FORMAT_MOODLE;
-        $question->correctfeedback = '';
-        $question->partiallycorrectfeedback = '';
-        $question->incorrectfeedback = '';
         $question->answernumbering = 'abc';
         $question->penalty = 0.3333333;
         $question->length = 1;
@@ -633,6 +630,8 @@ class qformat_default {
         $question->export_process = true;
         $question->import_process = true;
 
+        $this->add_blank_combined_feedback($question);
+
         return $question;
     }
 
@@ -673,15 +672,21 @@ class qformat_default {
      * @return object question
      */
     protected function add_blank_combined_feedback($question) {
-        $question->correctfeedback['text'] = '';
-        $question->correctfeedback['format'] = $question->questiontextformat;
-        $question->correctfeedback['files'] = array();
-        $question->partiallycorrectfeedback['text'] = '';
-        $question->partiallycorrectfeedback['format'] = $question->questiontextformat;
-        $question->partiallycorrectfeedback['files'] = array();
-        $question->incorrectfeedback['text'] = '';
-        $question->incorrectfeedback['format'] = $question->questiontextformat;
-        $question->incorrectfeedback['files'] = array();
+        $question->correctfeedback = [
+            'text' => '',
+            'format' => $question->questiontextformat,
+            'files' => []
+        ];
+        $question->partiallycorrectfeedback = [
+            'text' => '',
+            'format' => $question->questiontextformat,
+            'files' => []
+        ];
+        $question->incorrectfeedback = [
+            'text' => '',
+            'format' => $question->questiontextformat,
+            'files' => []
+        ];
         return $question;
     }