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

Reorg: Move WebResponse and FauxResponse to Request/

Browse source 
Bug: T321882
Change-Id: Iae8b9e0170c67c1adf861a6d0da45178a7d3cca7
This commit is contained in:
Amir Sarabadani 2023-03-01 18:02:32 +01:00
parent a2f5d2c37c
commit bc1af1a53a
21 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
autoload.php
View file

@ -474,7 +474,7 @@ $wgAutoloadLocalClasses = [
'FatalError' => __DIR__ . '/includes/exception/FatalError.php',
'FauxRequest' => __DIR__ . '/includes/Request/FauxRequest.php',
'FauxRequestUpload' => __DIR__ . '/includes/Request/FauxRequestUpload.php',
'FauxResponse' => __DIR__ . '/includes/FauxResponse.php',
'FauxResponse' => __DIR__ . '/includes/Request/FauxResponse.php',
'FauxSearchResult' => __DIR__ . '/includes/search/FauxSearchResult.php',
'FauxSearchResultSet' => __DIR__ . '/includes/search/FauxSearchResultSet.php',
'FeedItem' => __DIR__ . '/includes/Feed/FeedItem.php',
@ -1651,9 +1651,11 @@ $wgAutoloadLocalClasses = [
'MediaWiki\\Request\\DerivativeRequest' => __DIR__ . '/includes/Request/DerivativeRequest.php',
'MediaWiki\\Request\\FauxRequest' => __DIR__ . '/includes/Request/FauxRequest.php',
'MediaWiki\\Request\\FauxRequestUpload' => __DIR__ . '/includes/Request/FauxRequestUpload.php',
'MediaWiki\\Request\\FauxResponse' => __DIR__ . '/includes/Request/FauxResponse.php',
'MediaWiki\\Request\\HeaderCallback' => __DIR__ . '/includes/Request/HeaderCallback.php',
'MediaWiki\\Request\\PathRouter' => __DIR__ . '/includes/Request/PathRouter.php',
'MediaWiki\\Request\\WebRequestUpload' => __DIR__ . '/includes/Request/WebRequestUpload.php',
'MediaWiki\\Request\\WebResponse' => __DIR__ . '/includes/Request/WebResponse.php',
'MediaWiki\\ResourceLoader\\CircularDependencyError' => __DIR__ . '/includes/ResourceLoader/CircularDependencyError.php',
'MediaWiki\\ResourceLoader\\ClientHtml' => __DIR__ . '/includes/ResourceLoader/ClientHtml.php',
'MediaWiki\\ResourceLoader\\CodexModule' => __DIR__ . '/includes/ResourceLoader/CodexModule.php',
@ -2717,7 +2719,7 @@ $wgAutoloadLocalClasses = [
'WebPHandler' => __DIR__ . '/includes/media/WebPHandler.php',
'WebRequest' => __DIR__ . '/includes/WebRequest.php',
'WebRequestUpload' => __DIR__ . '/includes/Request/WebRequestUpload.php',
'WebResponse' => __DIR__ . '/includes/WebResponse.php',
'WebResponse' => __DIR__ . '/includes/Request/WebResponse.php',
'WikiBirthday' => __DIR__ . '/maintenance/wikiBirthday.php',
'WikiCategoryPage' => __DIR__ . '/includes/page/WikiCategoryPage.php',
'WikiExporter' => __DIR__ . '/includes/export/WikiExporter.php',

1
includes/MediaWiki.php
View file

@ -27,6 +27,7 @@ use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Permissions\PermissionStatus;
use MediaWiki\Request\DerivativeRequest;
use MediaWiki\Request\WebResponse;
use MediaWiki\WikiMap\WikiMap;
use Psr\Log\LoggerInterface;
use Wikimedia\AtEase\AtEase;

1
includes/Request/ContentSecurityPolicy.php
View file

@ -34,7 +34,6 @@ use MediaWiki\HookContainer\HookRunner;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use UnexpectedValueException;
use WebResponse;
class ContentSecurityPolicy {
public const REPORT_ONLY_MODE = 1;

5
includes/FauxResponse.php → includes/Request/FauxResponse.php
View file

@ -21,6 +21,9 @@
* @file
*/
namespace MediaWiki\Request;
use Config;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
@ -184,3 +187,5 @@ class FauxResponse extends WebResponse {
}
}
class_alias( FauxResponse::class, 'FauxResponse' );

7
includes/WebResponse.php → includes/Request/WebResponse.php
View file

@ -20,8 +20,13 @@
* @file
*/
namespace MediaWiki\Request;
use Hooks;
use HttpStatus;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use RuntimeException;
/**
* Allow programs to request this object from WebRequest::response()
@ -271,3 +276,5 @@ class WebResponse {
return (bool)self::$setCookies;
}
}
class_alias( WebResponse::class, 'WebResponse' );

2
includes/Rest/EntryPoint.php
View file

@ -9,6 +9,7 @@ use MediaWiki;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Request\WebResponse;
use MediaWiki\Rest\BasicAccess\CompoundAuthorizer;
use MediaWiki\Rest\BasicAccess\MWBasicAuthorizer;
use MediaWiki\Rest\Reporter\MWErrorReporter;
@ -16,7 +17,6 @@ use MediaWiki\Rest\Validator\Validator;
use MWExceptionRenderer;
use RequestContext;
use Title;
use WebResponse;
use Wikimedia\Message\ITextFormatter;
class EntryPoint {

2
includes/Rest/Handler/ActionModuleBasedHandler.php
View file

@ -8,12 +8,12 @@ use ApiMessage;
use ApiUsageException;
use IApiMessage;
use MediaWiki\Request\FauxRequest;
use MediaWiki\Request\WebResponse;
use MediaWiki\Rest\Handler;
use MediaWiki\Rest\HttpException;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\Response;
use RequestContext;
use WebResponse;
use Wikimedia\Message\ListParam;
use Wikimedia\Message\MessageParam;
use Wikimedia\Message\MessageValue;

2
includes/Rest/Handler/CreationHandler.php
View file

@ -2,11 +2,11 @@
namespace MediaWiki\Rest\Handler;
use MediaWiki\Request\WebResponse;
use MediaWiki\Rest\HttpException;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\Response;
use MediaWiki\Rest\Validator\JsonBodyValidator;
use WebResponse;
use Wikimedia\Message\MessageValue;
use Wikimedia\ParamValidator\ParamValidator;

2
includes/Rest/Handler/EditHandler.php
View file

@ -6,6 +6,7 @@ use Config;
use IApiMessage;
use MediaWiki\Content\IContentHandlerFactory;
use MediaWiki\MainConfigNames;
use MediaWiki\Request\WebResponse;
use MediaWiki\Rest\HttpException;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\Response;
@ -14,7 +15,6 @@ use MediaWiki\Revision\RevisionLookup;
use MediaWiki\Revision\SlotRecord;
use TitleFormatter;
use TitleParser;
use WebResponse;
use Wikimedia\Message\MessageValue;
/**

2
includes/WebRequest.php
View file

@ -26,8 +26,10 @@
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Request\FauxRequest;
use MediaWiki\Request\FauxResponse;
use MediaWiki\Request\PathRouter;
use MediaWiki\Request\WebRequestUpload;
use MediaWiki\Request\WebResponse;
use MediaWiki\Session\Session;
use MediaWiki\Session\SessionId;
use MediaWiki\Session\SessionManager;

2
includes/block/BlockManager.php
View file

@ -26,6 +26,7 @@ use MediaWiki\HookContainer\HookContainer;
use MediaWiki\HookContainer\HookRunner;
use MediaWiki\MainConfigNames;
use MediaWiki\Permissions\PermissionManager;
use MediaWiki\Request\WebResponse;
use MediaWiki\User\UserFactory;
use MediaWiki\User\UserIdentity;
use Message;
@ -33,7 +34,6 @@ use MWCryptHash;
use Psr\Log\LoggerInterface;
use User;
use WebRequest;
use WebResponse;
use Wikimedia\IPSet;
use Wikimedia\IPUtils;

1
tests/phpunit/includes/MediaWikiTest.php
View file

@ -1,6 +1,7 @@
<?php
use MediaWiki\MainConfigNames;
use MediaWiki\Request\WebResponse;
use Wikimedia\TestingAccessWrapper;
class MediaWikiTest extends MediaWikiIntegrationTestCase {

2
tests/phpunit/includes/Rest/EntryPointTest.php
View file

@ -4,13 +4,13 @@ namespace MediaWiki\Tests\Rest;
use GuzzleHttp\Psr7\Stream;
use GuzzleHttp\Psr7\Uri;
use MediaWiki\Request\WebResponse;
use MediaWiki\Rest\CorsUtils;
use MediaWiki\Rest\EntryPoint;
use MediaWiki\Rest\Handler;
use MediaWiki\Rest\RequestData;
use MediaWiki\Rest\RequestInterface;
use RequestContext;
use WebResponse;
/**
* @covers \MediaWiki\Rest\EntryPoint

1
tests/phpunit/includes/api/ApiMainTest.php
View file

@ -4,6 +4,7 @@ use MediaWiki\Language\RawMessage;
use MediaWiki\MainConfigNames;
use MediaWiki\Permissions\Authority;
use MediaWiki\Request\FauxRequest;
use MediaWiki\Request\FauxResponse;
use MediaWiki\StubObject\StubGlobalUser;
use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
use Wikimedia\Rdbms\DBConnRef;

1
tests/phpunit/includes/block/BlockManagerTest.php
View file

@ -6,6 +6,7 @@ use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Block\SystemBlock;
use MediaWiki\MainConfigNames;
use MediaWiki\Request\FauxRequest;
use MediaWiki\Request\FauxResponse;
use Psr\Log\NullLogger;
use Wikimedia\TestingAccessWrapper;

1
tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
View file

@ -2,6 +2,7 @@
use MediaWiki\MainConfigNames;
use MediaWiki\Request\FauxRequest;
use MediaWiki\Request\FauxResponse;
/**
* @covers PageDataRequestHandler

2
tests/phpunit/includes/session/CookieSessionProviderTest.php
View file

@ -598,7 +598,7 @@ class CookieSessionProviderTest extends MediaWikiIntegrationTestCase {
}
protected function getSentRequest() {
$sentResponse = $this->getMockBuilder( \FauxResponse::class )
$sentResponse = $this->getMockBuilder( \MediaWiki\Request\FauxResponse::class )
->onlyMethods( [ 'headersSent', 'setCookie', 'header' ] )->getMock();
$sentResponse->method( 'headersSent' )
->willReturn( true );

2
tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php
View file

@ -161,7 +161,7 @@ class ImmutableSessionProviderWithCookieTest extends MediaWikiIntegrationTestCas
}
protected function getSentRequest() {
$sentResponse = $this->getMockBuilder( \FauxResponse::class )
$sentResponse = $this->getMockBuilder( \MediaWiki\Request\FauxResponse::class )
->onlyMethods( [ 'headersSent', 'setCookie', 'header' ] )
->getMock();
$sentResponse->method( 'headersSent' )

1
tests/phpunit/includes/specials/SpecialPageDataTest.php
View file

@ -1,6 +1,7 @@
<?php
use MediaWiki\Request\FauxRequest;
use MediaWiki\Request\FauxResponse;
/**
* @covers SpecialPageData

1
tests/phpunit/includes/specials/SpecialPageExecutor.php
View file

@ -2,6 +2,7 @@
use MediaWiki\Permissions\Authority;
use MediaWiki\Request\FauxRequest;
use MediaWiki\Request\FauxResponse;
/**
* @author Addshore

1
tests/phpunit/unit/includes/FauxResponseTest.php
View file

@ -21,6 +21,7 @@
*/
use MediaWiki\MainConfigNames;
use MediaWiki\Request\FauxResponse;
class FauxResponseTest extends \MediaWikiUnitTestCase {
/** @var FauxResponse */