Revert "Consolidate parts of WebStart.php and doMaintenance.php into Initialize.php"

Good idea, but moves things about too much and will break things. Let's revisit and not break things.

This reverts commit 214931ed33124a36e01e105c41c7d7e4797bde82.

Change-Id: I6f5026b572105cd9e7d6de12a491c7ee45ac3dbc

diff --git a/includes/Initialize.php b/includes/Initialize.php
deleted file mode 100644 (file)
index 4bc63f4..0000000
--- a/includes/Initialize.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Helper file to initialize the rest of MediaWiki.
- *
- * 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
- */
-// Valid web server entry point, enable includes.
-// Please don't move this line to includes/Defines.php. This line essentially
-// defines a valid entry point. If you put it in includes/Defines.php, then
-// any script that includes it becomes an entry point, thereby defeating
-// its purpose.
-define( 'MEDIAWIKI', true );
-
-$wgRequestTime = microtime( true );
-
-// Start the autoloader, so that extensions can derive classes from core files
-require_once "$IP/includes/AutoLoader.php";
-// Load composer's autoloader if present
-if ( is_readable( "$IP/vendor/autoload.php" ) ) {
-       require_once "$IP/vendor/autoload.php";
-}
-
-// Load the profiler
-require_once "$IP/includes/profiler/Profiler.php";
-// Start the profiler
-$wgProfiler = array();
-if ( file_exists( "$IP/StartProfiler.php" ) ) {
-       require "$IP/StartProfiler.php";
-}
-
-// Load up some global defines.
-require_once "$IP/includes/Defines.php";
-// Load default settings
-require_once "$IP/includes/DefaultSettings.php";

diff --git a/includes/WebStart.php b/includes/WebStart.php
index 84a9ae6..e137628 100644 (file)
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -1,7 +1,12 @@
 <?php
 /**
- * This does the initial set up for a web request, including a few
- * security checks and loading the initializer.
+ * This does the initial set up for a web request.
+ * It does some security checks, starts the profiler and loads the
+ * configuration, and optionally loads Setup.php depending on whether
+ * MW_NO_SETUP is defined.
+ *
+ * Setup.php (if loaded) then sets up GlobalFunctions, the AutoLoader,
+ * and the configuration globals (though not $wgTitle).
  *
  * 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
@@ -34,10 +39,18 @@ if ( ini_get( 'register_globals' ) ) {
 # points and when $wgOut gets disabled or overridden.
 header( 'X-Content-Type-Options: nosniff' );
 
+$wgRequestTime = microtime( true );
 # getrusage() does not exist on the Microsoft Windows platforms, catching this
 $wgRUstart = function_exists( 'getrusage' ) ? getrusage() : array();
 unset( $IP );
 
+# Valid web server entry point, enable includes.
+# Please don't move this line to includes/Defines.php. This line essentially
+# defines a valid entry point. If you put it in includes/Defines.php, then
+# any script that includes it becomes an entry point, thereby defeating
+# its purpose.
+define( 'MEDIAWIKI', true );
+
 # Full path to working directory.
 # Makes it possible to for example to have effective exclude path in apc.
 # __DIR__ breaks symlinked includes, but realpath() returns false
@@ -47,10 +60,31 @@ if ( $IP === false ) {
        $IP = realpath( '.' ) ?: dirname( __DIR__ );
 }
 
-require_once "$IP/includes/Initialize.php";
+# Start the autoloader, so that extensions can derive classes from core files
+require_once "$IP/includes/AutoLoader.php";
+
+# Load the profiler
+require_once "$IP/includes/profiler/Profiler.php";
+
+# Load up some global defines.
+require_once "$IP/includes/Defines.php";
+
+# Start the profiler
+$wgProfiler = array();
+if ( file_exists( "$IP/StartProfiler.php" ) ) {
+       require "$IP/StartProfiler.php";
+}
 
 wfProfileIn( 'WebStart.php-conf' );
 
+# Load default settings
+require_once "$IP/includes/DefaultSettings.php";
+
+# Load composer's autoloader if present
+if ( is_readable( "$IP/vendor/autoload.php" ) ) {
+       require_once "$IP/vendor/autoload.php";
+}
+
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # Use a callback function to configure MediaWiki
        call_user_func( MW_CONFIG_CALLBACK );

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 2cc791b..ffb07eb 100644 (file)
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -527,6 +527,11 @@ abstract class Maintenance {
                # But sometimes this doesn't seem to be the case.
                ini_set( 'max_execution_time', 0 );
 
+               $wgRequestTime = microtime( true );
+
+               # Define us as being in MediaWiki
+               define( 'MEDIAWIKI', true );
+
                $wgCommandLineMode = true;
 
                # Turn off output buffering if it's on

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 3ffee10..28a0545 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -53,7 +53,25 @@ $maintenance->setup();
 // to $maintenance->mSelf. Keep that here for b/c
 $self = $maintenance->getName();
 
-require_once "$IP/includes/Initialize.php";
+# Start the autoloader, so that extensions can derive classes from core files
+require_once "$IP/includes/AutoLoader.php";
+# Stub the profiler
+require_once "$IP/includes/profiler/Profiler.php";
+
+# Start the profiler
+$wgProfiler = array();
+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";
+
+# Load composer's autoloader if present
+if ( is_readable( "$IP/vendor/autoload.php" ) ) {
+       require_once "$IP/vendor/autoload.php";
+}
 
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # Use a callback function to configure MediaWiki