wikimedia/mediawiki-extensions-WikiEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiEditor synced 2024-11-30 11:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert making installable via composer (and add composer test entry point)

Browse source 
This reverts b8abb9b5f2 (a self-merged "experiment") and
1bb0ea4f76 (Convert entry point to use explicit globals).

The maintainers of this extension do not plan on supporting installation
via composer. This functionality was never included in a stable release
branch, and should not break anyone sticking to stable
branches.

Once merged, I can remove the package from packagist.org

The composer.json is now used to add a "composer test" entry point to run
PHPCS, which this extension badly needs.

Change-Id: I2f3db6addd883d94366a696d5185bf05b2695b11
This commit is contained in:
Kunal Mehta 2015-03-15 17:51:32 -07:00
parent 2c3fe04ce1
commit 11781784de
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
WikiEditor.php
View file

@ -16,7 +16,7 @@
/* Configuration */
// Each module may be configured individually to be globally on/off or user preference based
$GLOBALS['wgWikiEditorFeatures'] = array(
$wgWikiEditorFeatures = array(
/* Textarea / i-frame compatible (OK to deploy) */
@ -36,7 +36,7 @@ $GLOBALS['wgWikiEditorFeatures'] = array(
/* Setup */
$GLOBALS['wgExtensionCredits']['other'][] = array(
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'WikiEditor',
'author' => array( 'Trevor Parscal', 'Roan Kattouw', 'Nimish Gautam', 'Adam Miller' ),
@ -44,21 +44,21 @@ $GLOBALS['wgExtensionCredits']['other'][] = array(
'url' => 'https://www.mediawiki.org/wiki/Extension:WikiEditor',
'descriptionmsg' => 'wikieditor-desc',
);
$GLOBALS['wgAutoloadClasses']['WikiEditorHooks'] = __DIR__ . '/WikiEditor.hooks.php';
$GLOBALS['wgMessagesDirs']['WikiEditor'] = __DIR__ . '/i18n';
$GLOBALS['wgExtensionMessagesFiles']['WikiEditor'] = __DIR__ . '/WikiEditor.i18n.php';
$GLOBALS['wgHooks']['EditPage::showEditForm:initial'][] =
$wgAutoloadClasses['WikiEditorHooks'] = __DIR__ . '/WikiEditor.hooks.php';
$wgMessagesDirs['WikiEditor'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['WikiEditor'] = __DIR__ . '/WikiEditor.i18n.php';
$wgHooks['EditPage::showEditForm:initial'][] =
'WikiEditorHooks::editPageShowEditFormInitial';
$GLOBALS['wgHooks']['GetPreferences'][] = 'WikiEditorHooks::getPreferences';
$GLOBALS['wgHooks']['ResourceLoaderGetConfigVars'][] =
$wgHooks['GetPreferences'][] = 'WikiEditorHooks::getPreferences';
$wgHooks['ResourceLoaderGetConfigVars'][] =
'WikiEditorHooks::resourceLoaderGetConfigVars';
$GLOBALS['wgHooks']['ResourceLoaderTestModules'][] = 'WikiEditorHooks::resourceLoaderTestModules';
$GLOBALS['wgHooks']['MakeGlobalVariablesScript'][] = 'WikiEditorHooks::makeGlobalVariablesScript';
$GLOBALS['wgHooks']['EditPageBeforeEditToolbar'][] = 'WikiEditorHooks::EditPageBeforeEditToolbar';
$GLOBALS['wgHooks']['EditPage::showEditForm:fields'][] = 'WikiEditorHooks::editPageShowEditFormFields';
$GLOBALS['wgHooks']['BeforePageDisplay'][] = 'WikiEditorHooks::onBeforePageDisplay';
$GLOBALS['wgHooks']['EditPage::attemptSave'][] = 'WikiEditorHooks::editPageAttemptSave';
$GLOBALS['wgHooks']['EditPage::attemptSave:after'][] = 'WikiEditorHooks::editPageAttemptSaveAfter';
$wgHooks['ResourceLoaderTestModules'][] = 'WikiEditorHooks::resourceLoaderTestModules';
$wgHooks['MakeGlobalVariablesScript'][] = 'WikiEditorHooks::makeGlobalVariablesScript';
$wgHooks['EditPageBeforeEditToolbar'][] = 'WikiEditorHooks::EditPageBeforeEditToolbar';
$wgHooks['EditPage::showEditForm:fields'][] = 'WikiEditorHooks::editPageShowEditFormFields';
$wgHooks['BeforePageDisplay'][] = 'WikiEditorHooks::onBeforePageDisplay';
$wgHooks['EditPage::attemptSave'][] = 'WikiEditorHooks::editPageAttemptSave';
$wgHooks['EditPage::attemptSave:after'][] = 'WikiEditorHooks::editPageAttemptSaveAfter';
$wikiEditorTpl = array(
'localBasePath' => __DIR__ . '/modules',
@ -66,7 +66,7 @@ $wikiEditorTpl = array(
'group' => 'ext.wikiEditor',
);
$GLOBALS['wgResourceModules'] += array(
$wgResourceModules += array(
/* WikiEditor jQuery plugin Resources */

17
composer.json
View file

@ -1,11 +1,12 @@
{
"name": "mediawiki/wiki-editor",
"type": "mediawiki-extension",
"description": "WikiEditor is an extendable framework with a set of feature-based modules that improve the user experience of editing.",
"homepage": "http://www.mediawiki.org/wiki/Extension:WikiEditor",
"license" : "GPL-2.0",
"require": {
"composer/installers" : "*"
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.8.0",
"mediawiki/mediawiki-codesniffer": "0.1.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
"phpcs --standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --extensions=php,php5,inc --ignore=vendor -p ."
]
}
}