Merge "Change ParserOptions `tidy` default to `true`"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 2b49513..42fa12a 100644 (file)
--- 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 a8da3ce..de67b84 100644 (file)
--- 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,
                ];
        }