jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/335789 )
Change subject: Fix bug when autoloading Composer without MediaWikiFarm
......................................................................
Fix bug when autoloading Composer without MediaWikiFarm
Sometimes MediaWiki loads Composer’s autoloader but MediaWikiFarm is
not called through, e.g. when one directly call /mw-config/index.php
(although there could be a MediaWikiFarm wrapper, to be decided); in
these cases the object MediaWikiFarm does not exist and Composer’s
autoloader is crashing, so check if MediaWikiFarm object exists.
Change-Id: I8713c896e0255480a564932bb225ef2506eab0c1
---
M src/MediaWikiFarmComposerAutoloader.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Seb35: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/MediaWikiFarmComposerAutoloader.php
b/src/MediaWikiFarmComposerAutoloader.php
index cd58e20..41a8752 100644
--- a/src/MediaWikiFarmComposerAutoloader.php
+++ b/src/MediaWikiFarmComposerAutoloader.php
@@ -3,9 +3,8 @@
// autoload.php @generated by MediaWikiFarm
// @codeCoverageIgnoreStart
-$extensions = $GLOBALS['wgMediaWikiFarm']->getConfiguration( 'composer' );
-
-if( count( $extensions ) ) {
+if( array_key_exists( 'wgMediaWikiFarm', $GLOBALS ) ) {
+ $extensions = $GLOBALS['wgMediaWikiFarm']->getConfiguration( 'composer'
);
foreach( $extensions as $extension ) {
require_once __DIR__ . '/composer' . substr( md5( $extension ),
0, 8 ) . '/autoload_real.php';
@@ -15,7 +14,6 @@
unset( $extension );
return;
}
-unset( $extensions );
require_once __DIR__ . '/composer' . '/autoload_real.php';
ComposerAutoloaderInitDEFAULT::getLoader();
--
To view, visit https://gerrit.wikimedia.org/r/335789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8713c896e0255480a564932bb225ef2506eab0c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 <se...@seb35.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Seb35 <se...@seb35.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
