From: C. Scott Ananian <cscott@cscott.net>
Date: Thu, 20 Sep 2018 21:27:59 +0000 (-0400)
Subject: Hard deprecate non-Remex tidy modes
X-Git-Tag: 1.34.0-rc.0~4028^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=a11a6f619f2e96b8754a4331f0b81f952118bc54;p=lhc%2Fweb%2Fwiklou.git

Hard deprecate non-Remex tidy modes

Let's rip the band-aid off.  Remex is pure PHP so there's no reason to
be running any of the other tidy implementations any more, and we won't
be able to support them in the future.

Follow-up to 7b23382823f2ea7bab8d20ad68950ff34f50a005.

Bug: T198214
Change-Id: Id3d07d44f8434231826e86e623554cac3decfa96
---

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 16eec55058..b30a568806 100644
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -452,8 +452,8 @@ because of Phabricator reports.
   in MediaWiki 1.26, have now been hard deprecated. This affects $wgUseTidy,
   $wgTidyBin, $wgTidyConf, $wgTidyOpts, $wgTidyInternal, and $wgDebugTidy. Use
   $wgTidyConfig instead.
-* All Tidy configurations other than Remex have been deprecated; future parsers
-  will not emit compatible output for these configurations.
+* All Tidy configurations other than Remex have been hard deprecated;
+  future parsers will not emit compatible output for these configurations.
 
 === Other changes in 1.32 ===
 * (T198811) The following tables have had their UNIQUE indexes turned into
diff --git a/includes/tidy/RaggettBase.php b/includes/tidy/RaggettBase.php
index ed91735804..878099ff7d 100644
--- a/includes/tidy/RaggettBase.php
+++ b/includes/tidy/RaggettBase.php
@@ -8,6 +8,14 @@ use MWException;
  * @deprecated since 1.32, use RemexDriver
  */
 abstract class RaggettBase extends TidyDriverBase {
+
+	function __construct( $config ) {
+		parent::__construct( $config );
+
+		// All tidy modes other than remex are deprecated.
+		wfDeprecated( __METHOD__, '1.32' );
+	}
+
 	/**
 	 * Generic interface for wrapping and unwrapping HTML for Dave Raggett's tidy.
 	 *