jenkins-bot has submitted this change and it was merged.
Change subject: Remove use of deprecated wfSuppress/RestoreWarnings
......................................................................
Remove use of deprecated wfSuppress/RestoreWarnings
Change-Id: I8f7a77a66f027d853c3532021a24425339571f7c
---
M includes/media/WebP.php
M tests/phpunit/includes/debug/logger/monolog/AvroFormatterTest.php
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/media/WebP.php b/includes/media/WebP.php
index 6a01e87..35e885f 100644
--- a/includes/media/WebP.php
+++ b/includes/media/WebP.php
@@ -63,9 +63,9 @@
return self::METADATA_GOOD;
}
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$data = unserialize( $metadata );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( !$data || !is_array( $data ) ) {
wfDebug( __METHOD__ . " invalid WebP
metadata\n" );
@@ -234,9 +234,9 @@
$metadata = $file->getMetadata();
}
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$metadata = unserialize( $metadata );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( $metadata == false ) {
return false;
diff --git a/tests/phpunit/includes/debug/logger/monolog/AvroFormatterTest.php
b/tests/phpunit/includes/debug/logger/monolog/AvroFormatterTest.php
index a9a1e7a..938397a 100644
--- a/tests/phpunit/includes/debug/logger/monolog/AvroFormatterTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/AvroFormatterTest.php
@@ -47,9 +47,9 @@
// disable conversion of notices
PHPUnit_Framework_Error_Notice::$enabled = false;
// have to keep the user notice from being output
- wfSuppressWarnings();
+ \MediaWiki\suppressWarnings();
$res = $formatter->format( [ 'channel' => 'marty' ] );
- wfRestoreWarnings();
+ \MediaWiki\restoreWarnings();
PHPUnit_Framework_Error_Notice::$enabled = $noticeEnabled;
$this->assertNull( $res );
}
--
To view, visit https://gerrit.wikimedia.org/r/281278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f7a77a66f027d853c3532021a24425339571f7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
