From 6c0abf937a8e2fd42a2e8b3bc45ff5835042709a Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Mon, 28 Mar 2016 14:53:04 -0400 Subject: [PATCH] Use ::class in place of string constants This takes advantage of namespacing, and avoids having double-backslashes all over the place. Change-Id: I450fe4e9b1c4cf4e24fced3932fe796cbbadf3a3 --- includes/DefaultSettings.php | 8 ++--- includes/user/BotPassword.php | 6 ++-- tests/phpunit/includes/api/ApiLoginTest.php | 6 ++-- .../BotPasswordSessionProviderTest.php | 10 +++--- ...ImmutableSessionProviderWithCookieTest.php | 10 +++--- .../session/PHPSessionHandlerTest.php | 14 ++++---- .../includes/session/SessionBackendTest.php | 10 +++--- .../includes/session/SessionInfoTest.php | 4 +-- .../includes/session/SessionManagerTest.php | 34 +++++++++---------- .../includes/session/SessionProviderTest.php | 16 ++++----- .../phpunit/includes/session/SessionTest.php | 10 +++--- tests/phpunit/includes/session/TestUtils.php | 10 +++--- tests/phpunit/includes/session/TokenTest.php | 2 +- .../phpunit/includes/user/BotPasswordTest.php | 12 +++---- tests/phpunit/phpunit.php | 2 +- 15 files changed, 77 insertions(+), 77 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 711967e3ef..49503594ee 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4631,15 +4631,15 @@ $wgAuthenticationTokenVersion = null; * @since 1.27 */ $wgSessionProviders = [ - 'MediaWiki\\Session\\CookieSessionProvider' => [ - 'class' => 'MediaWiki\\Session\\CookieSessionProvider', + MediaWiki\Session\CookieSessionProvider::class => [ + 'class' => MediaWiki\Session\CookieSessionProvider::class, 'args' => [ [ 'priority' => 30, 'callUserSetCookiesHook' => true, ] ], ], - 'MediaWiki\\Session\\BotPasswordSessionProvider' => [ - 'class' => 'MediaWiki\\Session\\BotPasswordSessionProvider', + MediaWiki\Session\BotPasswordSessionProvider::class => [ + 'class' => MediaWiki\Session\BotPasswordSessionProvider::class, 'args' => [ [ 'priority' => 40, ] ], diff --git a/includes/user/BotPassword.php b/includes/user/BotPassword.php index 7346a90fe9..49a71633c7 100644 --- a/includes/user/BotPassword.php +++ b/includes/user/BotPassword.php @@ -18,6 +18,8 @@ * http://www.gnu.org/copyleft/gpl.html */ +use MediaWiki\Session\BotPasswordSessionProvider; + /** * Utility class for bot passwords * @since 1.27 @@ -401,9 +403,7 @@ class BotPassword implements IDBAccessObject { } $manager = MediaWiki\Session\SessionManager::singleton(); - $provider = $manager->getProvider( - 'MediaWiki\\Session\\BotPasswordSessionProvider' - ); + $provider = $manager->getProvider( BotPasswordSessionProvider::class ); if ( !$provider ) { return Status::newFatal( 'botpasswords-no-provider' ); } diff --git a/tests/phpunit/includes/api/ApiLoginTest.php b/tests/phpunit/includes/api/ApiLoginTest.php index 3052915d78..bcd884eaed 100644 --- a/tests/phpunit/includes/api/ApiLoginTest.php +++ b/tests/phpunit/includes/api/ApiLoginTest.php @@ -193,7 +193,7 @@ class ApiLoginTest extends ApiTestCase { $this->setMwGlobals( [ 'wgSessionProviders' => array_merge( $wgSessionProviders, [ [ - 'class' => 'MediaWiki\\Session\\BotPasswordSessionProvider', + 'class' => MediaWiki\Session\BotPasswordSessionProvider::class, 'args' => [ [ 'priority' => 40 ] ], ] ] ), @@ -207,14 +207,14 @@ class ApiLoginTest extends ApiTestCase { // Make sure our session provider is present $manager = TestingAccessWrapper::newFromObject( MediaWiki\Session\SessionManager::singleton() ); - if ( !isset( $manager->sessionProviders['MediaWiki\\Session\\BotPasswordSessionProvider'] ) ) { + if ( !isset( $manager->sessionProviders[MediaWiki\Session\BotPasswordSessionProvider::class] ) ) { $tmp = $manager->sessionProviders; $manager->sessionProviders = null; $manager->sessionProviders = $tmp + $manager->getProviders(); } $this->assertNotNull( MediaWiki\Session\SessionManager::singleton()->getProvider( - 'MediaWiki\\Session\\BotPasswordSessionProvider' + MediaWiki\Session\BotPasswordSessionProvider::class ), 'sanity check' ); diff --git a/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php b/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php index d76d9dfc8a..edab0dcf4a 100644 --- 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 + [ - 'MediaWiki\\Session\\BotPasswordSessionProvider' => [ - 'class' => 'MediaWiki\\Session\\BotPasswordSessionProvider', + BotPasswordSessionProvider::class => [ + 'class' => BotPasswordSessionProvider::class, 'args' => [ $params ], ] ], @@ -46,7 +46,7 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase { 'store' => new TestBagOStuff, ] ); - return $manager->getProvider( 'MediaWiki\\Session\\BotPasswordSessionProvider' ); + return $manager->getProvider( BotPasswordSessionProvider::class ); } protected function setUp() { @@ -172,7 +172,7 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase { } $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 ); @@ -191,7 +191,7 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase { $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() ); diff --git a/tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php b/tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php index 2412a3b68e..d705fc0191 100644 --- a/tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php +++ b/tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php @@ -24,7 +24,7 @@ class ImmutableSessionProviderWithCookieTest extends MediaWikiTestCase { $params['sessionCookieOptions']['prefix'] = $prefix; } - $provider = $this->getMockBuilder( 'MediaWiki\\Session\\ImmutableSessionProviderWithCookie' ) + $provider = $this->getMockBuilder( ImmutableSessionProviderWithCookie::class ) ->setConstructorArgs( [ $params ] ) ->getMockForAbstractClass(); $provider->setLogger( new \TestLogger() ); @@ -35,13 +35,13 @@ class ImmutableSessionProviderWithCookieTest extends MediaWikiTestCase { } public function testConstructor() { - $provider = $this->getMockBuilder( 'MediaWiki\\Session\\ImmutableSessionProviderWithCookie' ) + $provider = $this->getMockBuilder( ImmutableSessionProviderWithCookie::class ) ->getMockForAbstractClass(); $priv = \TestingAccessWrapper::newFromObject( $provider ); $this->assertNull( $priv->sessionCookieName ); $this->assertSame( [], $priv->sessionCookieOptions ); - $provider = $this->getMockBuilder( 'MediaWiki\\Session\\ImmutableSessionProviderWithCookie' ) + $provider = $this->getMockBuilder( ImmutableSessionProviderWithCookie::class ) ->setConstructorArgs( [ [ 'sessionCookieName' => 'Foo', 'sessionCookieOptions' => [ 'Bar' ], @@ -52,7 +52,7 @@ class ImmutableSessionProviderWithCookieTest extends MediaWikiTestCase { $this->assertSame( [ 'Bar' ], $priv->sessionCookieOptions ); try { - $provider = $this->getMockBuilder( 'MediaWiki\\Session\\ImmutableSessionProviderWithCookie' ) + $provider = $this->getMockBuilder( ImmutableSessionProviderWithCookie::class ) ->setConstructorArgs( [ [ 'sessionCookieName' => false, ] ] ) @@ -66,7 +66,7 @@ class ImmutableSessionProviderWithCookieTest extends MediaWikiTestCase { } try { - $provider = $this->getMockBuilder( 'MediaWiki\\Session\\ImmutableSessionProviderWithCookie' ) + $provider = $this->getMockBuilder( ImmutableSessionProviderWithCookie::class ) ->setConstructorArgs( [ [ 'sessionCookieOptions' => 'x', ] ] ) diff --git a/tests/phpunit/includes/session/PHPSessionHandlerTest.php b/tests/phpunit/includes/session/PHPSessionHandlerTest.php index 05773a9a5c..ce0f1b0611 100644 --- a/tests/phpunit/includes/session/PHPSessionHandlerTest.php +++ b/tests/phpunit/includes/session/PHPSessionHandlerTest.php @@ -23,7 +23,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase { } ); $reset[] = new \ScopedCallback( 'restore_error_handler' ); - $rProp = new \ReflectionProperty( 'MediaWiki\\Session\\PHPSessionHandler', 'instance' ); + $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); if ( $rProp->getValue() ) { $old = \TestingAccessWrapper::newFromObject( $rProp->getValue() ); @@ -31,7 +31,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase { $oldStore = $old->store; $oldLogger = $old->logger; $reset[] = new \ScopedCallback( - [ 'MediaWiki\\Session\\PHPSessionHandler', 'install' ], + [ PHPSessionHandler::class, 'install' ], [ $oldManager, $oldStore, $oldLogger ] ); } @@ -41,13 +41,13 @@ class PHPSessionHandlerTest extends MediaWikiTestCase { public function testEnableFlags() { $handler = \TestingAccessWrapper::newFromObject( - $this->getMockBuilder( 'MediaWiki\\Session\\PHPSessionHandler' ) + $this->getMockBuilder( PHPSessionHandler::class ) ->setMethods( null ) ->disableOriginalConstructor() ->getMock() ); - $rProp = new \ReflectionProperty( 'MediaWiki\\Session\\PHPSessionHandler', 'instance' ); + $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); $reset = new \ScopedCallback( [ $rProp, 'setValue' ], [ $rProp->getValue() ] ); $rProp->setValue( $handler ); @@ -325,9 +325,9 @@ class PHPSessionHandlerTest extends MediaWikiTestCase { * @expectedExceptionMessage Attempt to use PHP session management */ public function testDisabled( $method, $args ) { - $rProp = new \ReflectionProperty( 'MediaWiki\\Session\\PHPSessionHandler', 'instance' ); + $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); - $handler = $this->getMockBuilder( 'MediaWiki\\Session\\PHPSessionHandler' ) + $handler = $this->getMockBuilder( PHPSessionHandler::class ) ->setMethods( null ) ->disableOriginalConstructor() ->getMock(); @@ -354,7 +354,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase { * @expectedExceptionMessageRegExp /: Wrong instance called!$/ */ public function testWrongInstance( $method, $args ) { - $handler = $this->getMockBuilder( 'MediaWiki\\Session\\PHPSessionHandler' ) + $handler = $this->getMockBuilder( PHPSessionHandler::class ) ->setMethods( null ) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/phpunit/includes/session/SessionBackendTest.php b/tests/phpunit/includes/session/SessionBackendTest.php index 7459ed2528..0b5f4c2f8f 100644 --- a/tests/phpunit/includes/session/SessionBackendTest.php +++ b/tests/phpunit/includes/session/SessionBackendTest.php @@ -184,8 +184,8 @@ class SessionBackendTest extends MediaWikiTestCase { $request2 = new \FauxRequest(); $session2 = $backend->getSession( $request2 ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session1 ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session2 ); + $this->assertInstanceOf( Session::class, $session1 ); + $this->assertInstanceOf( Session::class, $session2 ); $this->assertSame( 2, count( $priv->requests ) ); $index = \TestingAccessWrapper::newFromObject( $session1 )->index; @@ -819,7 +819,7 @@ class SessionBackendTest extends MediaWikiTestCase { PHPSessionHandler::install( SessionManager::singleton() ); } if ( !PHPSessionHandler::isEnabled() ) { - $rProp = new \ReflectionProperty( 'MediaWiki\\Session\\PHPSessionHandler', 'instance' ); + $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); $handler = \TestingAccessWrapper::newFromObject( $rProp->getValue() ); $resetHandler = new \ScopedCallback( function () use ( $handler ) { @@ -859,7 +859,7 @@ class SessionBackendTest extends MediaWikiTestCase { PHPSessionHandler::install( SessionManager::singleton() ); } if ( !PHPSessionHandler::isEnabled() ) { - $rProp = new \ReflectionProperty( 'MediaWiki\\Session\\PHPSessionHandler', 'instance' ); + $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); $handler = \TestingAccessWrapper::newFromObject( $rProp->getValue() ); $resetHandler = new \ScopedCallback( function () use ( $handler ) { @@ -895,7 +895,7 @@ class SessionBackendTest extends MediaWikiTestCase { PHPSessionHandler::install( SessionManager::singleton() ); } if ( !PHPSessionHandler::isEnabled() ) { - $rProp = new \ReflectionProperty( 'MediaWiki\\Session\\PHPSessionHandler', 'instance' ); + $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); $handler = \TestingAccessWrapper::newFromObject( $rProp->getValue() ); $resetHandler = new \ScopedCallback( function () use ( $handler ) { diff --git a/tests/phpunit/includes/session/SessionInfoTest.php b/tests/phpunit/includes/session/SessionInfoTest.php index e7021257ba..ff22bfad42 100644 --- a/tests/phpunit/includes/session/SessionInfoTest.php +++ b/tests/phpunit/includes/session/SessionInfoTest.php @@ -61,7 +61,7 @@ class SessionInfoTest extends MediaWikiTestCase { } $manager = new SessionManager(); - $provider = $this->getMockBuilder( 'MediaWiki\\Session\\SessionProvider' ) + $provider = $this->getMockBuilder( SessionProvider::class ) ->setMethods( [ 'persistsSessionId', 'canChangeUser', '__toString' ] ) ->getMockForAbstractClass(); $provider->setManager( $manager ); @@ -72,7 +72,7 @@ class SessionInfoTest extends MediaWikiTestCase { $provider->expects( $this->any() )->method( '__toString' ) ->will( $this->returnValue( 'Mock' ) ); - $provider2 = $this->getMockBuilder( 'MediaWiki\\Session\\SessionProvider' ) + $provider2 = $this->getMockBuilder( SessionProvider::class ) ->setMethods( [ 'persistsSessionId', 'canChangeUser', '__toString' ] ) ->getMockForAbstractClass(); $provider2->setManager( $manager ); diff --git a/tests/phpunit/includes/session/SessionManagerTest.php b/tests/phpunit/includes/session/SessionManagerTest.php index b0f84fcd65..6218f0a728 100644 --- a/tests/phpunit/includes/session/SessionManagerTest.php +++ b/tests/phpunit/includes/session/SessionManagerTest.php @@ -48,7 +48,7 @@ class SessionManagerTest extends MediaWikiTestCase { $reset = TestUtils::setSessionManagerSingleton( null ); $singleton = SessionManager::singleton(); - $this->assertInstanceOf( 'MediaWiki\\Session\\SessionManager', $singleton ); + $this->assertInstanceOf( SessionManager::class, $singleton ); $this->assertSame( $singleton, SessionManager::singleton() ); } @@ -58,7 +58,7 @@ class SessionManagerTest extends MediaWikiTestCase { if ( !PHPSessionHandler::isInstalled() ) { PHPSessionHandler::install( SessionManager::singleton() ); } - $rProp = new \ReflectionProperty( 'MediaWiki\\Session\\PHPSessionHandler', 'instance' ); + $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); $handler = \TestingAccessWrapper::newFromObject( $rProp->getValue() ); $oldEnable = $handler->enable; @@ -191,7 +191,7 @@ class SessionManagerTest extends MediaWikiTestCase { $request->info1 = null; $request->info2 = null; $session = $manager->getSessionForRequest( $request ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( $idEmpty, $session->getId() ); $this->assertFalse( $request->unpersist1 ); $this->assertFalse( $request->unpersist2 ); @@ -210,7 +210,7 @@ class SessionManagerTest extends MediaWikiTestCase { 'idIsSafe' => true, ] ); $session = $manager->getSessionForRequest( $request ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( $id2, $session->getId() ); $this->assertFalse( $request->unpersist1 ); $this->assertFalse( $request->unpersist2 ); @@ -228,7 +228,7 @@ class SessionManagerTest extends MediaWikiTestCase { 'idIsSafe' => true, ] ); $session = $manager->getSessionForRequest( $request ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( $id1, $session->getId() ); $this->assertFalse( $request->unpersist1 ); $this->assertFalse( $request->unpersist2 ); @@ -299,7 +299,7 @@ class SessionManagerTest extends MediaWikiTestCase { 'idIsSafe' => true, ] ); $session = $manager->getSessionForRequest( $request ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( $id2, $session->getId() ); $this->logger->setCollect( false ); $this->assertTrue( $request->unpersist1 ); @@ -321,7 +321,7 @@ class SessionManagerTest extends MediaWikiTestCase { 'idIsSafe' => true, ] ); $session = $manager->getSessionForRequest( $request ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( $id1, $session->getId() ); $this->logger->setCollect( false ); $this->assertFalse( $request->unpersist1 ); @@ -338,7 +338,7 @@ class SessionManagerTest extends MediaWikiTestCase { ] ); $request->info2 = null; $session = $manager->getSessionForRequest( $request ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( $id1, $session->getId() ); $this->assertTrue( $request->unpersist1 ); // The saving of the session does it $this->assertFalse( $request->unpersist2 ); @@ -358,7 +358,7 @@ class SessionManagerTest extends MediaWikiTestCase { // Unknown session ID $id = $manager->generateSessionId(); $session = $manager->getSessionById( $id, true ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( $id, $session->getId() ); $id = $manager->generateSessionId(); @@ -379,7 +379,7 @@ class SessionManagerTest extends MediaWikiTestCase { // Known session ID $this->store->setSession( $id, [] ); $session = $manager->getSessionById( $id, false ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( $id, $session->getId() ); // Store isn't checked if the session is already loaded @@ -388,7 +388,7 @@ class SessionManagerTest extends MediaWikiTestCase { 'userToken' => 'bad', ] ] ); $session2 = $manager->getSessionById( $id, false ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session2 ); + $this->assertInstanceOf( Session::class, $session2 ); $this->assertSame( $id, $session2->getId() ); unset( $session, $session2 ); $this->logger->setCollect( true ); @@ -484,7 +484,7 @@ class SessionManagerTest extends MediaWikiTestCase { ] ); $info2 = null; $session = $manager->getEmptySession(); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( 'empty---------------------------', $session->getId() ); // Info, explicitly @@ -497,7 +497,7 @@ class SessionManagerTest extends MediaWikiTestCase { ] ); $info2 = null; $session = $pmanager->getEmptySessionInternal( null, $expectId ); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( $expectId, $session->getId() ); // Wrong ID @@ -572,7 +572,7 @@ class SessionManagerTest extends MediaWikiTestCase { 'idIsSafe' => true, ] ); $session = $manager->getEmptySession(); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( 'empty1--------------------------', $session->getId() ); $expectId = null; @@ -589,7 +589,7 @@ class SessionManagerTest extends MediaWikiTestCase { 'idIsSafe' => true, ] ); $session = $manager->getEmptySession(); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( Session::class, $session ); $this->assertSame( 'empty2--------------------------', $session->getId() ); // Tied priorities throw an exception @@ -1177,7 +1177,7 @@ class SessionManagerTest extends MediaWikiTestCase { 'provider' => 'Mock', ]; - $builder = $this->getMockBuilder( 'MediaWiki\\Session\\SessionProvider' ) + $builder = $this->getMockBuilder( SessionProvider::class ) ->setMethods( [ '__toString', 'mergeMetadata', 'refreshSessionInfo' ] ); $provider = $builder->getMockForAbstractClass(); @@ -1292,7 +1292,7 @@ class SessionManagerTest extends MediaWikiTestCase { ] ); $this->assertFalse( $info->isIdSafe(), 'sanity check' ); $this->assertTrue( $loadSessionInfoFromStore( $info ) ); - $this->assertInstanceOf( 'MediaWiki\\Session\\UserInfo', $info->getUserInfo() ); + $this->assertInstanceOf( UserInfo::class, $info->getUserInfo() ); $this->assertTrue( $info->getUserInfo()->isVerified() ); $this->assertTrue( $info->getUserInfo()->isAnon() ); $this->assertFalse( $info->isIdSafe() ); diff --git a/tests/phpunit/includes/session/SessionProviderTest.php b/tests/phpunit/includes/session/SessionProviderTest.php index e92eb09d1f..18b1efd460 100644 --- a/tests/phpunit/includes/session/SessionProviderTest.php +++ b/tests/phpunit/includes/session/SessionProviderTest.php @@ -16,7 +16,7 @@ class SessionProviderTest extends MediaWikiTestCase { $logger = new \TestLogger(); $config = new \HashConfig(); - $provider = $this->getMockForAbstractClass( 'MediaWiki\\Session\\SessionProvider' ); + $provider = $this->getMockForAbstractClass( SessionProvider::class ); $priv = \TestingAccessWrapper::newFromObject( $provider ); $provider->setConfig( $config ); @@ -53,7 +53,7 @@ class SessionProviderTest extends MediaWikiTestCase { public function testNewSessionInfo( $persistId, $persistUser, $ok ) { $manager = new SessionManager(); - $provider = $this->getMockBuilder( 'MediaWiki\\Session\\SessionProvider' ) + $provider = $this->getMockBuilder( SessionProvider::class ) ->setMethods( [ 'canChangeUser', 'persistsSessionId' ] ) ->getMockForAbstractClass(); $provider->expects( $this->any() )->method( 'persistsSessionId' ) @@ -80,7 +80,7 @@ class SessionProviderTest extends MediaWikiTestCase { } public function testMergeMetadata() { - $provider = $this->getMockBuilder( 'MediaWiki\\Session\\SessionProvider' ) + $provider = $this->getMockBuilder( SessionProvider::class ) ->getMockForAbstractClass(); try { @@ -112,14 +112,14 @@ class SessionProviderTest extends MediaWikiTestCase { } public function testImmutableSessions() { - $provider = $this->getMockBuilder( 'MediaWiki\\Session\\SessionProvider' ) + $provider = $this->getMockBuilder( SessionProvider::class ) ->setMethods( [ 'canChangeUser', 'persistsSessionId' ] ) ->getMockForAbstractClass(); $provider->expects( $this->any() )->method( 'canChangeUser' ) ->will( $this->returnValue( true ) ); $provider->preventSessionsForUser( 'Foo' ); - $provider = $this->getMockBuilder( 'MediaWiki\\Session\\SessionProvider' ) + $provider = $this->getMockBuilder( SessionProvider::class ) ->setMethods( [ 'canChangeUser', 'persistsSessionId' ] ) ->getMockForAbstractClass(); $provider->expects( $this->any() )->method( 'canChangeUser' ) @@ -142,7 +142,7 @@ class SessionProviderTest extends MediaWikiTestCase { 'SecretKey' => 'Shhh!', ] ); - $provider = $this->getMockForAbstractClass( 'MediaWiki\\Session\\SessionProvider', + $provider = $this->getMockForAbstractClass( SessionProvider::class, [], 'MockSessionProvider' ); $provider->setConfig( $config ); $priv = \TestingAccessWrapper::newFromObject( $provider ); @@ -172,7 +172,7 @@ class SessionProviderTest extends MediaWikiTestCase { } public function testDescribe() { - $provider = $this->getMockForAbstractClass( 'MediaWiki\\Session\\SessionProvider', + $provider = $this->getMockForAbstractClass( SessionProvider::class, [], 'MockSessionProvider' ); $this->assertSame( @@ -182,7 +182,7 @@ class SessionProviderTest extends MediaWikiTestCase { } public function testGetAllowedUserRights() { - $provider = $this->getMockForAbstractClass( 'MediaWiki\\Session\\SessionProvider' ); + $provider = $this->getMockForAbstractClass( SessionProvider::class ); $backend = TestUtils::getDummySessionBackend(); try { diff --git a/tests/phpunit/includes/session/SessionTest.php b/tests/phpunit/includes/session/SessionTest.php index a4727c4364..e87f41d977 100644 --- a/tests/phpunit/includes/session/SessionTest.php +++ b/tests/phpunit/includes/session/SessionTest.php @@ -37,7 +37,7 @@ class SessionTest extends MediaWikiTestCase { * @param bool $ret Whether the method returns a value */ public function testMethods( $m, $args, $index, $ret ) { - $mock = $this->getMock( 'MediaWiki\\Session\\DummySessionBackend', + $mock = $this->getMock( DummySessionBackend::class, [ $m, 'deregisterSession' ] ); $mock->expects( $this->once() )->method( 'deregisterSession' ) ->with( $this->identicalTo( 42 ) ); @@ -224,7 +224,7 @@ class SessionTest extends MediaWikiTestCase { $priv = \TestingAccessWrapper::newFromObject( $session ); $backend = $this->getMock( - 'MediaWiki\\Session\\DummySessionBackend', [ 'canSetUser', 'setUser', 'save' ] + DummySessionBackend::class, [ 'canSetUser', 'setUser', 'save' ] ); $backend->expects( $this->once() )->method( 'canSetUser' ) ->will( $this->returnValue( true ) ); @@ -239,7 +239,7 @@ class SessionTest extends MediaWikiTestCase { $this->assertTrue( $backend->dirty ); $backend = $this->getMock( - 'MediaWiki\\Session\\DummySessionBackend', [ 'canSetUser', 'setUser', 'save' ] + DummySessionBackend::class, [ 'canSetUser', 'setUser', 'save' ] ); $backend->data = []; $backend->expects( $this->once() )->method( 'canSetUser' ) @@ -254,7 +254,7 @@ class SessionTest extends MediaWikiTestCase { $this->assertFalse( $backend->dirty ); $backend = $this->getMock( - 'MediaWiki\\Session\\DummySessionBackend', [ 'canSetUser', 'setUser', 'save' ] + DummySessionBackend::class, [ 'canSetUser', 'setUser', 'save' ] ); $backend->expects( $this->once() )->method( 'canSetUser' ) ->will( $this->returnValue( false ) ); @@ -267,7 +267,7 @@ class SessionTest extends MediaWikiTestCase { } public function testTokens() { - $rc = new \ReflectionClass( 'MediaWiki\\Session\\Session' ); + $rc = new \ReflectionClass( Session::class ); if ( !method_exists( $rc, 'newInstanceWithoutConstructor' ) ) { $this->markTestSkipped( 'ReflectionClass::newInstanceWithoutConstructor isn\'t available' diff --git a/tests/phpunit/includes/session/TestUtils.php b/tests/phpunit/includes/session/TestUtils.php index 36175af26f..f1dc9e994b 100644 --- a/tests/phpunit/includes/session/TestUtils.php +++ b/tests/phpunit/includes/session/TestUtils.php @@ -18,15 +18,15 @@ class TestUtils { session_write_close(); $rInstance = new \ReflectionProperty( - 'MediaWiki\\Session\\SessionManager', 'instance' + SessionManager::class, 'instance' ); $rInstance->setAccessible( true ); $rGlobalSession = new \ReflectionProperty( - 'MediaWiki\\Session\\SessionManager', 'globalSession' + SessionManager::class, 'globalSession' ); $rGlobalSession->setAccessible( true ); $rGlobalSessionRequest = new \ReflectionProperty( - 'MediaWiki\\Session\\SessionManager', 'globalSessionRequest' + SessionManager::class, 'globalSessionRequest' ); $rGlobalSessionRequest->setAccessible( true ); @@ -62,7 +62,7 @@ class TestUtils { * fields necessary. */ public static function getDummySessionBackend() { - $rc = new \ReflectionClass( 'MediaWiki\\Session\\SessionBackend' ); + $rc = new \ReflectionClass( SessionBackend::class ); if ( !method_exists( $rc, 'newInstanceWithoutConstructor' ) ) { \PHPUnit_Framework_Assert::markTestSkipped( 'ReflectionClass::newInstanceWithoutConstructor isn\'t available' @@ -83,7 +83,7 @@ class TestUtils { * @return Session */ public static function getDummySession( $backend = null, $index = -1, $logger = null ) { - $rc = new \ReflectionClass( 'MediaWiki\\Session\\Session' ); + $rc = new \ReflectionClass( Session::class ); if ( !method_exists( $rc, 'newInstanceWithoutConstructor' ) ) { \PHPUnit_Framework_Assert::markTestSkipped( 'ReflectionClass::newInstanceWithoutConstructor isn\'t available' diff --git a/tests/phpunit/includes/session/TokenTest.php b/tests/phpunit/includes/session/TokenTest.php index 47b70aff3c..ca001f3654 100644 --- a/tests/phpunit/includes/session/TokenTest.php +++ b/tests/phpunit/includes/session/TokenTest.php @@ -11,7 +11,7 @@ use MediaWikiTestCase; class TokenTest extends MediaWikiTestCase { public function testBasics() { - $token = $this->getMockBuilder( 'MediaWiki\\Session\\Token' ) + $token = $this->getMockBuilder( Token::class ) ->setMethods( [ 'toStringAtTimestamp' ] ) ->setConstructorArgs( [ 'sekret', 'salty', true ] ) ->getMock(); diff --git a/tests/phpunit/includes/user/BotPasswordTest.php b/tests/phpunit/includes/user/BotPasswordTest.php index d3a5791194..27ce287e32 100644 --- a/tests/phpunit/includes/user/BotPasswordTest.php +++ b/tests/phpunit/includes/user/BotPasswordTest.php @@ -234,7 +234,7 @@ class BotPasswordTest extends MediaWikiTestCase { ] ); $reset = MediaWiki\Session\TestUtils::setSessionManagerSingleton( $manager ); $this->assertNull( - $manager->getProvider( 'MediaWiki\\Session\\BotPasswordSessionProvider' ), + $manager->getProvider( MediaWiki\Session\BotPasswordSessionProvider::class ), 'sanity check' ); $status = BotPassword::login( 'UTSysop@BotPassword', 'foobaz', new FauxRequest ); @@ -245,8 +245,8 @@ class BotPasswordTest extends MediaWikiTestCase { $mainConfig = RequestContext::getMain()->getConfig(); $config = new HashConfig( [ 'SessionProviders' => $mainConfig->get( 'SessionProviders' ) + [ - 'MediaWiki\\Session\\BotPasswordSessionProvider' => [ - 'class' => 'MediaWiki\\Session\\BotPasswordSessionProvider', + MediaWiki\Session\BotPasswordSessionProvider::class => [ + 'class' => MediaWiki\Session\BotPasswordSessionProvider::class, 'args' => [ [ 'priority' => 40 ] ], ] ], @@ -287,7 +287,7 @@ class BotPasswordTest extends MediaWikiTestCase { // Success! $request = new FauxRequest; $this->assertNotInstanceOf( - 'MediaWiki\\Session\\BotPasswordSessionProvider', + MediaWiki\Session\BotPasswordSessionProvider::class, $request->getSession()->getProvider(), 'sanity check' ); @@ -295,9 +295,9 @@ class BotPasswordTest extends MediaWikiTestCase { $this->assertInstanceOf( 'Status', $status ); $this->assertTrue( $status->isGood() ); $session = $status->getValue(); - $this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session ); + $this->assertInstanceOf( MediaWiki\Session\Session::class, $session ); $this->assertInstanceOf( - 'MediaWiki\\Session\\BotPasswordSessionProvider', $session->getProvider() + MediaWiki\Session\BotPasswordSessionProvider::class, $session->getProvider() ); $this->assertSame( $session->getId(), $request->getSession()->getId() ); diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php index 4d060e4f05..77690cdd29 100755 --- a/tests/phpunit/phpunit.php +++ b/tests/phpunit/phpunit.php @@ -116,7 +116,7 @@ class PHPUnitMaintClass extends Maintenance { // cookies to show up in a FauxRequest somewhere. $wgSessionProviders = [ [ - 'class' => 'MediaWiki\\Session\\CookieSessionProvider', + 'class' => MediaWiki\Session\CookieSessionProvider::class, 'args' => [ [ 'priority' => 30, 'callUserSetCookiesHook' => true, -- 2.20.1