http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61087
Revision: 61087
Author: ialex
Date: 2010-01-15 16:55:00 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
* use require_once for ProfilerStub.php, GlobalFunctions.php and Hooks.php,
these files might already be loaded when reaching this point
* 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
Modified Paths:
--------------
trunk/phase3/tests/bootstrap.php
Modified: trunk/phase3/tests/bootstrap.php
===================================================================
--- trunk/phase3/tests/bootstrap.php 2010-01-15 15:52:00 UTC (rev 61086)
+++ trunk/phase3/tests/bootstrap.php 2010-01-15 16:55:00 UTC (rev 61087)
@@ -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";
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
