Merge "Add any prior block to BlockIpComplete hook"

[lhc/web/wiklou.git] / tests / phpunit / includes / session / SessionInfoTest.php

diff --git a/tests/phpunit/includes/session/SessionInfoTest.php b/tests/phpunit/includes/session/SessionInfoTest.php
index f9c9b8e..8f7b2a6 100644 (file)
--- a/tests/phpunit/includes/session/SessionInfoTest.php
+++ b/tests/phpunit/includes/session/SessionInfoTest.php
@@ -17,35 +17,35 @@ class SessionInfoTest extends MediaWikiTestCase {
                $unverifiedUserInfo = UserInfo::newFromName( 'UTSysop', false );
 
                try {
-                       new SessionInfo( SessionInfo::MIN_PRIORITY - 1, array() );
+                       new SessionInfo( SessionInfo::MIN_PRIORITY - 1, [] );
                        $this->fail( 'Expected exception not thrown', 'priority < min' );
                } catch ( \InvalidArgumentException $ex ) {
                        $this->assertSame( 'Invalid priority', $ex->getMessage(), 'priority < min' );
                }
 
                try {
-                       new SessionInfo( SessionInfo::MAX_PRIORITY + 1, array() );
+                       new SessionInfo( SessionInfo::MAX_PRIORITY + 1, [] );
                        $this->fail( 'Expected exception not thrown', 'priority > max' );
                } catch ( \InvalidArgumentException $ex ) {
                        $this->assertSame( 'Invalid priority', $ex->getMessage(), 'priority > max' );
                }
 
                try {
-                       new SessionInfo( SessionInfo::MIN_PRIORITY, array( 'id' => 'ABC?' ) );
+                       new SessionInfo( SessionInfo::MIN_PRIORITY, [ 'id' => 'ABC?' ] );
                        $this->fail( 'Expected exception not thrown', 'bad session ID' );
                } catch ( \InvalidArgumentException $ex ) {
                        $this->assertSame( 'Invalid session ID', $ex->getMessage(), 'bad session ID' );
                }
 
                try {
-                       new SessionInfo( SessionInfo::MIN_PRIORITY, array( 'userInfo' => new \stdClass ) );
+                       new SessionInfo( SessionInfo::MIN_PRIORITY, [ 'userInfo' => new \stdClass ] );
                        $this->fail( 'Expected exception not thrown', 'bad userInfo' );
                } catch ( \InvalidArgumentException $ex ) {
                        $this->assertSame( 'Invalid userInfo', $ex->getMessage(), 'bad userInfo' );
                }
 
                try {
-                       new SessionInfo( SessionInfo::MIN_PRIORITY, array() );
+                       new SessionInfo( SessionInfo::MIN_PRIORITY, [] );
                        $this->fail( 'Expected exception not thrown', 'no provider, no id' );
                } catch ( \InvalidArgumentException $ex ) {
                        $this->assertSame( 'Must supply an ID when no provider is given', $ex->getMessage(),
@@ -53,7 +53,7 @@ class SessionInfoTest extends MediaWikiTestCase {
                }
 
                try {
-                       new SessionInfo( SessionInfo::MIN_PRIORITY, array( 'copyFrom' => new \stdClass ) );
+                       new SessionInfo( SessionInfo::MIN_PRIORITY, [ 'copyFrom' => new \stdClass ] );
                        $this->fail( 'Expected exception not thrown', 'bad copyFrom' );
                } catch ( \InvalidArgumentException $ex ) {
                        $this->assertSame( 'Invalid copyFrom', $ex->getMessage(),
@@ -61,8 +61,8 @@ class SessionInfoTest extends MediaWikiTestCase {
                }
 
                $manager = new SessionManager();
-               $provider = $this->getMockBuilder( 'MediaWiki\\Session\\SessionProvider' )
-                       ->setMethods( array( 'persistsSessionId', 'canChangeUser', '__toString' ) )
+               $provider = $this->getMockBuilder( SessionProvider::class )
+                       ->setMethods( [ 'persistsSessionId', 'canChangeUser', '__toString' ] )
                        ->getMockForAbstractClass();
                $provider->setManager( $manager );
                $provider->expects( $this->any() )->method( 'persistsSessionId' )
@@ -72,8 +72,8 @@ class SessionInfoTest extends MediaWikiTestCase {
                $provider->expects( $this->any() )->method( '__toString' )
                        ->will( $this->returnValue( 'Mock' ) );
 
-               $provider2 = $this->getMockBuilder( 'MediaWiki\\Session\\SessionProvider' )
-                       ->setMethods( array( 'persistsSessionId', 'canChangeUser', '__toString' ) )
+               $provider2 = $this->getMockBuilder( SessionProvider::class )
+                       ->setMethods( [ 'persistsSessionId', 'canChangeUser', '__toString' ] )
                        ->getMockForAbstractClass();
                $provider2->setManager( $manager );
                $provider2->expects( $this->any() )->method( 'persistsSessionId' )
@@ -84,54 +84,57 @@ class SessionInfoTest extends MediaWikiTestCase {
                        ->will( $this->returnValue( 'Mock2' ) );
 
                try {
-                       new SessionInfo( SessionInfo::MIN_PRIORITY, array(
+                       new SessionInfo( SessionInfo::MIN_PRIORITY, [
                                'provider' => $provider,
                                'userInfo' => $anonInfo,
                                'metadata' => 'foo',
-                       ) );
+                       ] );
                        $this->fail( 'Expected exception not thrown', 'bad metadata' );
                } catch ( \InvalidArgumentException $ex ) {
                        $this->assertSame( 'Invalid metadata', $ex->getMessage(), 'bad metadata' );
                }
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'provider' => $provider,
                        'userInfo' => $anonInfo
-               ) );
+               ] );
                $this->assertSame( $provider, $info->getProvider() );
                $this->assertNotNull( $info->getId() );
                $this->assertSame( SessionInfo::MIN_PRIORITY + 5, $info->getPriority() );
                $this->assertSame( $anonInfo, $info->getUserInfo() );
                $this->assertTrue( $info->isIdSafe() );
+               $this->assertFalse( $info->forceUse() );
                $this->assertFalse( $info->wasPersisted() );
                $this->assertFalse( $info->wasRemembered() );
                $this->assertFalse( $info->forceHTTPS() );
                $this->assertNull( $info->getProviderMetadata() );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'provider' => $provider,
                        'userInfo' => $unverifiedUserInfo,
-                       'metadata' => array( 'Foo' ),
-               ) );
+                       'metadata' => [ 'Foo' ],
+               ] );
                $this->assertSame( $provider, $info->getProvider() );
                $this->assertNotNull( $info->getId() );
                $this->assertSame( SessionInfo::MIN_PRIORITY + 5, $info->getPriority() );
                $this->assertSame( $unverifiedUserInfo, $info->getUserInfo() );
                $this->assertTrue( $info->isIdSafe() );
