From 58abac2d1489cdfaaf2ffdf2f9e1214509760b31 Mon Sep 17 00:00:00 2001
From: "C. Scott Ananian" <cscott@cscott.net>
Date: Thu, 20 Sep 2018 17:16:16 -0400
Subject: [PATCH] Change ParserOptions `tidy` default to `true`

We are deprecating the non-tidy modes of the parser.

ParserOptions::getCanonicalOverrides() has always set `tidy` to `true` at
any rate, so this isn't going to invalidate any parser cache entries.

Change-Id: Ib703a041edf8a8d57e94f136965f72d9bbfcf222
---
 RELEASE-NOTES-1.33                | 3 +++
 includes/parser/ParserOptions.php | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 2b4951336c..42fa12ac45 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -66,6 +66,9 @@ because of Phabricator reports.
 * The "Parsoid v1" compatibility mappings in ParsoidVirtualRESTService and
   RestbaseVirtualRESTService, deprecated since 1.26, have been removed.
   Use the RESTBase v1 or Parsoid v3 API instead.
+* ParserOptions defaults 'tidy' to true now, since the untidy modes of the
+  parser are being deprecated and ParserOptions::getCanonicalOverrides()
+  has always been true at any rate.
 * …
 
 === Deprecations in 1.33 ===
diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index a8da3ce930..de67b84740 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -1098,7 +1098,7 @@ class ParserOptions {
 			// *UPDATE* ParserOptions::matches() if any of this changes as needed
 			self::$defaults = [
 				'dateformat' => null,
-				'tidy' => false,
+				'tidy' => true,
 				'interfaceMessage' => false,
 				'targetLanguage' => null,
 				'removeComments' => true,
@@ -1164,7 +1164,6 @@ class ParserOptions {
 		global $wgEnableParserLimitReporting;
 
 		return [
-			'tidy' => true,
 			'enableLimitReport' => $wgEnableParserLimitReporting,
 		];
 	}
-- 
2.20.1