Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split common pre-setup code out of WebStart/doMaintenance

Browse source 
Introduce PreConfigSetup.php, which is common file-scope code run before
LocalSettings.php.

I'm not maintaining autoload.ide.php since it supports closed source
software which I don't have, and it apparently needs significant work to
make it not be weird and hacky.

Change-Id: I44ac69b6b00a51d015546b9766d89d1c59749334
This commit is contained in:
Tim Starling 2017-08-23 12:21:14 +10:00
parent c2dcf52c3c
commit 41ea7e2fef
3 changed files with 56 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
includes/PreConfigSetup.php Normal file
View file

@ -0,0 +1,54 @@
<?php
/**
* File-scope setup actions, loaded before LocalSettings.php, shared by
* WebStart.php and doMaintenance.php
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
*
* @file
*/
if ( !defined( 'MEDIAWIKI' ) ) {
// Not an entry point
exit( 1 );
}
// Grab profiling functions
require_once "$IP/includes/profiler/ProfilerFunctions.php";
// Start the autoloader, so that extensions can derive classes from core files
require_once "$IP/includes/AutoLoader.php";
// Load up some global defines.
require_once "$IP/includes/Defines.php";
// Start the profiler
$wgProfiler = [];
if ( file_exists( "$IP/StartProfiler.php" ) ) {
require "$IP/StartProfiler.php";
}
// Load default settings
require_once "$IP/includes/DefaultSettings.php";
// Load global functions
require_once "$IP/includes/GlobalFunctions.php";
// Load composer's autoloader if present
if ( is_readable( "$IP/vendor/autoload.php" ) ) {
require_once "$IP/vendor/autoload.php";
}

26
includes/WebStart.php
View file

@ -59,31 +59,7 @@ if ( $IP === false ) {
$IP = realpath( '.' ) ?: dirname( __DIR__ );
}
# Grab profiling functions
require_once "$IP/includes/profiler/ProfilerFunctions.php";
# Start the autoloader, so that extensions can derive classes from core files
require_once "$IP/includes/AutoLoader.php";
# Load up some global defines.
require_once "$IP/includes/Defines.php";
# Start the profiler
$wgProfiler = [];
if ( file_exists( "$IP/StartProfiler.php" ) ) {
require "$IP/StartProfiler.php";
}
# Load default settings
require_once "$IP/includes/DefaultSettings.php";
# Load global functions
require_once "$IP/includes/GlobalFunctions.php";
# Load composer's autoloader if present
if ( is_readable( "$IP/vendor/autoload.php" ) ) {
require_once "$IP/vendor/autoload.php";
}
require_once "$IP/includes/PreConfigSetup.php";
# Assert that composer dependencies were successfully loaded
# Purposely no leading \ due to it breaking HHVM RepoAuthorative mode

21
maintenance/doMaintenance.php
View file

@ -55,26 +55,7 @@ $maintenance->setup();
// to $maintenance->mSelf. Keep that here for b/c
$self = $maintenance->getName();
# 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
$wgProfiler = [];
if ( file_exists( "$IP/StartProfiler.php" ) ) {
require "$IP/StartProfiler.php";
}
// Some other requires
require_once "$IP/includes/Defines.php";
require_once "$IP/includes/DefaultSettings.php";
require_once "$IP/includes/GlobalFunctions.php";
# Load composer's autoloader if present
if ( is_readable( "$IP/vendor/autoload.php" ) ) {
require_once "$IP/vendor/autoload.php";
}
require_once "$IP/includes/PreConfigSetup.php";
if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
# Use a callback function to configure MediaWiki