From 0a3217462c38624d76bd90e3566ce5c399644767 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Fri, 8 Feb 2019 17:37:23 -0800 Subject: [PATCH] Drop MWExceptionHandler::getLogId(), deprecated in 1.27 and unused Change-Id: Id03aaf4f2ea5c910e13274826e44033e12adcd2e --- RELEASE-NOTES-1.33 | 2 ++ includes/exception/MWExceptionHandler.php | 16 ---------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33 index 12f915b4c2..1f84421b69 100644 --- a/RELEASE-NOTES-1.33 +++ b/RELEASE-NOTES-1.33 @@ -219,6 +219,8 @@ because of Phabricator reports. be unused, and is distinct from OutputPage->addLink(), which remains. * JsonContent->getJsonData(), deprecated in 1.25, has been removed. Instead, use JsonContent->getData(). +* MWExceptionHandler::getLogId(), deprecated in 1.27, has been removed, as the + exception ID is the same as the request ID, from WebRequest::getRequestId().. === Deprecations in 1.33 === * The configuration option $wgUseESI has been deprecated, and is expected diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php index 951498e537..6e3fa794ce 100644 --- a/includes/exception/MWExceptionHandler.php +++ b/includes/exception/MWExceptionHandler.php @@ -462,22 +462,6 @@ TXT; }, $trace ); } - /** - * Get the ID for this exception. - * - * The ID is saved so that one can match the one output to the user (when - * $wgShowExceptionDetails is set to false), to the entry in the debug log. - * - * @since 1.22 - * @deprecated since 1.27: Exception IDs are synonymous with request IDs. - * @param Exception|Throwable $e - * @return string - */ - public static function getLogId( $e ) { - wfDeprecated( __METHOD__, '1.27' ); - return WebRequest::getRequestId(); - } - /** * If the exception occurred in the course of responding to a request, * returns the requested URL. Otherwise, returns false. -- 2.20.1