Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350840 )

Change subject: Make it compatible with CodeMirror version 4.0.0 (v 5.10)
......................................................................

Make it compatible with CodeMirror version 4.0.0 (v 5.10)

Instead of use the CodeMirrorGetAdditionalResources hook, use the
  CodeMirrorTagModes and CodeMirrorPluginModules modules

This patch removes compatibility with previous versions of CodeMirror

See also bug T163238

Change-Id: Ie339f0475e63885e603defaee2cdcccd6a95fafc
---
M PhpTags.hooks.php
M extension.json
2 files changed, 8 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTags 
refs/changes/40/350840/1

diff --git a/PhpTags.hooks.php b/PhpTags.hooks.php
index 2092ca1..4a855e9 100644
--- a/PhpTags.hooks.php
+++ b/PhpTags.hooks.php
@@ -42,24 +42,6 @@
 
        /**
         *
-        * @param array $extResources
-        * @param array $extMode
-        */
-       public static function onCodeMirrorGetAdditionalResources( 
&$extResources, &$extMode ) {
-               $extResources['scripts']['lib/codemirror/mode/php/php.js'] = 
true;
-               
$extResources['scripts']['lib/codemirror/mode/htmlmixed/htmlmixed.js'] = true;
-               $extResources['scripts']['lib/codemirror/mode/xml/xml.js'] = 
true;
-               
$extResources['scripts']['lib/codemirror/mode/javascript/javascript.js'] = true;
-               $extResources['scripts']['lib/codemirror/mode/css/css.js'] = 
true;
-               $extResources['scripts']['lib/codemirror/mode/clike/clike.js'] 
= true;
-
-               $extMode['tag']['phptag'] = 'text/x-php';
-
-               return true;
-       }
-
-       /**
-        *
         * @global int $wgPhpTagsCallsCounter
         * @param Parser $parser
         * @param string $text
@@ -107,7 +89,7 @@
                $wgPhpTagsCallsCounter = 0;
 
                define ( 'PHPTAGS_HOOK_RELEASE', 8 );
-               define ( 'PHPTAGS_VERSION', '5.9' ); //@todo remove later, it 
only for backward compatibility
+               define ( 'PHPTAGS_VERSION', '5.10' ); //@todo remove later, it 
only for backward compatibility
        }
 
 }
diff --git a/extension.json b/extension.json
index 2901225..dbb6553 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
        "name": "PhpTags",
-       "version": "5.9",
+       "version": "5.10",
        "author": "[https://www.mediawiki.org/wiki/User:Pastakhov Pavel 
Astakhov]",
        "url": "https://www.mediawiki.org/wiki/Extension:PhpTags";,
        "descriptionmsg": "phptags-desc",
@@ -37,7 +37,6 @@
        "Hooks": {
                "ParserFirstCallInit": "PhpTagsHooks::onParserFirstCallInit",
                "PhpTagsRuntimeFirstInit": 
"PhpTagsHooks::onPhpTagsRuntimeFirstInit",
-               "CodeMirrorGetAdditionalResources": 
"PhpTagsHooks::onCodeMirrorGetAdditionalResources",
                "ParserLimitReport": "PhpTagsHooks::onParserLimitReport",
                "ParserAfterTidy": "PhpTagsHooks::onParserAfterTidy",
                "ExtensionTypes": "PhpTagsHooks::onExtensionTypes",
@@ -55,6 +54,12 @@
                "PhpTagsMaxLoops": 1000,
                "PhpTagsBytecodeExptime": 2592000
        },
+       "CodeMirrorTagModes": {
+               "phptag": "text/x-php"
+       },
+       "CodeMirrorPluginModules": [
+               "ext.CodeMirror.lib.mode.php"
+       ],
        "callback": "PhpTagsHooks::onRegistration",
        "manifest_version": 1
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/350840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie339f0475e63885e603defaee2cdcccd6a95fafc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PhpTags
Gerrit-Branch: master
Gerrit-Owner: Pastakhov <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to