Merge "Hard deprecate non-Remex tidy modes"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 16eec55..b30a568 100644 (file)
--- 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 ed91735..878099f 100644 (file)
--- 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.
         *