dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "add LanguageTest::testEquals for Id7ed6a21c"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
session
/
BotPasswordSessionProviderTest.php
diff --git
a/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php
b/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php
index
5126a42
..
d4b1587
100644
(file)
--- a/
tests/phpunit/includes/session/BotPasswordSessionProviderTest.php
+++ b/
tests/phpunit/includes/session/BotPasswordSessionProviderTest.php
@@
-33,8
+33,8
@@
class BotPasswordSessionProviderTest extends MediaWikiTestCase {
'EnableBotPasswords' => true,
'BotPasswordsDatabase' => false,
'SessionProviders' => $wgSessionProviders + [
'EnableBotPasswords' => true,
'BotPasswordsDatabase' => false,
'SessionProviders' => $wgSessionProviders + [
-
'MediaWiki\\Session\\BotPasswordSessionProvider'
=> [
- 'class' =>
'MediaWiki\\Session\\BotPasswordSessionProvider'
,
+
BotPasswordSessionProvider::class
=> [
+ 'class' =>
BotPasswordSessionProvider::class
,
'args' => [ $params ],
]
],
'args' => [ $params ],
]
],
@@
-46,7
+46,7
@@
class BotPasswordSessionProviderTest extends MediaWikiTestCase {
'store' => new TestBagOStuff,
] );
'store' => new TestBagOStuff,
] );
- return $manager->getProvider(
'MediaWiki\\Session\\BotPasswordSessionProvider'
);
+ return $manager->getProvider(
BotPasswordSessionProvider::class
);
}
protected function setUp() {
}
protected function setUp() {
@@
-65,9
+65,7
@@
class BotPasswordSessionProviderTest extends MediaWikiTestCase {
public function addDBDataOnce() {
$passwordFactory = new \PasswordFactory();
$passwordFactory->init( \RequestContext::getMain()->getConfig() );
public function addDBDataOnce() {
$passwordFactory = new \PasswordFactory();
$passwordFactory->init( \RequestContext::getMain()->getConfig() );
- // A is unsalted MD5 (thus fast) ... we don't care about security here, this is test only
- $passwordFactory->setDefaultType( 'A' );
- $pwhash = $passwordFactory->newFromPlaintext( 'foobaz' );
+ $passwordHash = $passwordFactory->newFromPlaintext( 'foobaz' );
$userId = \CentralIdLookup::factory( 'local' )->centralIdFromName( 'UTSysop' );
$userId = \CentralIdLookup::factory( 'local' )->centralIdFromName( 'UTSysop' );
@@
-82,7
+80,7
@@
class BotPasswordSessionProviderTest extends MediaWikiTestCase {
[
'bp_user' => $userId,
'bp_app_id' => 'BotPasswordSessionProvider',
[
'bp_user' => $userId,
'bp_app_id' => 'BotPasswordSessionProvider',
- 'bp_password' => $p
wh
ash->toString(),
+ 'bp_password' => $p
asswordH
ash->toString(),
'bp_token' => 'token!',
'bp_restrictions' => '{"IPAddresses":["127.0.0.0/8"]}',
'bp_grants' => '["test"]',
'bp_token' => 'token!',
'bp_restrictions' => '{"IPAddresses":["127.0.0.0/8"]}',
'bp_grants' => '["test"]',
@@
-154,7
+152,7
@@
class BotPasswordSessionProviderTest extends MediaWikiTestCase {
public function testBasics() {
$provider = $this->getProvider();
public function testBasics() {
$provider = $this->getProvider();
- $this->assertTrue( $provider->persistsSessionI
D
() );
+ $this->assertTrue( $provider->persistsSessionI
d
() );
$this->assertFalse( $provider->canChangeUser() );
$this->assertNull( $provider->newSessionInfo() );
$this->assertFalse( $provider->canChangeUser() );
$this->assertNull( $provider->newSessionInfo() );
@@
-172,7
+170,7
@@
class BotPasswordSessionProviderTest extends MediaWikiTestCase {
}
$info = $provider->provideSessionInfo( $request );
}
$info = $provider->provideSessionInfo( $request );
- $this->assertInstanceOf(
'MediaWiki\\Session\\SessionInfo'
, $info );
+ $this->assertInstanceOf(
SessionInfo::class
, $info );
$this->assertSame( 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', $info->getId() );
$this->config->set( 'EnableBotPasswords', false );
$this->assertSame( 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', $info->getId() );
$this->config->set( 'EnableBotPasswords', false );
@@
-191,7
+189,7
@@
class BotPasswordSessionProviderTest extends MediaWikiTestCase {
$bp = \BotPassword::newFromUser( $user, 'BotPasswordSessionProvider' );
$session = $provider->newSessionForRequest( $user, $bp, $request );
$bp = \BotPassword::newFromUser( $user, 'BotPasswordSessionProvider' );
$session = $provider->newSessionForRequest( $user, $bp, $request );
- $this->assertInstanceOf(
'MediaWiki\\Session\\Session'
, $session );
+ $this->assertInstanceOf(
Session::class
, $session );
$this->assertEquals( $session->getId(), $request->getSession()->getId() );
$this->assertEquals( $user->getName(), $session->getUser()->getName() );
$this->assertEquals( $session->getId(), $request->getSession()->getId() );
$this->assertEquals( $user->getName(), $session->getUser()->getName() );