wikimedia/mediawiki-extensions-CodeMirror
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror synced 2024-09-23 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add phpcs and make pass

Browse source 
Change-Id: Ibddce88a08cdd59f6f7b60a297e37952c2f01b62
This commit is contained in:
Umherirrender 2017-07-07 20:34:55 +02:00
parent 21d4ae4042
commit d371b61b46
4 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
CodeMirror.hooks.php
View file

@ -23,7 +23,8 @@ class CodeMirrorHooks {
in_array( Action::getActionName( $context ), [ 'edit', 'submit' ] ) &&
$wgCodeMirrorBetaFeature &&
ExtensionRegistry::getInstance()->isLoaded( 'BetaFeatures' ) &&
BetaFeatures::isFeatureEnabled( $context->getUser(), 'codemirror-syntax-highlight' );
BetaFeatures::isFeatureEnabled(
$context->getUser(), 'codemirror-syntax-highlight' );
}
}
@ -35,7 +36,6 @@ class CodeMirrorHooks {
* removed
* @deprecated since version 4.0.0
* @todo Remove usage in MobileFrontend and this function some time later
* @param IContextSource $context
* @return array
*/
public static function getGlobalVariables() {
@ -58,6 +58,7 @@ class CodeMirrorHooks {
// if we already created these variable array, return it
if ( !$config ) {
$contObj = $context->getLanguage();
$registry = ExtensionRegistry::getInstance();
if ( !isset( $wgParser->mFunctionSynonyms ) ) {
$wgParser->initialiseVariables();
@ -66,8 +67,8 @@ class CodeMirrorHooks {
// initialize configuration
$config = [
'pluginModules' => ExtensionRegistry::getInstance()->getAttribute( 'CodeMirrorPluginModules' ),
'tagModes' => ExtensionRegistry::getInstance()->getAttribute( 'CodeMirrorTagModes' ),
'pluginModules' => $registry->getAttribute( 'CodeMirrorPluginModules' ),
'tagModes' => $registry->getAttribute( 'CodeMirrorTagModes' ),
'tags' => array_fill_keys( $wgParser->getTags(), true ),
'doubleUnderscore' => [ [], [] ],
'functionSynonyms' => $wgParser->mFunctionSynonyms,
@ -80,7 +81,8 @@ class CodeMirrorHooks {
if ( isset( $mw[$name] ) ) {
$caseSensitive = array_shift( $mw[$name] ) == 0 ? 0 : 1;
foreach ( $mw[$name] as $n ) {
$config['doubleUnderscore'][$caseSensitive][ $caseSensitive ? $n : $contObj->lc( $n ) ] = $name;
$n = $caseSensitive ? $n : $contObj->lc( $n );
$config['doubleUnderscore'][$caseSensitive][$n] = $name;
}
} else {
$config['doubleUnderscore'][0][] = $name;
@ -91,7 +93,8 @@ class CodeMirrorHooks {
if ( isset( $mw[$name] ) ) {
$caseSensitive = array_shift( $mw[$name] ) == 0 ? 0 : 1;
foreach ( $mw[$name] as $n ) {
$config['functionSynonyms'][$caseSensitive][ $caseSensitive ? $n : $contObj->lc( $n ) ] = $name;
$n = $caseSensitive ? $n : $contObj->lc( $n );
$config['functionSynonyms'][$caseSensitive][$n] = $name;
}
}
}
@ -140,8 +143,8 @@ class CodeMirrorHooks {
* @param array $defaultPreferences
*/
public static function onGetPreferences( User $user, &$defaultPreferences ) {
// CodeMirror is enabled by default for users.
// It can be changed by adding '$wgDefaultUserOptions['usecodemirror'] = 0;' into LocalSettings.php
// CodeMirror is enabled by default for users. It can
// be changed by adding '$wgDefaultUserOptions['usecodemirror'] = 0;' into LocalSettings.php
$defaultPreferences['usecodemirror'] = [
'type' => 'api',
'default' => '1',
@ -161,11 +164,15 @@ class CodeMirrorHooks {
'label-message' => 'codemirror-beta-title',
'desc-message' => 'codemirror-beta-desc',
'screenshot' => [
'ltr' => $wgExtensionAssetsPath . '/CodeMirror/resources/images/codemirror-beta-LTR.svg',
'rtl' => $wgExtensionAssetsPath . '/CodeMirror/resources/images/codemirror-beta-RTL.svg'
'ltr' => $wgExtensionAssetsPath .
'/CodeMirror/resources/images/codemirror-beta-LTR.svg',
'rtl' => $wgExtensionAssetsPath .
'/CodeMirror/resources/images/codemirror-beta-RTL.svg'
],
'info-link' => 'https://meta.wikimedia.org/wiki/Community_Tech/Wikitext_editor_syntax_highlighting',
'discussion-link' => 'https://meta.wikimedia.org/wiki/Talk:Community_Tech/Wikitext_editor_syntax_highlighting'
'info-link' => 'https://meta.wikimedia.org/wiki/' .
'Community_Tech/Wikitext_editor_syntax_highlighting',
'discussion-link' => 'https://meta.wikimedia.org/wiki/' .
'Talk:Community_Tech/Wikitext_editor_syntax_highlighting'
];
}
}

6
CodeMirror.i18n.php
View file

@ -10,12 +10,12 @@
*
* This shim maintains compatibility back to MediaWiki 1.17.
*/
$messages = array();
$messages = [];
if ( !function_exists( 'wfJsonI18nShimfe179a89caef8049' ) ) {
function wfJsonI18nShimfe179a89caef8049( $cache, $code, &$cachedData ) {
$codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] );
$codeSequence = array_merge( [ $code ], $cachedData['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
$fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
$fileName = __DIR__ . "/i18n/$csCode.json";
if ( is_readable( $fileName ) ) {
$data = FormatJson::decode( file_get_contents( $fileName ), true );
foreach ( array_keys( $data ) as $key ) {

7
composer.json
View file

@ -1,11 +1,14 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
"jakub-onderka/php-console-highlighter": "0.3.2"
"jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/mediawiki-codesniffer": "0.10.0"
},
"scripts": {
"fix": "phpcbf",
"test": [
"parallel-lint . --exclude vendor"
"parallel-lint . --exclude vendor --exclude node_modules",
"phpcs -p -s"
]
}
}

14
phpcs.xml Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic"/>
<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment"/>
<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag"/>
<exclude name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch"/>
</rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
<arg name="encoding" value="UTF-8"/>
<exclude-pattern>vendor</exclude-pattern>
<exclude-pattern>node_modules</exclude-pattern>
</ruleset>