+               $this->assertFalse( $info->forceUse() );
                $this->assertFalse( $info->wasPersisted() );
                $this->assertFalse( $info->wasRemembered() );
                $this->assertFalse( $info->forceHTTPS() );
-               $this->assertSame( array( 'Foo' ), $info->getProviderMetadata() );
+               $this->assertSame( [ 'Foo' ], $info->getProviderMetadata() );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'provider' => $provider,
                        'userInfo' => $userInfo
-               ) );
+               ] );
                $this->assertSame( $provider, $info->getProvider() );
                $this->assertNotNull( $info->getId() );
                $this->assertSame( SessionInfo::MIN_PRIORITY + 5, $info->getPriority() );
                $this->assertSame( $userInfo, $info->getUserInfo() );
                $this->assertTrue( $info->isIdSafe() );
+               $this->assertFalse( $info->forceUse() );
                $this->assertFalse( $info->wasPersisted() );
                $this->assertTrue( $info->wasRemembered() );
                $this->assertFalse( $info->forceHTTPS() );
@@ -139,175 +142,201 @@ class SessionInfoTest extends MediaWikiTestCase {
 
                $id = $manager->generateSessionId();
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'provider' => $provider,
                        'id' => $id,
                        'persisted' => true,
                        'userInfo' => $anonInfo
-               ) );
+               ] );
                $this->assertSame( $provider, $info->getProvider() );
                $this->assertSame( $id, $info->getId() );
                $this->assertSame( SessionInfo::MIN_PRIORITY + 5, $info->getPriority() );
                $this->assertSame( $anonInfo, $info->getUserInfo() );
                $this->assertFalse( $info->isIdSafe() );
