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

Reorg: Move HeaderCallback to Request directory

Browse source 
Cleaning root of includes/

Bug: T321882
Change-Id: I1844da95d4fd79824646fdf4b6063cb771ca3000
This commit is contained in:
Amir Sarabadani 2022-11-02 18:22:08 +01:00
parent 431b9663a1
commit 7690ab4e33
9 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autoload.php
View file

@ -853,6 +853,7 @@ $wgAutoloadLocalClasses = [
'MediaWiki\\Debug\\DeprecatablePropertyArray' => __DIR__ . '/includes/debug/DeprecatablePropertyArray.php',
'MediaWiki\\Export\\WikiExporterFactory' => __DIR__ . '/includes/export/WikiExporterFactory.php',
'MediaWiki\\FileBackend\\FSFile\\TempFSFileFactory' => __DIR__ . '/includes/libs/filebackend/fsfile/TempFSFileFactory.php',
'MediaWiki\\HeaderCallback' => __DIR__ . '/includes/Request/HeaderCallback.php',
'MediaWiki\\Hook\\AbortEmailNotificationHook' => __DIR__ . '/includes/changes/Hook/AbortEmailNotificationHook.php',
'MediaWiki\\Hook\\AbortTalkPageEmailNotificationHook' => __DIR__ . '/includes/mail/Hook/AbortTalkPageEmailNotificationHook.php',
'MediaWiki\\Hook\\ActionBeforeFormDisplayHook' => __DIR__ . '/includes/actions/Hook/ActionBeforeFormDisplayHook.php',

2
includes/GlobalFunctions.php
View file

@ -1287,7 +1287,7 @@ function wfHttpError( $code, $label, $desc ) {
$wgOut->sendCacheControl();
}
MediaWiki\HeaderCallback::warnIfHeadersSent();
\MediaWiki\Request\HeaderCallback::warnIfHeadersSent();
header( 'Content-type: text/html; charset=utf-8' );
ob_start();
print '<!DOCTYPE html>' .

4
includes/HeaderCallback.php → includes/Request/HeaderCallback.php
View file

@ -1,6 +1,6 @@
<?php
namespace MediaWiki;
namespace MediaWiki\Request;
/**
* @since 1.29
@ -113,3 +113,5 @@ class HeaderCallback {
return implode( "\n", $sanitizedValues );
}
}
class_alias( HeaderCallback::class, 'MediaWiki\\HeaderCallback' );

2
includes/ResourceLoader/ResourceLoader.php
View file

@ -34,10 +34,10 @@ use Html;
use HttpStatus;
use InvalidArgumentException;
use Less_Parser;
use MediaWiki\HeaderCallback;
use MediaWiki\HookContainer\HookContainer;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Request\HeaderCallback;
use MediaWiki\User\UserOptionsLookup;
use MWException;
use MWExceptionHandler;

2
includes/Setup.php
View file

@ -51,11 +51,11 @@
*/
// phpcs:disable MediaWiki.Usage.DeprecatedGlobalVariables
use MediaWiki\HeaderCallback;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MainConfigNames;
use MediaWiki\MainConfigSchema;
use MediaWiki\MediaWikiServices;
use MediaWiki\Request\HeaderCallback;
use MediaWiki\Settings\Config\GlobalConfigBuilder;
use MediaWiki\Settings\Config\PhpIniSink;
use MediaWiki\Settings\DynamicDefaultValues;

2
includes/WebResponse.php
View file

@ -68,7 +68,7 @@ class WebResponse {
return;
}
\MediaWiki\HeaderCallback::warnIfHeadersSent();
\MediaWiki\Request\HeaderCallback::warnIfHeadersSent();
if ( $http_response_code ) {
header( $string, $replace, $http_response_code );
} else {

2
includes/libs/HttpStatus.php
View file

@ -101,7 +101,7 @@ class HttpStatus {
return;
}
MediaWiki\HeaderCallback::warnIfHeadersSent();
\MediaWiki\Request\HeaderCallback::warnIfHeadersSent();
if ( $version === null ) {
$version = isset( $_SERVER['SERVER_PROTOCOL'] ) &&
$_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.0' ?

4
tests/phpunit/unit/includes/HeaderCallbackTest.php
View file

@ -1,9 +1,9 @@
<?php
use MediaWiki\HeaderCallback;
use MediaWiki\Request\HeaderCallback;
/**
* @coversDefaultClass MediaWiki\HeaderCallback
* @coversDefaultClass \MediaWiki\Request\HeaderCallback
*/
class HeaderCallbackTest extends MediaWikiUnitTestCase {

4
thumb.php
View file

@ -427,7 +427,7 @@ function wfProxyThumbnailRequest( $img, $thumbName ) {
// Send request to proxied service
$status = $req->execute();
MediaWiki\HeaderCallback::warnIfHeadersSent();
\MediaWiki\Request\HeaderCallback::warnIfHeadersSent();
// Simply serve the response from the proxied service as-is
header( 'HTTP/1.1 ' . $req->getStatus() );
@ -654,7 +654,7 @@ function wfThumbErrorText( $status, $msgText ) {
function wfThumbError( $status, $msgHtml, $msgText = null, $context = [] ) {
global $wgShowHostnames;
MediaWiki\HeaderCallback::warnIfHeadersSent();
\MediaWiki\Request\HeaderCallback::warnIfHeadersSent();
if ( headers_sent() ) {
LoggerFactory::getInstance( 'thumbnail' )->error(