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

Bug: T182273
Change-Id: Id7d8e176fcd93040e30e46cb64fc6a3d36bc8230

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index a06d721..6e94d5f 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2754,7 +2754,7 @@ function wfSetupSession( $sessionId = false ) {
        if ( session_id() !== $session->getId() ) {
                session_id( $session->getId() );
        }
-       MediaWiki\quietCall( 'session_start' );
+       Wikimedia\quietCall( 'session_start' );
 }
 
 /**

diff --git a/includes/Setup.php b/includes/Setup.php
index c9fe8d0..33bd5ac 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -874,7 +874,7 @@ if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
        ) {
                // Start the PHP-session for backwards compatibility
                session_id( $session->getId() );
-               MediaWiki\quietCall( 'session_start' );
+               Wikimedia\quietCall( 'session_start' );
        }
 
        unset( $session );

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 2c2dd9a..9bffb90 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1037,7 +1037,7 @@ class ApiMain extends ApiBase {
                        // None of the rest have any messages for non-error types
                } elseif ( $e instanceof UsageException ) {
                        // User entered incorrect parameters - generate error response
-                       $data = MediaWiki\quietCall( [ $e, 'getMessageArray' ] );
+                       $data = Wikimedia\quietCall( [ $e, 'getMessageArray' ] );
                        $code = $data['code'];
                        $info = $data['info'];
                        unset( $data['code'], $data['info'] );

diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index 6fedead..db3a7a9 100644 (file)
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -557,7 +557,7 @@ class RequestContext implements IContextSource, MutableContext {
                        $wgUser = $context->getUser(); // b/c
                        if ( $session && MediaWiki\Session\PHPSessionHandler::isEnabled() ) {
                                session_id( $session->getId() );
-                               MediaWiki\quietCall( 'session_start' );
+                               Wikimedia\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 cfbd062..d4605d3 100644 (file)
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -2186,7 +2186,7 @@ abstract class File implements IDBAccessObject {
                        $metadata = $this->getMetadata();
 
                        if ( is_string( $metadata ) ) {
-                               $metadata = MediaWiki\quietCall( 'unserialize', $metadata );
+                               $metadata = Wikimedia\quietCall( 'unserialize', $metadata );
                        }
 
                        if ( !is_array( $metadata ) ) {

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 92b5f17..7cf2749 100644 (file)
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1292,7 +1292,7 @@ class LocalFile extends File {
                $options = [];
                $handler = MediaHandler::getHandler( $props['mime'] );
                if ( $handler ) {
-                       $metadata = MediaWiki\quietCall( 'unserialize', $props['metadata'] );
+                       $metadata = Wikimedia\quietCall( 'unserialize', $props['metadata'] );
 
                        if ( !is_array( $metadata ) ) {
                                $metadata = [];

diff --git a/includes/session/SessionBackend.php b/includes/session/SessionBackend.php
index 44806ed..a376037 100644 (file)
--- a/includes/session/SessionBackend.php
+++ b/includes/session/SessionBackend.php
@@ -243,7 +243,7 @@ final class SessionBackend {
 
                        if ( $restart ) {
                                session_id( (string)$this->id );
-                               \MediaWiki\quietCall( 'session_start' );
+                               \Wikimedia\quietCall( 'session_start' );
                        }
 
                        $this->autosave();
@@ -764,7 +764,7 @@ final class SessionBackend {
                                                'session' => $this->id,
                                ] );
                                session_id( (string)$this->id );
-                               \MediaWiki\quietCall( 'session_start' );
+                               \Wikimedia\quietCall( 'session_start' );
                        }
                }
        }

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index eb13dd1..5db1fa8 100644 (file)
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -305,7 +305,7 @@ class ImportImages extends Maintenance {
                                        $publishOptions = [];
                                        $handler = MediaHandler::getHandler( $props['mime'] );
                                        if ( $handler ) {
-                                               $metadata = MediaWiki\quietCall( 'unserialize', $props['metadata'] );
+                                               $metadata = Wikimedia\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 e460960..ae19278 100644 (file)
--- a/tests/phpunit/includes/session/SessionBackendTest.php
+++ b/tests/phpunit/includes/session/SessionBackendTest.php
@@ -900,7 +900,7 @@ class SessionBackendTest extends MediaWikiTestCase {
                $manager->globalSessionRequest = $request;
 
                session_id( self::SESSIONID );
-               \MediaWiki\quietCall( 'session_start' );
+               \Wikimedia\quietCall( 'session_start' );
                $_SESSION['foo'] = __METHOD__;
                $backend->resetId();
                $this->assertNotEquals( self::SESSIONID, $backend->getId() );
@@ -938,7 +938,7 @@ class SessionBackendTest extends MediaWikiTestCase {
                $manager->globalSessionRequest = $request;
 
                session_id( self::SESSIONID . 'x' );
-               \MediaWiki\quietCall( 'session_start' );
+               \Wikimedia\quietCall( 'session_start' );
                $backend->unpersist();
                $this->assertSame( self::SESSIONID . 'x', session_id() );