+               $this->assertFalse( $info->forceUse() );
                $this->assertTrue( $info->wasPersisted() );
                $this->assertFalse( $info->wasRemembered() );
                $this->assertFalse( $info->forceHTTPS() );
                $this->assertNull( $info->getProviderMetadata() );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'provider' => $provider,
                        'id' => $id,
                        'userInfo' => $userInfo
-               ) );
+               ] );
                $this->assertSame( $provider, $info->getProvider() );
                $this->assertSame( $id, $info->getId() );
                $this->assertSame( SessionInfo::MIN_PRIORITY + 5, $info->getPriority() );
                $this->assertSame( $userInfo, $info->getUserInfo() );
                $this->assertFalse( $info->isIdSafe() );
+               $this->assertFalse( $info->forceUse() );
                $this->assertFalse( $info->wasPersisted() );
                $this->assertTrue( $info->wasRemembered() );
                $this->assertFalse( $info->forceHTTPS() );
                $this->assertNull( $info->getProviderMetadata() );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'id' => $id,
                        'persisted' => true,
                        'userInfo' => $userInfo,
-                       'metadata' => array( 'Foo' ),
-               ) );
+                       'metadata' => [ 'Foo' ],
+               ] );
                $this->assertSame( $id, $info->getId() );
                $this->assertSame( SessionInfo::MIN_PRIORITY + 5, $info->getPriority() );
                $this->assertSame( $userInfo, $info->getUserInfo() );
                $this->assertFalse( $info->isIdSafe() );
+               $this->assertFalse( $info->forceUse() );
                $this->assertTrue( $info->wasPersisted() );
                $this->assertFalse( $info->wasRemembered() );
                $this->assertFalse( $info->forceHTTPS() );
                $this->assertNull( $info->getProviderMetadata() );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'id' => $id,
                        'remembered' => true,
                        'userInfo' => $userInfo,
-               ) );
+               ] );
                $this->assertFalse( $info->wasRemembered(), 'no provider' );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'provider' => $provider,
                        'id' => $id,
                        'remembered' => true,
-               ) );
+               ] );
                $this->assertFalse( $info->wasRemembered(), 'no user' );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'provider' => $provider,
                        'id' => $id,
                        'remembered' => true,
                        'userInfo' => $anonInfo,
-               ) );
+               ] );
                $this->assertFalse( $info->wasRemembered(), 'anonymous user' );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'provider' => $provider,
                        'id' => $id,
                        'remembered' => true,
                        'userInfo' => $unverifiedUserInfo,
-               ) );
+               ] );
                $this->assertFalse( $info->wasRemembered(), 'unverified user' );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'provider' => $provider,
                        'id' => $id,
                        'remembered' => false,
                        'userInfo' => $userInfo,
-               ) );
+               ] );
                $this->assertFalse( $info->wasRemembered(), 'specific override' );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
                        'id' => $id,
                        'idIsSafe' => true,
-               ) );
+               ] );
                $this->assertSame( $id, $info->getId() );
                $this->assertSame( SessionInfo::MIN_PRIORITY + 5, $info->getPriority() );
                $this->assertTrue( $info->isIdSafe() );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
+                       'id' => $id,
+                       'forceUse' => true,
+               ] );
+               $this->assertFalse( $info->forceUse(), 'no provider' );
+
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
+                       'provider' => $provider,
+                       'forceUse' => true,
+               ] );
+               $this->assertFalse( $info->forceUse(), 'no id' );
+
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 5, [
+                       'provider' => $provider,
+                       'id' => $id,
+                       'forceUse' => true,
+               ] );
+               $this->assertTrue( $info->forceUse(), 'correct use' );
+
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY, [
                        'id' => $id,
                        'forceHTTPS' => 1,
-               ) );
+               ] );
                $this->assertTrue( $info->forceHTTPS() );
 
