MDL-20636 Fix some more codechecker issues.

9c197f44 · Tim Hunt · bee82469 · 9c197f44 · 9c197f44 · 9c197f44
Commit 9c197f44 authored May 14, 2011 by Tim Hunt
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -32,11 +32,12 @@
 */


+defined('MOODLE_INTERNAL') || die();
+
 require_once($CFG->dirroot . '/question/engine/lib.php');
 require_once($CFG->dirroot . '/question/type/questiontype.php');


-defined('MOODLE_INTERNAL') || die();

 /// CONSTANTS ///////////////////////////////////


--- a/lib/simpletest/testquestionlib.php
+++ b/lib/simpletest/testquestionlib.php
 <?php
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

 /**
 * Unit tests for (some of) ../questionlib.php.
 *
- * @copyright &copy; 2006 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package question
+ * @package    moodlecore
+ * @subpackage questionbank
+ * @copyright  2006 The Open University
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+
+defined('MOODLE_INTERNAL') || die();

 require_once($CFG->libdir . '/questionlib.php');

+
+/**
+ * Unit tests for (some of) ../questionlib.php.
+ *
+ * @copyright  2006 The Open University
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class questionlib_test extends UnitTestCase {

    public static $includecoverage = array('lib/questionlib.php');

-    function test_question_reorder_qtypes() {
-        $this->assertEqual(question_reorder_qtypes(array('t1' => '', 't2' => '', 't3' => ''), 't1', +1),
+    public function test_question_reorder_qtypes() {
+        $this->assertEqual(question_reorder_qtypes(
+                array('t1' => '', 't2' => '', 't3' => ''), 't1', +1),
                array(0 => 't2', 1 => 't1', 2 => 't3'));
-        $this->assertEqual(question_reorder_qtypes(array('t1' => '', 't2' => '', 't3' => ''), 't1', -1),
+        $this->assertEqual(question_reorder_qtypes(
+                array('t1' => '', 't2' => '', 't3' => ''), 't1', -1),
                array(0 => 't1', 1 => 't2', 2 => 't3'));
-        $this->assertEqual(question_reorder_qtypes(array('t1' => '', 't2' => '', 't3' => ''), 't2', -1),
+        $this->assertEqual(question_reorder_qtypes(
+                array('t1' => '', 't2' => '', 't3' => ''), 't2', -1),
                array(0 => 't2', 1 => 't1', 2 => 't3'));
-        $this->assertEqual(question_reorder_qtypes(array('t1' => '', 't2' => '', 't3' => ''), 't3', +1),
+        $this->assertEqual(question_reorder_qtypes(
+                array('t1' => '', 't2' => '', 't3' => ''), 't3', +1),
                array(0 => 't1', 1 => 't2', 2 => 't3'));
-        $this->assertEqual(question_reorder_qtypes(array('t1' => '', 't2' => '', 't3' => ''), 'missing', +1),
+        $this->assertEqual(question_reorder_qtypes(
+                array('t1' => '', 't2' => '', 't3' => ''), 'missing', +1),
                array(0 => 't1', 1 => 't2', 2 => 't3'));
    }

 }
-
-
--- a/question/addquestion.php
+++ b/question/addquestion.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/adaptive/behaviour.php
+++ b/question/behaviour/adaptive/behaviour.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/adaptive/lang/en/qbehaviour_adaptive.php
+++ b/question/behaviour/adaptive/lang/en/qbehaviour_adaptive.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/adaptive/renderer.php
+++ b/question/behaviour/adaptive/renderer.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/adaptive/simpletest/testwalkthrough.php
+++ b/question/behaviour/adaptive/simpletest/testwalkthrough.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/adaptivenopenalty/behaviour.php
+++ b/question/behaviour/adaptivenopenalty/behaviour.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/adaptivenopenalty/lang/en/qbehaviour_adaptivenopenalty.php
+++ b/question/behaviour/adaptivenopenalty/lang/en/qbehaviour_adaptivenopenalty.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/adaptivenopenalty/renderer.php
+++ b/question/behaviour/adaptivenopenalty/renderer.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/adaptivenopenalty/simpletest/testwalkthrough.php
+++ b/question/behaviour/adaptivenopenalty/simpletest/testwalkthrough.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/behaviourbase.php
+++ b/question/behaviour/behaviourbase.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/deferredcbm/behaviour.php
+++ b/question/behaviour/deferredcbm/behaviour.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/deferredcbm/lang/en/qbehaviour_deferredcbm.php
+++ b/question/behaviour/deferredcbm/lang/en/qbehaviour_deferredcbm.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/deferredcbm/renderer.php
+++ b/question/behaviour/deferredcbm/renderer.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/deferredcbm/simpletest/testwalkthrough.php
+++ b/question/behaviour/deferredcbm/simpletest/testwalkthrough.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/deferredfeedback/behaviour.php
+++ b/question/behaviour/deferredfeedback/behaviour.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/deferredfeedback/lang/en/qbehaviour_deferredfeedback.php
+++ b/question/behaviour/deferredfeedback/lang/en/qbehaviour_deferredfeedback.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/deferredfeedback/renderer.php
+++ b/question/behaviour/deferredfeedback/renderer.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify

--- a/question/behaviour/deferredfeedback/simpletest/testwalkthrough.php
+++ b/question/behaviour/deferredfeedback/simpletest/testwalkthrough.php
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify