Seb35 has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344781 )
Change subject: Fix bug when a mwcomposer was used but no Composer-managed
extension is activated
......................................................................
Fix bug when a mwcomposer was used but no Composer-managed extension is
activated
When mwcomposer was used (hence a special vendor/autoload.php is installed) and
when no Composer-managed extension is activated, no Composer libraries is loaded
and MediaWiki is obviously complaining because there is no PSR-3 library.
The fix is simply to check if there are Composer-managed extensions activated
and else use the minimal Composer autoloader.
Change-Id: I3cf5e2826a92c0f27226621ca0259901299c65e3
---
M src/MediaWikiFarmComposerAutoloader.php
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Seb35: Verified; Looks good to me, approved
diff --git a/src/MediaWikiFarmComposerAutoloader.php
b/src/MediaWikiFarmComposerAutoloader.php
index a6edfda..a279da5 100644
--- a/src/MediaWikiFarmComposerAutoloader.php
+++ b/src/MediaWikiFarmComposerAutoloader.php
@@ -6,14 +6,17 @@
// @codeCoverageIgnoreStart
if( array_key_exists( 'wgMediaWikiFarm', $GLOBALS ) ) {
$extensions = $GLOBALS['wgMediaWikiFarm']->getConfiguration( 'composer'
);
- foreach( $extensions as $extension ) {
+ if( count( $extensions ) > 0 ) {
+ foreach( $extensions as $extension ) {
- require_once __DIR__ . '/composer' . substr( md5( $extension ),
0, 8 ) . '/autoload_real.php';
- call_user_func( array( 'ComposerAutoloaderInit' . substr( md5(
$extension ), 0, 8 ), 'getLoader' ) );
+ require_once __DIR__ . '/composer' . substr( md5(
$extension ), 0, 8 ) . '/autoload_real.php';
+ call_user_func( array( 'ComposerAutoloaderInit' .
substr( md5( $extension ), 0, 8 ), 'getLoader' ) );
+ }
+ unset( $extensions );
+ unset( $extension );
+ return;
}
unset( $extensions );
- unset( $extension );
- return;
}
require_once __DIR__ . '/composer' . '/autoload_real.php';
--
To view, visit https://gerrit.wikimedia.org/r/344781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cf5e2826a92c0f27226621ca0259901299c65e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Seb35 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
