jenkins-bot has submitted this change and it was merged. Change subject: Add extension.json, empty php entry point ......................................................................
Add extension.json, empty php entry point Bug: T110266 Change-Id: I3115d4bef6cc2af61275cb6e39f47247dad8a3c6 --- M ApiFeatureUsage.php A extension.json 2 files changed, 67 insertions(+), 45 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/ApiFeatureUsage.php b/ApiFeatureUsage.php index fb77678..8e004cd 100644 --- a/ApiFeatureUsage.php +++ b/ApiFeatureUsage.php @@ -21,48 +21,16 @@ * http://www.gnu.org/copyleft/gpl.html */ -$wgExtensionCredits['specialpage'][] = array( - 'path' => __FILE__, - 'name' => 'ApiFeatureUsage', - 'author' => 'Brad Jorsch', - 'url' => 'https://www.mediawiki.org/wiki/Extension:ApiFeatureUsage', - 'descriptionmsg' => 'apifeatureusage-desc', - 'version' => '1.0', - 'license-name' => 'GPL-2.0+', -); - -$wgAutoloadClasses['SpecialApiFeatureUsage'] = __DIR__ . '/SpecialApiFeatureUsage.php'; -$wgAutoloadClasses['ApiQueryFeatureUsage'] = __DIR__ . '/ApiQueryFeatureUsage.php'; -$wgAutoloadClasses['ApiFeatureUsageQueryEngine'] = __DIR__ . '/ApiFeatureUsageQueryEngine.php'; -$wgAutoloadClasses['ApiFeatureUsageQueryEngineElastica'] = __DIR__ . '/ApiFeatureUsageQueryEngineElastica.php'; -$wgAutoloadClasses['ApiFeatureUsageQueryEngineElasticaConnection'] = __DIR__ . '/ApiFeatureUsageQueryEngineElastica.php'; - -$wgMessagesDirs['ApiFeatureUsage'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['ApiFeatureUsageAlias'] = __DIR__ . '/ApiFeatureUsage.alias.php'; -$wgSpecialPages['ApiFeatureUsage'] = 'SpecialApiFeatureUsage'; -$wgAPIMetaModules['featureusage'] = 'ApiQueryFeatureUsage'; -$wgConfigRegistry['ApiFeatureUsage'] = 'GlobalVarConfig::newInstance'; - -$wgResourceModules['ext.apifeatureusage'] = array( - 'localBasePath' => __DIR__ . '/modules', - 'remoteExtPath' => 'ApiFeatureUsage/modules', - 'styles' => 'ext.apifeatureusage.css', - 'position' => 'top', -); - -/** - * Engine configuration. Must contain either a 'class' or a 'factory' member; - * other members depend on the engine. - */ -$wgApiFeatureUsageQueryEngineConf = array(); - -/** - * @todo HTMLForm stuff should be migrated to core - */ -$wgAutoloadClasses['ApiFeatureUsage_HTMLDateField'] = __DIR__ . '/htmlform/HTMLDateField.php'; -$wgAutoloadClasses['ApiFeatureUsage_HTMLDateRangeField'] = __DIR__ . '/htmlform/HTMLDateRangeField.php'; -$wgResourceModules['ext.apifeatureusage.htmlform'] = array( - 'localBasePath' => __DIR__ . '/htmlform', - 'remoteExtPath' => 'ApiFeatureUsage/htmlform', - 'scripts' => 'ext.apifeatureusage.htmlform.js', -); +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'ApiFeatureUsage' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['ApiFeatureUsage'] = __DIR__ . '/i18n'; + $wgExtensionMessagesFiles['ApiFeatureUsageAlias'] = __DIR__ . '/ApiFeatureUsage.alias.php'; + /* wfWarn( + 'Deprecated PHP entry point used for ApiFeatureUsage extension. Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); */ + return; +} else { + die( 'This version of the ApiFeatureUsage extension requires MediaWiki 1.25+' ); +} diff --git a/extension.json b/extension.json new file mode 100644 index 0000000..705d6a5 --- /dev/null +++ b/extension.json @@ -0,0 +1,54 @@ +{ + "name": "ApiFeatureUsage", + "version": "1.0", + "author": "Brad Jorsch", + "url": "https://www.mediawiki.org/wiki/Extension:ApiFeatureUsage", + "descriptionmsg": "apifeatureusage-desc", + "license-name": "GPL-2.0+", + "type": "specialpage", + "ConfigRegistry": { + "ApiFeatureUsage": "GlobalVarConfig::newInstance" + }, + "SpecialPages": { + "ApiFeatureUsage": "SpecialApiFeatureUsage" + }, + "APIMetaModules": { + "featureusage": "ApiQueryFeatureUsage" + }, + "MessagesDirs": { + "ApiFeatureUsage": [ + "i18n" + ] + }, + "ExtensionMessagesFiles": { + "ApiFeatureUsageAlias": "ApiFeatureUsage.alias.php" + }, + "AutoloadClasses": { + "SpecialApiFeatureUsage": "SpecialApiFeatureUsage.php", + "ApiQueryFeatureUsage": "ApiQueryFeatureUsage.php", + "ApiFeatureUsageQueryEngine": "ApiFeatureUsageQueryEngine.php", + "ApiFeatureUsageQueryEngineElastica": "ApiFeatureUsageQueryEngineElastica.php", + "ApiFeatureUsageQueryEngineElasticaConnection": "ApiFeatureUsageQueryEngineElastica.php", + "ApiFeatureUsage_HTMLDateField": "htmlform/HTMLDateField.php", + "ApiFeatureUsage_HTMLDateRangeField": "htmlform/HTMLDateRangeField.php" + }, + "ResourceModules": { + "ext.apifeatureusage": { + "styles": "ext.apifeatureusage.css", + "position": "top" + }, + "ext.apifeatureusage.htmlform": { + "localBasePath": "htmlform", + "remoteExtPath": "ApiFeatureUsage/htmlform", + "scripts": "ext.apifeatureusage.htmlform.js" + } + }, + "ResourceFileModulePaths": { + "localBasePath": "modules", + "remoteExtPath": "ApiFeatureUsage/modules" + }, + "config": { + "ApiFeatureUsageQueryEngineConf": [] + }, + "manifest_version": 1 +} -- To view, visit https://gerrit.wikimedia.org/r/247802 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3115d4bef6cc2af61275cb6e39f47247dad8a3c6 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/ApiFeatureUsage Gerrit-Branch: master Gerrit-Owner: Paladox <[email protected]> Gerrit-Reviewer: Anomie <[email protected]> Gerrit-Reviewer: Devirk <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
