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

Merge "ActorMigration: remove unused UserFactory"

Browse source
This commit is contained in:
jenkins-bot 2021-03-10 22:05:11 +00:00 committed by Gerrit Code Review
commit 2465a9dbc2
3 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/ActorMigration.php
View file

@ -22,7 +22,6 @@
use MediaWiki\MediaWikiServices;
use MediaWiki\User\ActorStoreFactory;
use MediaWiki\User\UserFactory;
use MediaWiki\User\UserIdentity;
use Wikimedia\IPUtils;
use Wikimedia\Rdbms\IDatabase;
@ -110,21 +109,16 @@ class ActorMigration {
/** @var int Combination of SCHEMA_COMPAT_* constants */
private $stage;
/** @var UserFactory */
private $userFactory;
/** @var ActorStoreFactory */
private $actorStoreFactory;
/**
* @param int $stage
* @param UserFactory $userFactory
* @param ActorStoreFactory $actorStoreFactory
* @internal
*/
public function __construct(
$stage,
UserFactory $userFactory,
ActorStoreFactory $actorStoreFactory
) {
if ( ( $stage & SCHEMA_COMPAT_WRITE_BOTH ) === 0 ) {
@ -144,7 +138,6 @@ class ActorMigration {
}
$this->stage = $stage;
$this->userFactory = $userFactory;
$this->actorStoreFactory = $actorStoreFactory;
}

1
includes/ServiceWiring.php
View file

@ -144,7 +144,6 @@ return [
'ActorMigration' => static function ( MediaWikiServices $services ) : ActorMigration {
return new ActorMigration(
SCHEMA_COMPAT_NEW,
$services->getUserFactory(),
$services->getActorStoreFactory()
);
},

4
tests/phpunit/includes/ActorMigrationTest.php
View file

@ -32,7 +32,6 @@ class ActorMigrationTest extends MediaWikiLangTestCase {
$mwServices = MediaWikiServices::getInstance();
return new class(
$stage,
$mwServices->getUserFactory(),
$mwServices->getActorStoreFactory()
) extends ActorMigration {
protected const TEMP_TABLES = [
@ -656,7 +655,6 @@ class ActorMigrationTest extends MediaWikiLangTestCase {
$this->hideDeprecated( 'ActorMigration::getInsertValuesWithTempTable for am1_user' );
$m = new class(
$stage,
MediaWikiServices::getInstance()->getUserFactory(),
MediaWikiServices::getInstance()->getActorStoreFactory()
) extends ActorMigration {
protected const FORMER_TEMP_TABLES = [ 'am1_user' => '1.30' ];
@ -673,7 +671,6 @@ class ActorMigrationTest extends MediaWikiLangTestCase {
public function testInsertWithTempTableCallbackMissingFields( $stage ) {
$m = new class(
$stage,
MediaWikiServices::getInstance()->getUserFactory(),
MediaWikiServices::getInstance()->getActorStoreFactory()
) extends ActorMigration {
protected const TEMP_TABLES = [
@ -772,7 +769,6 @@ class ActorMigrationTest extends MediaWikiLangTestCase {
public function testCheckDeprecation() {
$m = new class(
SCHEMA_COMPAT_NEW,
MediaWikiServices::getInstance()->getUserFactory(),
MediaWikiServices::getInstance()->getActorStoreFactory()
) extends ActorMigration {
protected const DEPRECATED = [ 'soft' => null, 'hard' => '1.34' ];