From c51f0127394d7c1ee7d9a4c13024e82f35f2cf04 Mon Sep 17 00:00:00 2001 From: Derick Alangi Date: Sun, 26 May 2019 22:46:15 +0100 Subject: [PATCH] Use AtEase::quietCall() instead of Wikimedia\quietCall() Wikimedia\quietCall() is deprecated and AtEase is here for use. I would have loved to do restoreWarnings() and suppressWarnings() in this same patch set but will continue the work for a later patch. Bug: T182273 Change-Id: I43e3a5f378c99b5c40883b35ba133cbd126fc433 --- includes/ForeignResourceManager.php | 4 +++- includes/context/RequestContext.php | 3 ++- includes/filerepo/file/File.php | 3 ++- includes/filerepo/file/LocalFile.php | 3 ++- includes/session/SessionBackend.php | 5 +++-- maintenance/importImages.php | 2 +- tests/phpunit/includes/session/SessionBackendTest.php | 5 +++-- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/includes/ForeignResourceManager.php b/includes/ForeignResourceManager.php index dddbad5334..80a12fe1e6 100644 --- a/includes/ForeignResourceManager.php +++ b/includes/ForeignResourceManager.php @@ -19,6 +19,8 @@ * @ingroup Maintenance */ +use Wikimedia\AtEase\AtEase; + /** * Manage foreign resources registered with ResourceLoader. * @@ -150,7 +152,7 @@ class ForeignResourceManager { /** @return string|false */ private function cacheGet( $key ) { - return Wikimedia\quietCall( 'file_get_contents', "{$this->cacheDir}/$key.data" ); + return AtEase::quietCall( 'file_get_contents', "{$this->cacheDir}/$key.data" ); } private function cacheSet( $key, $data ) { diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php index aada514f3a..4393abb23d 100644 --- a/includes/context/RequestContext.php +++ b/includes/context/RequestContext.php @@ -22,6 +22,7 @@ * @file */ +use Wikimedia\AtEase\AtEase; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; use Wikimedia\ScopedCallback; @@ -553,7 +554,7 @@ class RequestContext implements IContextSource, MutableContext { $wgUser = $context->getUser(); // b/c if ( $session && MediaWiki\Session\PHPSessionHandler::isEnabled() ) { session_id( $session->getId() ); - Wikimedia\quietCall( 'session_start' ); + AtEase::quietCall( 'session_start' ); } $request = new FauxRequest( [], false, $session ); $request->setIP( $params['ip'] ); diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php index 92be7d4ec9..55c50538dd 100644 --- a/includes/filerepo/file/File.php +++ b/includes/filerepo/file/File.php @@ -5,6 +5,7 @@ * * Represents files in a repository. */ +use Wikimedia\AtEase\AtEase; use MediaWiki\MediaWikiServices; /** @@ -2171,7 +2172,7 @@ abstract class File implements IDBAccessObject { $metadata = $this->getMetadata(); if ( is_string( $metadata ) ) { - $metadata = Wikimedia\quietCall( 'unserialize', $metadata ); + $metadata = AtEase::quietCall( 'unserialize', $metadata ); } if ( !is_array( $metadata ) ) { diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 99fd36d4fc..dd8962d4ca 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -21,6 +21,7 @@ * @ingroup FileAbstraction */ +use Wikimedia\AtEase\AtEase; use MediaWiki\Logger\LoggerFactory; use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\IDatabase; @@ -1337,7 +1338,7 @@ class LocalFile extends File { $options = []; $handler = MediaHandler::getHandler( $props['mime'] ); if ( $handler ) { - $metadata = Wikimedia\quietCall( 'unserialize', $props['metadata'] ); + $metadata = AtEase::quietCall( 'unserialize', $props['metadata'] ); if ( !is_array( $metadata ) ) { $metadata = []; diff --git a/includes/session/SessionBackend.php b/includes/session/SessionBackend.php index 0ea13e2a91..3f12563adb 100644 --- a/includes/session/SessionBackend.php +++ b/includes/session/SessionBackend.php @@ -27,6 +27,7 @@ use CachedBagOStuff; use Psr\Log\LoggerInterface; use User; use WebRequest; +use Wikimedia\AtEase\AtEase; /** * This is the actual workhorse for Session. @@ -262,7 +263,7 @@ final class SessionBackend { if ( $restart ) { session_id( (string)$this->id ); - \Wikimedia\quietCall( 'session_start' ); + AtEase::quietCall( 'session_start' ); } $this->autosave(); @@ -785,7 +786,7 @@ final class SessionBackend { 'session' => $this->id, ] ); session_id( (string)$this->id ); - \Wikimedia\quietCall( 'session_start' ); + AtEase::quietCall( 'session_start' ); } } } diff --git a/maintenance/importImages.php b/maintenance/importImages.php index f27ea2feab..dfa83cdb6a 100644 --- a/maintenance/importImages.php +++ b/maintenance/importImages.php @@ -306,7 +306,7 @@ class ImportImages extends Maintenance { $publishOptions = []; $handler = MediaHandler::getHandler( $props['mime'] ); if ( $handler ) { - $metadata = Wikimedia\quietCall( 'unserialize', $props['metadata'] ); + $metadata = \Wikimedia\AtEase\AtEase::quietCall( 'unserialize', $props['metadata'] ); $publishOptions['headers'] = $handler->getContentHeaders( $metadata ); } else { diff --git a/tests/phpunit/includes/session/SessionBackendTest.php b/tests/phpunit/includes/session/SessionBackendTest.php index 48c3d179e7..a1fdf8a3a6 100644 --- a/tests/phpunit/includes/session/SessionBackendTest.php +++ b/tests/phpunit/includes/session/SessionBackendTest.php @@ -2,6 +2,7 @@ namespace MediaWiki\Session; +use Wikimedia\AtEase\AtEase; use Config; use MediaWikiTestCase; use User; @@ -900,7 +901,7 @@ class SessionBackendTest extends MediaWikiTestCase { $manager->globalSessionRequest = $request; session_id( self::SESSIONID ); - \Wikimedia\quietCall( 'session_start' ); + AtEase::quietCall( 'session_start' ); $_SESSION['foo'] = __METHOD__; $backend->resetId(); $this->assertNotEquals( self::SESSIONID, $backend->getId() ); @@ -938,7 +939,7 @@ class SessionBackendTest extends MediaWikiTestCase { $manager->globalSessionRequest = $request; session_id( self::SESSIONID . 'x' ); - \Wikimedia\quietCall( 'session_start' ); + AtEase::quietCall( 'session_start' ); $backend->unpersist(); $this->assertSame( self::SESSIONID . 'x', session_id() ); session_write_close(); -- 2.20.1