From cdbbd26f80975f978b1415c432f48b46d1104181 Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 9 Jun 2007 16:32:36 +0000 Subject: [PATCH] MDL-10064 global $CFG in unit test files is non standard, it is recommended to use MOODLE_INTERNAL test in all library files --- admin/report/simpletest/ex_reporter.php | 5 ++++- admin/report/simpletest/ex_simple_test.php | 5 ++++- group/simpletest/test_basicgrouplib.php | 6 ++++-- group/simpletest/test_groupinglib.php | 6 ++++-- lib/simpletest/fixtures/gradetest.php | 6 ++++-- lib/simpletest/grade/simpletest/testgradecalculation.php | 5 ++++- lib/simpletest/grade/simpletest/testgradecategory.php | 5 ++++- lib/simpletest/grade/simpletest/testgradefinal.php | 5 ++++- lib/simpletest/grade/simpletest/testgradehistory.php | 5 ++++- lib/simpletest/grade/simpletest/testgradeitem.php | 5 ++++- lib/simpletest/grade/simpletest/testgradeoutcome.php | 5 ++++- lib/simpletest/grade/simpletest/testgraderaw.php | 5 ++++- lib/simpletest/grade/simpletest/testgradescale.php | 5 ++++- lib/simpletest/grade/simpletest/testgradetext.php | 5 ++++- lib/simpletest/grade/simpletest/testgradetree.php | 5 ++++- lib/simpletest/slowtestcode.php | 7 +++---- lib/simpletest/testajaxlib.php | 6 +++--- lib/simpletest/testcode.php | 7 +++---- lib/simpletest/testdmllib.php | 6 +++--- lib/simpletest/testeventslib.php | 2 -- lib/simpletest/testgradelib.php | 5 ++++- lib/simpletest/testmathslib.php | 1 - lib/simpletest/testmodforumlib.php | 6 +++--- lib/simpletest/testmoodlelib.php | 6 +++--- lib/simpletest/testweblib.php | 7 +++---- lib/simpletestlib/readme_moodle.txt | 2 +- lib/simpletestlib/test_case.php | 1 + mod/data/simpletest/testpreset.php | 6 +++--- question/type/numerical/simpletest/testquestiontype.php | 6 +++--- 29 files changed, 93 insertions(+), 53 deletions(-) diff --git a/admin/report/simpletest/ex_reporter.php b/admin/report/simpletest/ex_reporter.php index 771ae9b645..eb23fc902f 100644 --- a/admin/report/simpletest/ex_reporter.php +++ b/admin/report/simpletest/ex_reporter.php @@ -9,7 +9,10 @@ * @package SimpleTestEx */ -/** */ +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir . '/simpletestlib/reporter.php'); /** diff --git a/admin/report/simpletest/ex_simple_test.php b/admin/report/simpletest/ex_simple_test.php index b6f85f2fee..c6732e9d4f 100644 --- a/admin/report/simpletest/ex_simple_test.php +++ b/admin/report/simpletest/ex_simple_test.php @@ -10,7 +10,10 @@ * @package SimpleTestEx */ -/** */ +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir . '/simpletestlib/test_case.php'); /** diff --git a/group/simpletest/test_basicgrouplib.php b/group/simpletest/test_basicgrouplib.php index 83dc63ca0a..0a7960bdc9 100644 --- a/group/simpletest/test_basicgrouplib.php +++ b/group/simpletest/test_basicgrouplib.php @@ -11,9 +11,11 @@ * * Window - Preferences - PHPeclipse - PHP - Code Templates */ -require_once(dirname(__FILE__) . '/../../config.php'); -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->dirroot . '/group/lib/basicgrouplib.php'); require_once($CFG->dirroot . '/group/lib/utillib.php'); diff --git a/group/simpletest/test_groupinglib.php b/group/simpletest/test_groupinglib.php index 7fbe6666ab..e52b0227db 100644 --- a/group/simpletest/test_groupinglib.php +++ b/group/simpletest/test_groupinglib.php @@ -7,9 +7,11 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License * @package groups */ -require_once(dirname(__FILE__) . '/../../config.php'); -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->dirroot . '/group/lib/groupinglib.php'); class groupinglib_test extends UnitTestCase { diff --git a/lib/simpletest/fixtures/gradetest.php b/lib/simpletest/fixtures/gradetest.php index 881e18f8b9..edb76cfd58 100644 --- a/lib/simpletest/fixtures/gradetest.php +++ b/lib/simpletest/fixtures/gradetest.php @@ -23,6 +23,10 @@ // // /////////////////////////////////////////////////////////////////////////// +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + /** * Shared code for all grade related tests. * @@ -30,8 +34,6 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License * @package moodlecore */ - -global $CFG; require_once($CFG->libdir . '/gradelib.php'); require_once($CFG->libdir . '/dmllib.php'); require_once($CFG->libdir . '/ddllib.php'); diff --git a/lib/simpletest/grade/simpletest/testgradecalculation.php b/lib/simpletest/grade/simpletest/testgradecalculation.php index f61e50b0aa..1b608b96ae 100644 --- a/lib/simpletest/grade/simpletest/testgradecalculation.php +++ b/lib/simpletest/grade/simpletest/testgradecalculation.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); class grade_calculation_test extends grade_test { diff --git a/lib/simpletest/grade/simpletest/testgradecategory.php b/lib/simpletest/grade/simpletest/testgradecategory.php index 742a67f19a..7454fa9a6f 100755 --- a/lib/simpletest/grade/simpletest/testgradecategory.php +++ b/lib/simpletest/grade/simpletest/testgradecategory.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); class grade_category_test extends grade_test { diff --git a/lib/simpletest/grade/simpletest/testgradefinal.php b/lib/simpletest/grade/simpletest/testgradefinal.php index 9e932ee10e..3488aaa47d 100644 --- a/lib/simpletest/grade/simpletest/testgradefinal.php +++ b/lib/simpletest/grade/simpletest/testgradefinal.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); class grade_final_test extends grade_test { diff --git a/lib/simpletest/grade/simpletest/testgradehistory.php b/lib/simpletest/grade/simpletest/testgradehistory.php index 3d273f1c60..58c1317464 100644 --- a/lib/simpletest/grade/simpletest/testgradehistory.php +++ b/lib/simpletest/grade/simpletest/testgradehistory.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); class grade_history_test extends grade_test { diff --git a/lib/simpletest/grade/simpletest/testgradeitem.php b/lib/simpletest/grade/simpletest/testgradeitem.php index c6d0ee8b2a..fb8857a67d 100755 --- a/lib/simpletest/grade/simpletest/testgradeitem.php +++ b/lib/simpletest/grade/simpletest/testgradeitem.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); @set_time_limit(0); diff --git a/lib/simpletest/grade/simpletest/testgradeoutcome.php b/lib/simpletest/grade/simpletest/testgradeoutcome.php index ace4c891c9..f5882cd43f 100644 --- a/lib/simpletest/grade/simpletest/testgradeoutcome.php +++ b/lib/simpletest/grade/simpletest/testgradeoutcome.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); class grade_outcome_test extends grade_test { diff --git a/lib/simpletest/grade/simpletest/testgraderaw.php b/lib/simpletest/grade/simpletest/testgraderaw.php index a5daf17636..c5f33433bd 100755 --- a/lib/simpletest/grade/simpletest/testgraderaw.php +++ b/lib/simpletest/grade/simpletest/testgraderaw.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +global $CFG;if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); class grade_raw_test extends grade_test { diff --git a/lib/simpletest/grade/simpletest/testgradescale.php b/lib/simpletest/grade/simpletest/testgradescale.php index 4dbe3d34db..c753623c83 100755 --- a/lib/simpletest/grade/simpletest/testgradescale.php +++ b/lib/simpletest/grade/simpletest/testgradescale.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); class grade_scale_test extends grade_test { diff --git a/lib/simpletest/grade/simpletest/testgradetext.php b/lib/simpletest/grade/simpletest/testgradetext.php index 82eba8494f..e22f40aacf 100755 --- a/lib/simpletest/grade/simpletest/testgradetext.php +++ b/lib/simpletest/grade/simpletest/testgradetext.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); class grade_text_test extends grade_test { diff --git a/lib/simpletest/grade/simpletest/testgradetree.php b/lib/simpletest/grade/simpletest/testgradetree.php index 935f330fa7..1d90a5f820 100644 --- a/lib/simpletest/grade/simpletest/testgradetree.php +++ b/lib/simpletest/grade/simpletest/testgradetree.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); class grade_tree_test extends grade_test { diff --git a/lib/simpletest/slowtestcode.php b/lib/simpletest/slowtestcode.php index 2c5867906a..0a5e8bb4bd 100644 --- a/lib/simpletest/slowtestcode.php +++ b/lib/simpletest/slowtestcode.php @@ -8,10 +8,9 @@ * @package SimpleTestEx */ -/** */ -require_once(dirname(__FILE__) . '/../../config.php'); - -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} class slow_code_test extends UnitTestCase { var $php_code_extensions = array('php', 'html', 'php\.inc'); diff --git a/lib/simpletest/testajaxlib.php b/lib/simpletest/testajaxlib.php index 7686138720..2dfe3f0881 100644 --- a/lib/simpletest/testajaxlib.php +++ b/lib/simpletest/testajaxlib.php @@ -32,10 +32,10 @@ * @package moodlecore */ -/** $Id */ -require_once(dirname(__FILE__) . '/../../config.php'); +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} -global $CFG; require_once($CFG->libdir . '/moodlelib.php'); require_once($CFG->libdir . '/ajax/ajaxlib.php'); diff --git a/lib/simpletest/testcode.php b/lib/simpletest/testcode.php index 965e54225b..a39147c9cf 100644 --- a/lib/simpletest/testcode.php +++ b/lib/simpletest/testcode.php @@ -8,10 +8,9 @@ * @package SimpleTestEx */ -/** */ -require_once(dirname(__FILE__) . '/../../config.php'); - -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} class code_test extends UnitTestCase { var $allok = array(); diff --git a/lib/simpletest/testdmllib.php b/lib/simpletest/testdmllib.php index 91eb087586..97ae1b33c8 100644 --- a/lib/simpletest/testdmllib.php +++ b/lib/simpletest/testdmllib.php @@ -8,10 +8,10 @@ * @package moodlecore */ -/** */ -require_once(dirname(__FILE__) . '/../../config.php'); +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} -global $CFG; require_once($CFG->libdir . '/simpletestlib/web_tester.php'); require_once($CFG->libdir . '/dmllib.php'); diff --git a/lib/simpletest/testeventslib.php b/lib/simpletest/testeventslib.php index f6e6f47da0..4934a25a66 100755 --- a/lib/simpletest/testeventslib.php +++ b/lib/simpletest/testeventslib.php @@ -6,8 +6,6 @@ if (!defined('MOODLE_INTERNAL')) { die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page } -global $CFG; - // test handler function function sample_function_handler($eventdata) { static $called = 0; diff --git a/lib/simpletest/testgradelib.php b/lib/simpletest/testgradelib.php index 520b847fb0..ad3027f82f 100644 --- a/lib/simpletest/testgradelib.php +++ b/lib/simpletest/testgradelib.php @@ -31,7 +31,10 @@ * @package moodlecore */ -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} + require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php'); /** diff --git a/lib/simpletest/testmathslib.php b/lib/simpletest/testmathslib.php index 3e34be810e..486bb4d9da 100755 --- a/lib/simpletest/testmathslib.php +++ b/lib/simpletest/testmathslib.php @@ -4,7 +4,6 @@ if (!defined('MOODLE_INTERNAL')) { die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page } -global $CFG; require_once($CFG->libdir . '/mathslib.php'); /** diff --git a/lib/simpletest/testmodforumlib.php b/lib/simpletest/testmodforumlib.php index 7e9e6abfc3..327a561e23 100644 --- a/lib/simpletest/testmodforumlib.php +++ b/lib/simpletest/testmodforumlib.php @@ -33,10 +33,10 @@ * @package moodlecore */ -/** $Id */ -require_once(dirname(__FILE__) . '/../../config.php'); +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} -global $CFG; require_once($CFG->dirroot . '/mod/forum/lib.php'); class modforumlib_test extends UnitTestCase { diff --git a/lib/simpletest/testmoodlelib.php b/lib/simpletest/testmoodlelib.php index 407fb571dc..ca07f6c8c1 100644 --- a/lib/simpletest/testmoodlelib.php +++ b/lib/simpletest/testmoodlelib.php @@ -33,10 +33,10 @@ * @package moodlecore */ -/** $Id */ -require_once(dirname(__FILE__) . '/../../config.php'); +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} -global $CFG; require_once($CFG->libdir . '/moodlelib.php'); class moodlelib_test extends UnitTestCase { diff --git a/lib/simpletest/testweblib.php b/lib/simpletest/testweblib.php index a434e44f5f..68e6d6b22f 100644 --- a/lib/simpletest/testweblib.php +++ b/lib/simpletest/testweblib.php @@ -8,10 +8,9 @@ * @package moodlecore */ -/** */ -require_once(dirname(__FILE__) . '/../../config.php'); - -global $CFG; +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} class web_test extends UnitTestCase { diff --git a/lib/simpletestlib/readme_moodle.txt b/lib/simpletestlib/readme_moodle.txt index 4b5dc8e9f2..d2a28b4e3b 100644 --- a/lib/simpletestlib/readme_moodle.txt +++ b/lib/simpletestlib/readme_moodle.txt @@ -1,7 +1,7 @@ Description of Simpletest 1.0.1beta library import into Moodle Changes: - * none + * test_case.php - added our global $CFG before include() MDL-10064 skodak diff --git a/lib/simpletestlib/test_case.php b/lib/simpletestlib/test_case.php index 62d03493b4..91835a3109 100644 --- a/lib/simpletestlib/test_case.php +++ b/lib/simpletestlib/test_case.php @@ -458,6 +458,7 @@ */ function _requireWithError($file) { $this->_enableErrorReporting(); + global $CFG; // Moodle patch for $CFG global in unit test files include($file); $error = isset($php_errormsg) ? $php_errormsg : false; $this->_disableErrorReporting(); diff --git a/mod/data/simpletest/testpreset.php b/mod/data/simpletest/testpreset.php index 5368db1384..80f0b68dc8 100644 --- a/mod/data/simpletest/testpreset.php +++ b/mod/data/simpletest/testpreset.php @@ -31,10 +31,10 @@ * @package mod_data */ -/** $Id */ -require_once(dirname(__FILE__) . '/../../../config.php'); +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} -global $CFG; require_once($CFG->dirroot . '/mod/data/preset_class.php'); class data_preset_test extends UnitTestCase { diff --git a/question/type/numerical/simpletest/testquestiontype.php b/question/type/numerical/simpletest/testquestiontype.php index 60cc635b85..72731af5fe 100644 --- a/question/type/numerical/simpletest/testquestiontype.php +++ b/question/type/numerical/simpletest/testquestiontype.php @@ -8,10 +8,10 @@ * @package question */ -/** */ -require_once(dirname(__FILE__) . '/../../../../config.php'); +if (!defined('MOODLE_INTERNAL')) { + die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page +} -global $CFG; require_once($CFG->dirroot . '/question/type/numerical/questiontype.php'); class question_numerical_qtype_test extends UnitTestCase { -- 2.39.5