From c6ccd44f953a884ba913e86ef582d11636bb61f3 Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem.wiki@gmail.com>
Date: Fri, 7 Jul 2017 15:57:54 -0700
Subject: [PATCH] Remove i18n shim

Change-Id: I187328ea888589aa33500dda25c73cff18261e07
---
 CodeMirror.i18n.php | 35 -----------------------------------
 extension.json      |  3 +++
 phpcs.xml           |  1 -
 3 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 CodeMirror.i18n.php

diff --git a/CodeMirror.i18n.php b/CodeMirror.i18n.php
deleted file mode 100644
index f0db7ff8..00000000
--- a/CodeMirror.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * This is a backwards-compatibility shim, generated by:
- * https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = [];
-if ( !function_exists( 'wfJsonI18nShimfe179a89caef8049' ) ) {
-	function wfJsonI18nShimfe179a89caef8049( $cache, $code, &$cachedData ) {
-		$codeSequence = array_merge( [ $code ], $cachedData['fallbackSequence'] );
-		foreach ( $codeSequence as $csCode ) {
-			$fileName = __DIR__ . "/i18n/$csCode.json";
-			if ( is_readable( $fileName ) ) {
-				$data = FormatJson::decode( file_get_contents( $fileName ), true );
-				foreach ( array_keys( $data ) as $key ) {
-					if ( $key === '' || $key[0] === '@' ) {
-						unset( $data[$key] );
-					}
-				}
-				$cachedData['messages'] = array_merge( $data, $cachedData['messages'] );
-			}
-
-			$cachedData['deps'][] = new FileDependency( $fileName );
-		}
-		return true;
-	}
-
-	$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShimfe179a89caef8049';
-}
diff --git a/extension.json b/extension.json
index bff8255d..a12a42aa 100644
--- a/extension.json
+++ b/extension.json
@@ -9,6 +9,9 @@
 	"descriptionmsg": "codemirror-desc",
 	"type": "parserhook",
 	"license-name": "GPL-2.0+",
+	"requires": {
+		"MediaWiki": ">= 1.23.0"
+    },
 	"MessagesDirs": {
 		"CodeMirror": [
 			"i18n"
diff --git a/phpcs.xml b/phpcs.xml
index 29fb515a..df8c2b5a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,7 +1,6 @@
 <?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"/>