6 files changed, 7 insertions, 12 deletions
diff --git a/includes/parser/PPCustomFrame_DOM.php b/includes/parser/PPCustomFrame_DOM.php
index 70663a0deaed..d274558afc0e 100644
--- a/includes/parser/PPCustomFrame_DOM.php
+++ b/includes/parser/PPCustomFrame_DOM.php
@@ -21,6 +21,7 @@
 
 /**
  * Expansion frame with custom arguments
+ * @deprecated since 1.34, use PPCustomFrame_Hash
  * @ingroup Parser
  */
 // phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
diff --git a/includes/parser/PPFrame_DOM.php b/includes/parser/PPFrame_DOM.php
index a7fea0028aa9..03ee6d963963 100644
--- a/includes/parser/PPFrame_DOM.php
+++ b/includes/parser/PPFrame_DOM.php
@@ -21,6 +21,7 @@
 
 /**
  * An expansion frame, used as a context to expand the result of preprocessToObj()
+ * @deprecated since 1.34, use PPFrame_Hash
  * @ingroup Parser
  */
 // phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
diff --git a/includes/parser/PPNode_DOM.php b/includes/parser/PPNode_DOM.php
index 8a435bab67a9..26a47911f335 100644
--- a/includes/parser/PPNode_DOM.php
+++ b/includes/parser/PPNode_DOM.php
@@ -20,6 +20,7 @@
  */
 
 /**
+ * @deprecated since 1.34, use PPNode_Hash_{Tree,Text,Array,Attr}
  * @ingroup Parser
  */
 // phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
diff --git a/includes/parser/PPTemplateFrame_DOM.php b/includes/parser/PPTemplateFrame_DOM.php
index 52cb9cb0f0b8..b4c874371d41 100644
--- a/includes/parser/PPTemplateFrame_DOM.php
+++ b/includes/parser/PPTemplateFrame_DOM.php
@@ -21,6 +21,7 @@
 
 /**
  * Expansion frame with template arguments
+ * @deprecated since 1.34, use PPTemplateFrame_Hash
  * @ingroup Parser
  */
 // phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 486fdf441367..c61de38a867c 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -421,21 +421,10 @@ class Parser {
 	 * Which class should we use for the preprocessor if not otherwise specified?
 	 *
 	 * @since 1.34
+	 * @deprecated since 1.34, removing configurability of preprocessor
 	 * @return string
 	 */
 	public static function getDefaultPreprocessorClass() {
-		if ( wfIsHHVM() ) {
-			# Under HHVM Preprocessor_Hash is much faster than Preprocessor_DOM
-			return Preprocessor_Hash::class;
-		}
-		if ( extension_loaded( 'domxml' ) ) {
-			# PECL extension that conflicts with the core DOM extension (T15770)
-			wfDebug( "Warning: you have the obsolete domxml extension for PHP. Please remove it!\n" );
-			return Preprocessor_Hash::class;
-		}
-		if ( extension_loaded( 'dom' ) ) {
-			return Preprocessor_DOM::class;
-		}
 		return Preprocessor_Hash::class;
 	}
 
diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 0f0496beac15..9e510d21d64b 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -19,6 +19,7 @@
  *
  * @file
  * @ingroup Parser
+ * @deprecated since 1.34, use Preprocessor_Hash
  */
 
 /**
@@ -37,6 +38,7 @@ class Preprocessor_DOM extends Preprocessor {
 	const CACHE_PREFIX = 'preprocess-xml';
 
 	public function __construct( $parser ) {
+		wfDeprecated( __METHOD__, '1.34' ); // T204945
 		$this->parser = $parser;
 		$mem = ini_get( 'memory_limit' );
 		$this->memoryLimit = false;