From 38122d91cd00bfc950ec199d2a76ceeb4b84f38b Mon Sep 17 00:00:00 2001
From: Adam Wight <adam.wight@wikimedia.de>
Date: Fri, 20 Dec 2019 09:24:43 +0100
Subject: [PATCH] Remove "follow" special case from ReferencesFormatter

This is unreachable, now that broken follow refs fail validation.

Bug: T240858
Change-Id: I77faeaac4bc53632ab8b82bff7e335ee8c99dfa5
---
 i18n/en.json                                   |  1 -
 i18n/qqq.json                                  |  1 -
 src/ReferencesFormatter.php                    | 10 ----------
 tests/phpunit/unit/ReferencesFormatterTest.php |  8 --------
 4 files changed, 20 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index e0fe77b15..c224c40d2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -45,7 +45,6 @@
 	"cite_references_link_prefix": "cite_note-",
 	"cite_references_link_suffix": "",
 	"cite_reference_link": "<sup id=\"$1\" class=\"reference\">[[#$2|&#91;$3&#93;]]</sup>",
-	"cite_references_no_link": "<p id=\"$1\">$2</p>",
 	"cite_references_link_one": "<li id=\"$1\"$4><span class=\"mw-cite-backlink\">[[#$2|↑]]</span> $3</li>",
 	"cite_references_link_many": "<li id=\"$1\"$4><span class=\"mw-cite-backlink\">↑ $2</span> $3</li>",
 	"cite_references_link_many_format": "<sup>[[#$1|$2]]</sup>",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 33b3b5050..f7d4d1f64 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -46,7 +46,6 @@
 	"cite_references_link_prefix": "{{optional}}",
 	"cite_references_link_suffix": "{{ignored}}",
 	"cite_reference_link": "{{optional}}\n\nParameters:\n* $1 - ref key\n* $2 - references key\n* $3 - link label",
-	"cite_references_no_link": "{{notranslate}}\n\nParameters:\n* $1 - references key\n* $2 - reference text",
 	"cite_references_link_one": "{{optional}}\n\nParameters:\n* $1 - references key\n* $2 - ref key\n* $3 - reference text\n* $4 - optional CSS class for direction",
 	"cite_references_link_many": "{{optional}}\n\nParameters:\n* $1 - references key\n* $2 - list of links\n* $3 - reference text\n* $4 - optional CSS class for direction",
 	"cite_references_link_many_format": "{{optional}}\n\nParameters:\n* $1 - reference key\n* $2 - canonical numeric backlink label for the link, always in the form \"1.2\"\n* $3 - optional alternate backlink label as defined via [[MediaWiki:cite_references_link_many_format_backlink_labels]]",
diff --git a/src/ReferencesFormatter.php b/src/ReferencesFormatter.php
index 0e18334fc..4530eaba8 100644
--- a/src/ReferencesFormatter.php
+++ b/src/ReferencesFormatter.php
@@ -173,16 +173,6 @@ class ReferencesFormatter {
 			$extraAttributes = Html::expandAttributes( [ 'class' => 'mw-cite-dir-' . $dir ] );
 		}
 
-		// Fallback for a broken, and therefore unprocessed follow="…". Note this returns a <p>, not
-		// an <li> as expected!
-		if ( isset( $val['follow'] ) ) {
-			return $this->messageLocalizer->msg(
-				'cite_references_no_link',
-				$this->anchorFormatter->getReferencesKey( $val['follow'] ),
-				$text
-			)->plain();
-		}
-
 		// This counts the number of reuses. 0 means the reference appears only 1 time.
 		if ( isset( $val['count'] ) && $val['count'] < 1 ) {
 			// Anonymous, auto-numbered references can't be reused and get marked with a -1.
diff --git a/tests/phpunit/unit/ReferencesFormatterTest.php b/tests/phpunit/unit/ReferencesFormatterTest.php
index 0efb297b2..d387c448e 100644
--- a/tests/phpunit/unit/ReferencesFormatterTest.php
+++ b/tests/phpunit/unit/ReferencesFormatterTest.php
@@ -257,14 +257,6 @@ class ReferencesFormatterTest extends \MediaWikiUnitTestCase {
 				'(cite_references_link_many|||<span class="reference-text">t</span>' .
 					"\n" . '| class="mw-cite-dir-rtl")'
 			],
-			'Broken follow' => [
-				1,
-				[
-					'follow' => 'f',
-					'text' => 't',
-				],
-				'(cite_references_no_link||<span class="reference-text">t</span>' . "\n)"
-			],
 			'Count zero' => [
 				1,
 				[