X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/bilan.php?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fsession%2FSessionBackendTest.php;h=88f58cf06b919af50dd69b6c1041bc44d8618312;hb=45da5815517c408bafed6b3744766860afdcd7b8;hp=0d345dbbdb2444069b17ca701648ccef4239c19d;hpb=331f5d7b276c17a23fca9270ac508da746e8c92e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/session/SessionBackendTest.php b/tests/phpunit/includes/session/SessionBackendTest.php
index 0d345dbbdb..88f58cf06b 100644
--- a/tests/phpunit/includes/session/SessionBackendTest.php
+++ b/tests/phpunit/includes/session/SessionBackendTest.php
@@ -142,7 +142,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 		$this->assertSame( self::SESSIONID, $backend->getId() );
 		$this->assertSame( $id, $backend->getSessionId() );
 		$this->assertSame( $this->provider, $backend->getProvider() );
-		$this->assertInstanceOf( 'User', $backend->getUser() );
+		$this->assertInstanceOf( User::class, $backend->getUser() );
 		$this->assertSame( 'UTSysop', $backend->getUser()->getName() );
 		$this->assertSame( $info->wasPersisted(), $backend->isPersistent() );
 		$this->assertSame( $info->wasRemembered(), $backend->shouldRememberUser() );
@@ -164,7 +164,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 		$this->assertSame( self::SESSIONID, $backend->getId() );
 		$this->assertSame( $id, $backend->getSessionId() );
 		$this->assertSame( $this->provider, $backend->getProvider() );
-		$this->assertInstanceOf( 'User', $backend->getUser() );
+		$this->assertInstanceOf( User::class, $backend->getUser() );
 		$this->assertTrue( $backend->getUser()->isAnon() );
 		$this->assertSame( $info->wasPersisted(), $backend->isPersistent() );
 		$this->assertSame( $info->wasRemembered(), $backend->shouldRememberUser() );
@@ -258,7 +258,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 	public function testResetId() {
 		$id = session_id();
 
-		$builder = $this->getMockBuilder( 'DummySessionProvider' )
+		$builder = $this->getMockBuilder( \DummySessionProvider::class )
 			->setMethods( [ 'persistsSessionId', 'sessionIdWasReset' ] );
 
 		$this->provider = $builder->getMock();
@@ -294,7 +294,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 	}
 
 	public function testPersist() {
-		$this->provider = $this->getMockBuilder( 'DummySessionProvider' )
+		$this->provider = $this->getMockBuilder( \DummySessionProvider::class )
 			->setMethods( [ 'persistSession' ] )->getMock();
 		$this->provider->expects( $this->once() )->method( 'persistSession' );
 		$backend = $this->getBackend();
@@ -314,7 +314,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 	}
 
 	public function testUnpersist() {
-		$this->provider = $this->getMockBuilder( 'DummySessionProvider' )
+		$this->provider = $this->getMockBuilder( \DummySessionProvider::class )
 			->setMethods( [ 'unpersistSession' ] )->getMock();
 		$this->provider->expects( $this->once() )->method( 'unpersistSession' );
 		$backend = $this->getBackend();
@@ -330,7 +330,9 @@ class SessionBackendTest extends MediaWikiTestCase {
 		$backend->unpersist();
 		$this->assertFalse( $backend->isPersistent() );
 		$this->assertFalse( $this->store->getSession( self::SESSIONID ) );
-		$this->assertNotFalse( $wrap->store->get( wfMemcKey( 'MWSession', self::SESSIONID ) ) );
+		$this->assertNotFalse(
+			$wrap->store->get( $wrap->store->makeKey( 'MWSession', self::SESSIONID ) )
+		);
 	}
 
 	public function testRememberUser() {
@@ -365,7 +367,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 	public function testSetUser() {
 		$user = static::getTestSysop()->getUser();
 
-		$this->provider = $this->getMockBuilder( 'DummySessionProvider' )
+		$this->provider = $this->getMockBuilder( \DummySessionProvider::class )
 			->setMethods( [ 'canChangeUser' ] )->getMock();
 		$this->provider->expects( $this->any() )->method( 'canChangeUser' )
 			->will( $this->returnValue( false ) );
@@ -496,7 +498,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 			->setMethods( [ 'onSessionMetadata' ] )->getMock();
 		$neverHook->expects( $this->never() )->method( 'onSessionMetadata' );
 
-		$builder = $this->getMockBuilder( 'DummySessionProvider' )
+		$builder = $this->getMockBuilder( \DummySessionProvider::class )
 			->setMethods( [ 'persistSession', 'unpersistSession' ] );
 
 		$neverProvider = $builder->getMock();
@@ -744,7 +746,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 		$testData = [ 'foo' => 'foo!', 'bar', [ 'baz', null ] ];
 
 		// Not persistent
-		$this->provider = $this->getMockBuilder( 'DummySessionProvider' )
+		$this->provider = $this->getMockBuilder( \DummySessionProvider::class )
 			->setMethods( [ 'persistSession' ] )->getMock();
 		$this->provider->expects( $this->never() )->method( 'persistSession' );
 		$this->onSessionMetadataCalled = false;
@@ -770,7 +772,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 		$this->assertNotEquals( 0, $wrap->expires );
 
 		// Persistent
-		$this->provider = $this->getMockBuilder( 'DummySessionProvider' )
+		$this->provider = $this->getMockBuilder( \DummySessionProvider::class )
 			->setMethods( [ 'persistSession' ] )->getMock();
 		$this->provider->expects( $this->atLeastOnce() )->method( 'persistSession' );
 		$this->onSessionMetadataCalled = false;
@@ -797,7 +799,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 		$this->assertNotEquals( 0, $wrap->expires );
 
 		// Not persistent, not expiring
-		$this->provider = $this->getMockBuilder( 'DummySessionProvider' )
+		$this->provider = $this->getMockBuilder( \DummySessionProvider::class )
 			->setMethods( [ 'persistSession' ] )->getMock();
 		$this->provider->expects( $this->never() )->method( 'persistSession' );
 		$this->onSessionMetadataCalled = false;
@@ -938,7 +940,7 @@ class SessionBackendTest extends MediaWikiTestCase {
 	}
 
 	public function testGetAllowedUserRights() {
-		$this->provider = $this->getMockBuilder( 'DummySessionProvider' )
+		$this->provider = $this->getMockBuilder( \DummySessionProvider::class )
 			->setMethods( [ 'getAllowedUserRights' ] )
 			->getMock();
 		$this->provider->expects( $this->any() )->method( 'getAllowedUserRights' )