jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/373174 )
Change subject: Split common pre-setup code out of WebStart/doMaintenance ...................................................................... Split common pre-setup code out of WebStart/doMaintenance 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 --- A includes/PreConfigSetup.php M includes/WebStart.php M maintenance/doMaintenance.php 3 files changed, 56 insertions(+), 45 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/PreConfigSetup.php b/includes/PreConfigSetup.php new file mode 100644 index 0000000..bda7886 --- /dev/null +++ b/includes/PreConfigSetup.php @@ -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"; +} diff --git a/includes/WebStart.php b/includes/WebStart.php index e281b6f..8a58e6f 100644 --- a/includes/WebStart.php +++ b/includes/WebStart.php @@ -59,31 +59,7 @@ $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 diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index 53a317a..e87e024 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -55,26 +55,7 @@ // 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 -- To view, visit https://gerrit.wikimedia.org/r/373174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44ac69b6b00a51d015546b9766d89d1c59749334 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
