From 60cbb9edb2b21d0c4fa3c717d7e141fa905e1782 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Mon, 21 Feb 2011 18:10:19 +0000
Subject: [PATCH] MDL-47494 ddwtos: Fix new stdClass -> stdClass(), and
 trailing whitespace.

---
 question/type/ddwtos/questiontype.php                | 4 ++--
 question/type/ddwtos/simpletest/testquestiontype.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/question/type/ddwtos/questiontype.php b/question/type/ddwtos/questiontype.php
index e360fcc15fb..e5078dd6be0 100755
--- a/question/type/ddwtos/questiontype.php
+++ b/question/type/ddwtos/questiontype.php
@@ -47,7 +47,7 @@ class qtype_ddwtos extends qtype_gapselect_base {
     }
 
     protected function choice_options_to_feedback($choice){
-        $output = new stdClass;
+        $output = new stdClass();
         $output->draggroup = $choice['choicegroup'];
         $output->infinite = !empty($choice['infinite']);
         return serialize($output);
@@ -174,7 +174,7 @@ class qtype_ddwtos extends qtype_gapselect_base {
             $mul_info = $ddwtos[$i];
 
             //Now, build the question_ddwtos record structure
-            $ddwtos = new stdClass;
+            $ddwtos = new stdClass();
             $ddwtos->questionid = $new_question_id;
             $ddwtos->shuffleanswers = isset($mul_info['#']['SHUFFLEANSWERS']['0']['#'])?backup_todb($mul_info['#']['SHUFFLEANSWERS']['0']['#']):'';
             if (array_key_exists("CORRECTFEEDBACK", $mul_info['#'])) {
diff --git a/question/type/ddwtos/simpletest/testquestiontype.php b/question/type/ddwtos/simpletest/testquestiontype.php
index 4ef6567c5b5..dca047ed47a 100755
--- a/question/type/ddwtos/simpletest/testquestiontype.php
+++ b/question/type/ddwtos/simpletest/testquestiontype.php
@@ -59,7 +59,7 @@ class qtype_ddwtos_test extends UnitTestCase {
     protected function get_test_question_data() {
         global $USER;
 
-        $dd = new stdClass;
+        $dd = new stdClass();
         $dd->id = 0;
         $dd->category = 0;
         $dd->contextid = 0;
@@ -196,7 +196,7 @@ class qtype_ddwtos_test extends UnitTestCase {
         $q = $importer->try_importing_using_qtypes(
                 $xmldata['question'], null, null, 'ddwtos');
 
-        $expectedq = new stdClass;
+        $expectedq = new stdClass();
         $expectedq->qtype = 'ddwtos';
         $expectedq->name = 'A drag-and-drop question';
         $expectedq->questiontext = 'Put these in order: [[1]], [[2]], [[3]].';
@@ -345,7 +345,7 @@ class qtype_ddwtos_test extends UnitTestCase {
         $q = $importer->try_importing_using_qtypes(
                 $xmldata['question'], null, null, 'ddwtos');
 
-        $expectedq = new stdClass;
+        $expectedq = new stdClass();
         $expectedq->qtype = 'ddwtos';
         $expectedq->name = 'QDandD1 Base definition';
         $expectedq->questiontext = '<p>Drag and drop the words from the list below to fill the blank spaces and correctly complete the sentence.</p><p>At 25°C all aqueous basic solutions have [[1]] ion concentrations less than [[8]]<br />mol litre<sup>-1</sup> and pH values [[9]] than [[6]].</p><!--DONOTCLEAN-->';
@@ -385,7 +385,7 @@ class qtype_ddwtos_test extends UnitTestCase {
     }
 
     public function test_xml_export() {
-        $qdata = new stdClass;
+        $qdata = new stdClass();
         $qdata->id = 123;
         $qdata->contextid = 0;
         $qdata->qtype = 'ddwtos';