* use require_once for ProfilerStub.php, GlobalFunctions.php and Hooks.php, these...

* always use the complete path (with $IP) when loading files with require(_once)
* include AutoLoader before LocalSettings.php as we do in WebStart.php
* don't load DefaultSettings.php, it's already done by LocalSettings.php
* define MW_PHPUNIT_TEST constant
* added a description for the file

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index dfdf3d3..1023f06 100644 (file)
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,16 +1,24 @@
 <?php
 
+/**
+ * Set up the MediaWiki environment when running tests with "phpunit" command
+ *
+ * Warning: this file is not included from global scope!
+ * @file
+ */
+
 global $wgCommandLineMode, $IP;
 $wgCommandLineMode = true;
 $IP = dirname( dirname( __FILE__ ) );
-define('MEDIAWIKI', 1);
+
+define( 'MEDIAWIKI', true );
+define( 'MW_PHPUNIT_TEST', true );
 ini_set( 'include_path', "$IP:" .ini_get( 'include_path' ) );
 
-require ( "$IP/includes/Defines.php" );
-require ( "$IP/includes/DefaultSettings.php" );
-require ( "$IP/LocalSettings.php" );
+require "$IP/includes/Defines.php";
+require "$IP/includes/AutoLoader.php";
+require "$IP/LocalSettings.php";
 
-require 'ProfilerStub.php';
-require 'GlobalFunctions.php';
-require 'Hooks.php';
-require 'AutoLoader.php';
+require_once "$IP/includes/ProfilerStub.php";
+require_once "$IP/includes/GlobalFunctions.php";
+require_once "$IP/includes/Hooks.php";