From 13d0ad0de620829bf2c189cd8ed81105e79b4688 Mon Sep 17 00:00:00 2001
From: "C. Scott Ananian" <cscott@cscott.net>
Date: Tue, 26 May 2020 11:40:34 -0400
Subject: [PATCH] Un-deprecate the ParserPreSaveTransformComplete hook

Although it's true that Parsoid doesn't (yet) support this hook, and
the $parser object referenced in the hook is likely going to be changed,
this is a hook added in 1.35 (eb6c5f70d9a12b16c065941659d21a6323735b9b)
to replace use of an even worse hook.  So let's keep the lesser of the
evils, at least for now.

Bug: T236809
Change-Id: I8f866c3b9f1fc51848cfe9364635112371d18e3e
---
 RELEASE-NOTES-1.35                                          | 3 ---
 docs/hooks.txt                                              | 2 +-
 includes/HookContainer/DeprecatedHooks.php                  | 1 -
 includes/parser/Hook/ParserPreSaveTransformCompleteHook.php | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/RELEASE-NOTES-1.35 b/RELEASE-NOTES-1.35
index 280e6de04c0..39724c68441 100644
--- a/RELEASE-NOTES-1.35
+++ b/RELEASE-NOTES-1.35
@@ -789,9 +789,6 @@ because of Phabricator reports.
         Use BeforeParserFetchTemplateAndTitle
     - ParserSectionCreate
         No replacement; <section> tag wrapping will be done by core in future.
-    - ParserPreSaveTransformComplete
-        No replacement; Content::preSaveTransform() provides for customizable
-        PreSaveTransforms
     - BeforeParserrenderImageGallery
         No replacement; MediaHandler provides for customizable media rendering
     - ParserBeforeTidy
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 7638d86fb58..c54b0b979fa 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2671,7 +2671,7 @@ $parserOutput: The ParserOutput object.
 &$text: The text being transformed, before core transformations are done.
 &$options: The options array being used for the transformation.
 
-'ParserPreSaveTransformComplete': DEPRECATED since 1.35!
+'ParserPreSaveTransformComplete':
 Called from Parser::preSaveTransform() after
 processing is complete, giving the extension a chance to further modify the
 wikitext.
diff --git a/includes/HookContainer/DeprecatedHooks.php b/includes/HookContainer/DeprecatedHooks.php
index 5d5adac6968..1db964ba76a 100644
--- a/includes/HookContainer/DeprecatedHooks.php
+++ b/includes/HookContainer/DeprecatedHooks.php
@@ -48,7 +48,6 @@ class DeprecatedHooks {
 		'ParserBeforeTidy' => [ 'deprecatedVersion' => '1.35' ],
 		'ParserFetchTemplate' => [ 'deprecatedVersion' => '1.35' ],
 		'ParserGetVariableValueVarCache' => [ 'deprecatedVersion' => '1.35' ],
-		'ParserPreSaveTransformComplete' => [ 'deprecatedVersion' => '1.35' ],
 		'ParserSectionCreate' => [ 'deprecatedVersion' => '1.35' ],
 		'RevisionInsertComplete' => [ 'deprecatedVersion' => '1.31' ],
 		'UndeleteShowRevision' => [ 'deprecatedVersion' => '1.35' ],
diff --git a/includes/parser/Hook/ParserPreSaveTransformCompleteHook.php b/includes/parser/Hook/ParserPreSaveTransformCompleteHook.php
index c31db80722e..0e3b686c0bd 100644
--- a/includes/parser/Hook/ParserPreSaveTransformCompleteHook.php
+++ b/includes/parser/Hook/ParserPreSaveTransformCompleteHook.php
@@ -5,7 +5,7 @@ namespace MediaWiki\Hook;
 use Parser;
 
 /**
- * @deprecated since 1.35
+ * @stable
  * @ingroup Hooks
  */
 interface ParserPreSaveTransformCompleteHook {