Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220933
Change subject: Remove extension initialization from autoloader.
......................................................................
Remove extension initialization from autoloader.
These need to be separate, so that one can have a combined composer autoloader
in Mediawiki and still be able to have extensions disabled.
Bug: T100813
Change-Id: I74dab0e5c1dc9294c0dba6a13fdc45d57681f433
(cherry picked from commit f43c553d7e9e116ee4272156281f8e76e13fd2b3)
---
D Wikibase.composer.php
M Wikibase.php
M composer.json
3 files changed, 7 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/33/220933/1
diff --git a/Wikibase.composer.php b/Wikibase.composer.php
deleted file mode 100644
index ec45160..0000000
--- a/Wikibase.composer.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// Component loader for Composer.
-// This entry point is not to be used by anything else then Composer.
-// It might well be removed at a future point.
-
-// Config:
-// wgEnableWikibaseRepo - defaults to true
-// wgEnableWikibaseClient - defaults to true
-
-if ( !array_key_exists( 'wgEnableWikibaseRepo', $GLOBALS ) ||
$GLOBALS['wgEnableWikibaseRepo'] ) {
- require_once __DIR__ . '/repo/Wikibase.php';
-}
-
-if ( !array_key_exists( 'wgEnableWikibaseClient', $GLOBALS ) ||
$GLOBALS['wgEnableWikibaseClient'] ) {
- require_once __DIR__ . '/client/WikibaseClient.php';
-}
diff --git a/Wikibase.php b/Wikibase.php
index bd5b7eb..f449ed0 100644
--- a/Wikibase.php
+++ b/Wikibase.php
@@ -30,9 +30,11 @@
* @licence GNU GPL v2+
*/
-//TODO: Use a different file for jenkins, use this for a standard repo+client
setup.
-
-if ( !isset( $wgWikimediaJenkinsCI ) || !$wgWikimediaJenkinsCI ) {
- die( "This entry point is for use by the Jenkins testing framework
only.\n"
- . "Use repo/Wikibase.php resp. client/WikibaseClient.php
instead.\n" );
+if ( !array_key_exists( 'wgEnableWikibaseRepo', $GLOBALS ) ||
$GLOBALS['wgEnableWikibaseRepo'] ) {
+ require_once __DIR__ . '/repo/Wikibase.php';
}
+
+if ( !array_key_exists( 'wgEnableWikibaseClient', $GLOBALS ) ||
$GLOBALS['wgEnableWikibaseClient'] ) {
+ require_once __DIR__ . '/client/WikibaseClient.php';
+}
+
diff --git a/composer.json b/composer.json
index 34dc598..ee01bbe 100644
--- a/composer.json
+++ b/composer.json
@@ -51,9 +51,6 @@
"mediawiki/mediawiki": "<1.23"
},
"autoload": {
- "files" : [
- "Wikibase.composer.php"
- ],
"classmap": [
"client/includes/",
"client/WikibaseClient.hooks.php",
--
To view, visit https://gerrit.wikimedia.org/r/220933
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74dab0e5c1dc9294c0dba6a13fdc45d57681f433
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
