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

Update MediaWiki\quietCall() -> Wikimedia\quietCall()

Browse source 
Bug: T182273
Change-Id: Id7d8e176fcd93040e30e46cb64fc6a3d36bc8230
This commit is contained in:
Reedy 2018-02-10 07:40:43 +00:00 committed by Umherirrender
parent 44414aa3ad
commit fbc0347466
9 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/GlobalFunctions.php
View file

@ -2754,7 +2754,7 @@ function wfSetupSession( $sessionId = false ) {
if ( session_id() !== $session->getId() ) { if ( session_id() !== $session->getId() ) {
session_id( $session->getId() ); session_id( $session->getId() );
} }
MediaWiki\quietCall( 'session_start' ); Wikimedia\quietCall( 'session_start' );
} }
/** /**

2
includes/Setup.php
View file

@ -874,7 +874,7 @@ if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
) { ) {
// Start the PHP-session for backwards compatibility // Start the PHP-session for backwards compatibility
session_id( $session->getId() ); session_id( $session->getId() );
MediaWiki\quietCall( 'session_start' ); Wikimedia\quietCall( 'session_start' );
} }
unset( $session ); unset( $session );

2
includes/api/ApiMain.php
View file

@ -1037,7 +1037,7 @@ class ApiMain extends ApiBase {
// None of the rest have any messages for non-error types // None of the rest have any messages for non-error types
} elseif ( $e instanceof UsageException ) { } elseif ( $e instanceof UsageException ) {
// User entered incorrect parameters - generate error response // User entered incorrect parameters - generate error response
$data = MediaWiki\quietCall( [ $e, 'getMessageArray' ] ); $data = Wikimedia\quietCall( [ $e, 'getMessageArray' ] );
$code = $data['code']; $code = $data['code'];
$info = $data['info']; $info = $data['info'];
unset( $data['code'], $data['info'] ); unset( $data['code'], $data['info'] );

2
includes/context/RequestContext.php
View file

@ -557,7 +557,7 @@ class RequestContext implements IContextSource, MutableContext {
$wgUser = $context->getUser(); // b/c $wgUser = $context->getUser(); // b/c
if ( $session && MediaWiki\Session\PHPSessionHandler::isEnabled() ) { if ( $session && MediaWiki\Session\PHPSessionHandler::isEnabled() ) {
session_id( $session->getId() ); session_id( $session->getId() );
MediaWiki\quietCall( 'session_start' ); Wikimedia\quietCall( 'session_start' );
} }
$request = new FauxRequest( [], false, $session ); $request = new FauxRequest( [], false, $session );
$request->setIP( $params['ip'] ); $request->setIP( $params['ip'] );

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

@ -2186,7 +2186,7 @@ abstract class File implements IDBAccessObject {
$metadata = $this->getMetadata(); $metadata = $this->getMetadata();
if ( is_string( $metadata ) ) { if ( is_string( $metadata ) ) {
$metadata = MediaWiki\quietCall( 'unserialize', $metadata ); $metadata = Wikimedia\quietCall( 'unserialize', $metadata );
} }
if ( !is_array( $metadata ) ) { if ( !is_array( $metadata ) ) {

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

@ -1292,7 +1292,7 @@ class LocalFile extends File {
$options = []; $options = [];
$handler = MediaHandler::getHandler( $props['mime'] ); $handler = MediaHandler::getHandler( $props['mime'] );
if ( $handler ) { if ( $handler ) {
$metadata = MediaWiki\quietCall( 'unserialize', $props['metadata'] ); $metadata = Wikimedia\quietCall( 'unserialize', $props['metadata'] );
if ( !is_array( $metadata ) ) { if ( !is_array( $metadata ) ) {
$metadata = []; $metadata = [];

4
includes/session/SessionBackend.php
View file

@ -243,7 +243,7 @@ final class SessionBackend {
if ( $restart ) { if ( $restart ) {
session_id( (string)$this->id ); session_id( (string)$this->id );
\MediaWiki\quietCall( 'session_start' ); \Wikimedia\quietCall( 'session_start' );
} }
$this->autosave(); $this->autosave();
@ -764,7 +764,7 @@ final class SessionBackend {
'session' => $this->id, 'session' => $this->id,
] ); ] );
session_id( (string)$this->id ); session_id( (string)$this->id );
\MediaWiki\quietCall( 'session_start' ); \Wikimedia\quietCall( 'session_start' );
} }
} }
} }

2
maintenance/importImages.php
View file

@ -305,7 +305,7 @@ class ImportImages extends Maintenance {
$publishOptions = []; $publishOptions = [];
$handler = MediaHandler::getHandler( $props['mime'] ); $handler = MediaHandler::getHandler( $props['mime'] );
if ( $handler ) { if ( $handler ) {
$metadata = MediaWiki\quietCall( 'unserialize', $props['metadata'] ); $metadata = Wikimedia\quietCall( 'unserialize', $props['metadata'] );
$publishOptions['headers'] = $handler->getContentHeaders( $metadata ); $publishOptions['headers'] = $handler->getContentHeaders( $metadata );
} else { } else {

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

@ -900,7 +900,7 @@ class SessionBackendTest extends MediaWikiTestCase {
$manager->globalSessionRequest = $request; $manager->globalSessionRequest = $request;
session_id( self::SESSIONID ); session_id( self::SESSIONID );
\MediaWiki\quietCall( 'session_start' ); \Wikimedia\quietCall( 'session_start' );
$_SESSION['foo'] = __METHOD__; $_SESSION['foo'] = __METHOD__;
$backend->resetId(); $backend->resetId();
$this->assertNotEquals( self::SESSIONID, $backend->getId() ); $this->assertNotEquals( self::SESSIONID, $backend->getId() );
@ -938,7 +938,7 @@ class SessionBackendTest extends MediaWikiTestCase {
$manager->globalSessionRequest = $request; $manager->globalSessionRequest = $request;
session_id( self::SESSIONID . 'x' ); session_id( self::SESSIONID . 'x' );
\MediaWiki\quietCall( 'session_start' ); \Wikimedia\quietCall( 'session_start' );
$backend->unpersist(); $backend->unpersist();
$this->assertSame( self::SESSIONID . 'x', session_id() ); $this->assertSame( self::SESSIONID . 'x', session_id() );