-               $fromInfo = new SessionInfo( SessionInfo::MIN_PRIORITY, array(
+               $fromInfo = new SessionInfo( SessionInfo::MIN_PRIORITY, [
                        'id' => $id . 'A',
                        'provider' => $provider,
                        'userInfo' => $userInfo,
                        'idIsSafe' => true,
+                       'forceUse' => true,
                        'persisted' => true,
                        'remembered' => true,
                        'forceHTTPS' => true,
-                       'metadata' => array( 'foo!' ),
-               ) );
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 4, array(
+                       'metadata' => [ 'foo!' ],
+               ] );
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 4, [
                        'copyFrom' => $fromInfo,
-               ) );
+               ] );
                $this->assertSame( $id . 'A', $info->getId() );
                $this->assertSame( SessionInfo::MIN_PRIORITY + 4, $info->getPriority() );
                $this->assertSame( $provider, $info->getProvider() );
                $this->assertSame( $userInfo, $info->getUserInfo() );
                $this->assertTrue( $info->isIdSafe() );
+               $this->assertTrue( $info->forceUse() );
                $this->assertTrue( $info->wasPersisted() );
                $this->assertTrue( $info->wasRemembered() );
                $this->assertTrue( $info->forceHTTPS() );
-               $this->assertSame( array( 'foo!' ), $info->getProviderMetadata() );
+               $this->assertSame( [ 'foo!' ], $info->getProviderMetadata() );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 4, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY + 4, [
                        'id' => $id . 'X',
                        'provider' => $provider2,
                        'userInfo' => $unverifiedUserInfo,
                        'idIsSafe' => false,
+                       'forceUse' => false,
                        'persisted' => false,
                        'remembered' => false,
                        'forceHTTPS' => false,
                        'metadata' => null,
                        'copyFrom' => $fromInfo,
-               ) );
+               ] );
                $this->assertSame( $id . 'X', $info->getId() );
                $this->assertSame( SessionInfo::MIN_PRIORITY + 4, $info->getPriority() );
                $this->assertSame( $provider2, $info->getProvider() );
                $this->assertSame( $unverifiedUserInfo, $info->getUserInfo() );
                $this->assertFalse( $info->isIdSafe() );
+               $this->assertFalse( $info->forceUse() );
                $this->assertFalse( $info->wasPersisted() );
                $this->assertFalse( $info->wasRemembered() );
                $this->assertFalse( $info->forceHTTPS() );
                $this->assertNull( $info->getProviderMetadata() );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY, [
                        'id' => $id,
-               ) );
+               ] );
                $this->assertSame(
                        '[' . SessionInfo::MIN_PRIORITY . "]null<null>$id",
                        (string)$info,
                        'toString'
                );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY, [
                        'provider' => $provider,
                        'id' => $id,
                        'persisted' => true,
                        'userInfo' => $userInfo
-               ) );
+               ] );
                $this->assertSame(
                        '[' . SessionInfo::MIN_PRIORITY . "]Mock<+:{$userInfo->getId()}:UTSysop>$id",
                        (string)$info,
                        'toString'
                );
 
-               $info = new SessionInfo( SessionInfo::MIN_PRIORITY, array(
+               $info = new SessionInfo( SessionInfo::MIN_PRIORITY, [
                        'provider' => $provider,
                        'id' => $id,
                        'persisted' => true,
                        'userInfo' => $unverifiedUserInfo
-               ) );
+               ] );
                $this->assertSame(
                        '[' . SessionInfo::MIN_PRIORITY . "]Mock<-:{$userInfo->getId()}:UTSysop>$id",
                        (string)$info,
@@ -317,8 +346,8 @@ class SessionInfoTest extends MediaWikiTestCase {
 
        public function testCompare() {
                $id = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
-               $info1 = new SessionInfo( SessionInfo::MIN_PRIORITY + 1, array( 'id' => $id ) );
-               $info2 = new SessionInfo( SessionInfo::MIN_PRIORITY + 2, array( 'id' => $id ) );
+               $info1 = new SessionInfo( SessionInfo::MIN_PRIORITY + 1, [ 'id' => $id ] );
+               $info2 = new SessionInfo( SessionInfo::MIN_PRIORITY + 2, [ 'id' => $id ] );
 
                $this->assertTrue( SessionInfo::compare( $info1, $info2 ) < 0, '<' );
                $this->assertTrue( SessionInfo::compare( $info2, $info1 ) > 0, '>' );