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

Reorg: Move ProxyLookup to Request/

Browse source 
It's basically only used there.

Bug: T321882
Change-Id: Ibd9cac69772270b50152572ed618c692bbd5e4d9
This commit is contained in:
Amir Sarabadani 2023-08-06 12:22:58 +02:00
parent 1741cf3ab5
commit 974313663a
7 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
autoload.php
View file

@ -1700,6 +1700,7 @@ $wgAutoloadLocalClasses = [
'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\\ProxyLookup' => __DIR__ . '/includes/Request/ProxyLookup.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',
@ -2352,7 +2353,7 @@ $wgAutoloadLocalClasses = [
'ProtectedPagesPager' => __DIR__ . '/includes/specials/pagers/ProtectedPagesPager.php',
'ProtectedTitlesPager' => __DIR__ . '/includes/specials/pagers/ProtectedTitlesPager.php',
'ProtectionForm' => __DIR__ . '/includes/page/ProtectionForm.php',
'ProxyLookup' => __DIR__ . '/includes/ProxyLookup.php',
'ProxyLookup' => __DIR__ . '/includes/Request/ProxyLookup.php',
'PruneFileCache' => __DIR__ . '/maintenance/pruneFileCache.php',
'PruneUnusedLinkTargetRows' => __DIR__ . '/maintenance/pruneUnusedLinkTargetRows.php',
'PublishStashedFileJob' => __DIR__ . '/includes/jobqueue/jobs/PublishStashedFileJob.php',

2
includes/MediaWikiServices.php
View file

@ -123,6 +123,7 @@ use MediaWiki\Permissions\RestrictionStore;
use MediaWiki\PoolCounter\PoolCounterFactory;
use MediaWiki\Preferences\PreferencesFactory;
use MediaWiki\Preferences\SignatureValidatorFactory;
use MediaWiki\Request\ProxyLookup;
use MediaWiki\ResourceLoader\ResourceLoader;
use MediaWiki\Rest\Handler\Helper\PageRestHelperFactory;
use MediaWiki\Revision\ArchivedRevisionLookup;
@ -180,7 +181,6 @@ use ParserCache;
use ParserFactory;
use PasswordFactory;
use PasswordReset;
use ProxyLookup;
use RepoGroup;
use SearchEngine;
use SearchEngineConfig;

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

@ -19,6 +19,8 @@
* @file
*/
namespace MediaWiki\Request;
use MediaWiki\HookContainer\HookContainer;
use MediaWiki\HookContainer\HookRunner;
use Wikimedia\IPSet;
@ -88,3 +90,5 @@ class ProxyLookup {
return $trusted;
}
}
class_alias( ProxyLookup::class, 'ProxyLookup' );

1
includes/ServiceWiring.php
View file

@ -147,6 +147,7 @@ use MediaWiki\Preferences\DefaultPreferencesFactory;
use MediaWiki\Preferences\PreferencesFactory;
use MediaWiki\Preferences\SignatureValidator;
use MediaWiki\Preferences\SignatureValidatorFactory;
use MediaWiki\Request\ProxyLookup;
use MediaWiki\ResourceLoader\MessageBlobStore;
use MediaWiki\ResourceLoader\ResourceLoader;
use MediaWiki\Rest\Handler\Helper\PageRestHelperFactory;

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

@ -1,6 +1,7 @@
<?php
use MediaWiki\MainConfigNames;
use MediaWiki\Request\ProxyLookup;
/**
* @group WebRequest

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

@ -1544,7 +1544,7 @@ class SessionManagerTest extends MediaWikiIntegrationTestCase {
$request->setIP( $ip );
$request->setCookie( 'mwuser-sessionId', $mwuser );
$proxyLookup = $this->createMock( \ProxyLookup::class );
$proxyLookup = $this->createMock( \MediaWiki\Request\ProxyLookup::class );
$proxyLookup->method( 'isConfiguredProxy' )->willReturnCallback( static function ( $ip ) {
return $ip === '11.22.33.44';
} );

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

@ -21,13 +21,13 @@
namespace MediaWiki\Tests\Unit;
use MediaWiki\HookContainer\HookContainer;
use MediaWiki\Request\ProxyLookup;
use MediaWikiUnitTestCase;
use ProxyLookup;
/**
* @author DannyS712
*
* @coversDefaultClass \ProxyLookup
* @coversDefaultClass \MediaWiki\Request\ProxyLookup
*/
class ProxyLookupTest extends MediaWikiUnitTestCase {