Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use AtEase::quietCall() instead of Wikimedia\quietCall()

Browse source 
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
This commit is contained in:
Derick Alangi 2019-05-26 22:46:15 +01:00 committed by Krinkle
parent e2ef870ee2
commit c51f012739
7 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/ForeignResourceManager.php
View file

@ -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 ) {

3
includes/context/RequestContext.php
View file

@ -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'] );

3
includes/filerepo/file/File.php
View file

@ -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 ) ) {

3
includes/filerepo/file/LocalFile.php
View file

@ -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 = [];

5
includes/session/SessionBackend.php
View file

@ -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' );
}
}
}

2
maintenance/importImages.php
View file

@ -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 {

5
tests/phpunit/includes/session/SessionBackendTest.php
View file

@ -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();