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

Make the HookContainer parameter to Rest\Router be required

Browse source 
Depends-On: I21d8eb8b45442e1f6e8ee3a9c9f969f11aabe372
Change-Id: Ie8462d0fa88bb094a8a5820d4dff22ff1077aa1c
This commit is contained in:
Tim Starling 2020-05-19 13:50:08 +10:00
parent 6b05a27987
commit 693286d8a6
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/Rest/Router.php
View file

@ -5,7 +5,6 @@ namespace MediaWiki\Rest;
use AppendIterator;
use BagOStuff;
use MediaWiki\HookContainer\HookContainer;
use MediaWiki\MediaWikiServices;
use MediaWiki\Rest\BasicAccess\BasicAuthorizerInterface;
use MediaWiki\Rest\PathTemplateMatcher\PathMatcher;
use MediaWiki\Rest\Validator\Validator;
@ -71,12 +70,12 @@ class Router {
* @param BasicAuthorizerInterface $basicAuth
* @param ObjectFactory $objectFactory
* @param Validator $restValidator
* @param HookContainer|null $hookContainer
* @param HookContainer $hookContainer
*/
public function __construct( $routeFiles, $extraRoutes, $baseUrl, $rootPath,
BagOStuff $cacheBag, ResponseFactory $responseFactory,
BasicAuthorizerInterface $basicAuth, ObjectFactory $objectFactory,
Validator $restValidator, HookContainer $hookContainer = null
Validator $restValidator, HookContainer $hookContainer
) {
$this->routeFiles = $routeFiles;
$this->extraRoutes = $extraRoutes;
@ -87,11 +86,6 @@ class Router {
$this->basicAuth = $basicAuth;
$this->objectFactory = $objectFactory;
$this->restValidator = $restValidator;
if ( !$hookContainer ) {
// b/c for OAuth extension
$hookContainer = MediaWikiServices::getInstance()->getHookContainer();
}
$this->hookContainer = $hookContainer;
}