dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Minor code updates to SpecialListgrouprights"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
autoload.ide.php
diff --git
a/tests/phpunit/autoload.ide.php
b/tests/phpunit/autoload.ide.php
index
074fab0
..
6f09d4c
100644
(file)
--- a/
tests/phpunit/autoload.ide.php
+++ b/
tests/phpunit/autoload.ide.php
@@
-38,16
+38,13
@@
$maintenance->setup();
// to $maintenance->mSelf. Keep that here for b/c
$self = $maintenance->getName();
global $IP;
// to $maintenance->mSelf. Keep that here for b/c
$self = $maintenance->getName();
global $IP;
-# Start the autoloader, so that extensions can derive classes from core files
-require_once "$IP/includes/AutoLoader.php";
-# Grab profiling functions
-require_once "$IP/includes/profiler/ProfilerFunctions.php";
-
-# Start the profiler
+# Get profiler configuraton
$wgProfiler = [];
if ( file_exists( "$IP/StartProfiler.php" ) ) {
require "$IP/StartProfiler.php";
}
$wgProfiler = [];
if ( file_exists( "$IP/StartProfiler.php" ) ) {
require "$IP/StartProfiler.php";
}
+# Start the autoloader, so that extensions can derive classes from core files
+require_once "$IP/includes/AutoLoader.php";
$requireOnceGlobalsScope = function ( $file ) use ( $self ) {
foreach ( array_keys( $GLOBALS ) as $varName ) {
$requireOnceGlobalsScope = function ( $file ) use ( $self ) {
foreach ( array_keys( $GLOBALS ) as $varName ) {
@@
-86,9
+83,12
@@
if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
}
if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
}
if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
- if ( $wgLocalisationCacheConf['storeClass'] === false
- && ( $wgLocalisationCacheConf['store'] == 'db'
- || ( $wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory ) )
+ if (
+ $wgLocalisationCacheConf['storeClass'] === false
+ && (
+ $wgLocalisationCacheConf['store'] == 'db'
+ || ( $wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory )
+ )
) {
$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
}
) {
$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
}