MDL-10064 global $CFG in unit test files is non standard, it is recommended to use...

diff --git a/admin/report/simpletest/ex_reporter.php b/admin/report/simpletest/ex_reporter.php
index 771ae9b645d7fbdeef7a194003a784ce229170b5..eb23fc902f67f8fdb3331c09f79f4cc18fec678f 100644 (file)
--- 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 b6f85f2feeee5d167d2bcb91994ddb12012f00d1..c6732e9d4f04c8054640a638fe96cfc20f88ba3a 100644 (file)
--- 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 83dc63ca0a1e9ab568cfd4ef8b710e3a1409b661..0a7960bdc95c842984ddb88102865662dc6efba9 100644 (file)
--- 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 7fbe6666ab73575322c8d7d1525956bd2f2c3008..e52b0227dba0b3d1961f9b3b0b638c8ec36983a4 100644 (file)
--- 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 881e18f8b97f2bd27435340844b43b89b0815912..edb76cfd584c5773b28f91560ba138982a47506e 100644 (file)
--- 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 f61e50b0aaa4bbb24623dc4209c243ebf2a902e2..1b608b96aec8b3e1cca52100782170052bb103c9 100644 (file)
--- 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 742a67f19afbe785c1002748c5a47b4e5a16c5dc..7454fa9a6f3e254cf4c375121a62560cbcedef29 100755 (executable)
--- 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 9e932ee10e3848809c9bb460cf09b703441c580d..3488aaa47d6c203577c4c3180f9de3753be80625 100644 (file)
--- 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 3d273f1c60023b514f8c1197fe8c1274b7c92517..58c1317464bbbe4a7e082fa975cea73d8a17214e 100644 (file)
--- 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 c6d0ee8b2a3238c1586c6dd78aab40c76d4c9a19..fb8857a67d821f501a9dbacbf34e8f364b2892c7 100755 (executable)
--- a/lib/simpletest/grade/simpletest/testgradeitem.php
+++ b/lib/simpletest/grade/simpletest/testgradeitem.php
@@ -31,7 +31,10 @@
  * @package moodlecore\r
  */\r
 \r
-global $CFG;\r
+if (!defined('MOODLE_INTERNAL')) {\r
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page\r
+}\r
+\r
 require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');\r
 \r
 @set_time_limit(0);\r

diff --git a/lib/simpletest/grade/simpletest/testgradeoutcome.php b/lib/simpletest/grade/simpletest/testgradeoutcome.php
index ace4c891c9060e733a009e42ddd71e7596093b9b..f5882cd43f90fd9c1eea05114285a5b5e57ac6af 100644 (file)
--- 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 a5daf176365dcefb395ba32095a665e35720858b..c5f33433bd848deceb650ef70d382b6367730a7d 100755 (executable)
--- 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 4dbe3d34dba714d1fd1805c1ba5e05beb9ce9f12..c753623c83c2ee7dcb46cee388f7e249aa68dcc6 100755 (executable)
--- 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 82eba8494f09afab2fb29a983fab66af4178bdfa..e22f40aacfbde5ca9b11ec63b9bf329203f03895 100755 (executable)
--- 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 935f330fa715e9dd2071af24fa52dbfd5ce6f66c..1d90a5f820dfa5e9bf2e82be4b0bca268de263d4 100644 (file)
--- 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 2c5867906a22332fbdb2f8b178a9de699db59c3e..0a5e8bb4bd9445ddfaa1e0ac126bbe7431a13283 100644 (file)
--- 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 768613872095049ce81bdc4731f30b4767c6893f..2dfe3f0881c1daabc94c7babb84a89fb34d247e3 100644 (file)
--- 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 965e54225ba0a2dc05a017242c6d18f99913a751..a39147c9cfa5f2e5731c49c4a103dab11d6922b6 100644 (file)
--- 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 91eb087586af6234bad79fc589b3545192466ee7..97ae1b33c8f3dd2926fa9477473971d8951306da 100644 (file)
--- 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 f6e6f47da081909e226fa2bf623866c41b4810fc..4934a25a66d93bcede63e2edb37ea3dab53413b0 100755 (executable)
--- 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 520b847fb02789d9c3e90337cb3e2ae83346681e..ad3027f82f1d0933b7524f6a62c902ba3c4b1390 100644 (file)
--- 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 3e34be810e28d2a361fb85d54d62d3588df84435..486bb4d9da02c5d245d6fea27877d0348a201813 100755 (executable)
--- 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 7e9e6abfc3c39e4c7bd36f51fb83252237f8723a..327a561e2311f18de31ccb559175a611f702b671 100644 (file)
--- 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 407fb571dc542a3b1ca139ed5051e41800f53a3b..ca07f6c8c1ae34bd8360352b8cc0581113d75e2f 100644 (file)
--- 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 a434e44f5fe41ad7d3df6d6c69da3a91f670fc70..68e6d6b22f9913fe0bd3061182c58ef56611575e 100644 (file)
--- 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 4b5dc8e9f2b03bc55dcb842000c9ddeed0905a88..d2a28b4e3bcb2e10884a064ed03211a67274e9e0 100644 (file)
--- 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 62d03493b4e99ab84315e006c58dbc35e8640d62..91835a31096f263d33dcb82d5fdfc7845e167f42 100644 (file)
--- 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 5368db1384622635d9f379096d5a8e8a9a86de73..80f0b68dc88d4397a05319339879401a9cf365f7 100644 (file)
--- 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 60cc635b85b5f2624534868ce2aedf8dd8401b74..72731af5fefd5c1b9bccd7f6f7d4991bf5e3d807 100644 (file)
--- 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 {