From b761bfa311343c19ae22bf14f49457663bee23dc Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 19 Feb 2019 12:15:36 +0000 Subject: [PATCH] Drop wf(Suppress|Restore)Warnings, deprecated in 1.26 Change-Id: Idcc9debd90e6ee12adf5ab7c4ec640db12828997 --- RELEASE-NOTES-1.34 | 3 +++ includes/GlobalFunctions.php | 18 ------------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index 917609bb3f..09d56c8de0 100644 --- a/RELEASE-NOTES-1.34 +++ b/RELEASE-NOTES-1.34 @@ -86,6 +86,9 @@ because of Phabricator reports. * (T152908) Added language support for N'Ko (nqo). === Breaking changes in 1.34 === +* The global functions wfSuppressWarnings and wfRestoreWarnings, deprecated in + 1.26, have been removed. Use Wikimedia\AtEase\AtEase::suppressWarnings() and + Wikimedia\AtEase\AtEase::restoreWarnings() directly. * Preferences class, deprecated in 1.31, has been removed. * The following parts of code, deprecated in 1.32, were removed in favor of built-in PHP functions: diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 486dfe4930..b246a7ba66 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -1846,24 +1846,6 @@ function wfNegotiateType( $cprefs, $sprefs ) { return $besttype; } -/** - * Reference-counted warning suppression - * - * @deprecated since 1.26, use Wikimedia\suppressWarnings() directly - * @param bool $end - */ -function wfSuppressWarnings( $end = false ) { - Wikimedia\suppressWarnings( $end ); -} - -/** - * @deprecated since 1.26, use Wikimedia\restoreWarnings() directly - * Restore error level to previous value - */ -function wfRestoreWarnings() { - Wikimedia\restoreWarnings(); -} - /** * Get a timestamp string in one of various formats * -- 2.20.1