X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fsession%2FPHPSessionHandlerTest.php;h=0135bb91e1c1c912d51705b034320aef2ed3719d;hp=34e5e449a307a0423c986d1f6847e180882d3881;hb=c7246fc2017718ed5f8f3ae056be478678f8a021;hpb=939199bcea28a3b13c49c0f808d11d415660b924

diff --git a/tests/phpunit/includes/session/PHPSessionHandlerTest.php b/tests/phpunit/includes/session/PHPSessionHandlerTest.php
index 34e5e449a3..0135bb91e1 100644
--- a/tests/phpunit/includes/session/PHPSessionHandlerTest.php
+++ b/tests/phpunit/includes/session/PHPSessionHandlerTest.php
@@ -4,6 +4,7 @@ namespace MediaWiki\Session;
 
 use Psr\Log\LogLevel;
 use MediaWikiTestCase;
+use Wikimedia\TestingAccessWrapper;
 
 /**
  * @group Session
@@ -16,7 +17,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
 
 		// Ignore "headers already sent" warnings during this test
 		set_error_handler( function ( $errno, $errstr ) use ( &$warnings ) {
-			if ( preg_match( '/headers already sent/', $errstr ) ) {
+			if ( preg_match( '/[hH]eaders already sent/', $errstr ) ) {
 				return true;
 			}
 			return false;
@@ -26,7 +27,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
 		$rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' );
 		$rProp->setAccessible( true );
 		if ( $rProp->getValue() ) {
-			$old = \TestingAccessWrapper::newFromObject( $rProp->getValue() );
+			$old = TestingAccessWrapper::newFromObject( $rProp->getValue() );
 			$oldManager = $old->manager;
 			$oldStore = $old->store;
 			$oldLogger = $old->logger;
@@ -40,7 +41,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
 	}
 
 	public function testEnableFlags() {
-		$handler = \TestingAccessWrapper::newFromObject(
+		$handler = TestingAccessWrapper::newFromObject(
 			$this->getMockBuilder( PHPSessionHandler::class )
 				->setMethods( null )
 				->disableOriginalConstructor()
@@ -93,7 +94,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
 		$this->assertFalse( wfIniGetBool( 'session.use_trans_sid' ) );
 
 		$this->assertNotNull( $rProp->getValue() );
-		$priv = \TestingAccessWrapper::newFromObject( $rProp->getValue() );
+		$priv = TestingAccessWrapper::newFromObject( $rProp->getValue() );
 		$this->assertSame( $manager, $priv->manager );
 		$this->assertSame( $store, $priv->store );
 		$this->assertSame( $logger, $priv->logger );
@@ -108,7 +109,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
 		$reset[] = $this->getResetter( $rProp );
 
 		$this->setMwGlobals( [
-			'wgSessionProviders' => [ [ 'class' => 'DummySessionProvider' ] ],
+			'wgSessionProviders' => [ [ 'class' => \DummySessionProvider::class ] ],
 			'wgObjectCacheSessionExpiry' => 2,
 		] );
 
@@ -122,16 +123,16 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
 			'logger' => $logger,
 		] );
 		PHPSessionHandler::install( $manager );
-		$wrap = \TestingAccessWrapper::newFromObject( $rProp->getValue() );
+		$wrap = TestingAccessWrapper::newFromObject( $rProp->getValue() );
 		$reset[] = new \Wikimedia\ScopedCallback(
 			[ $wrap, 'setEnableFlags' ],
 			[ $wrap->enable ? $wrap->warn ? 'warn' : 'enable' : 'disable' ]
 		);
 		$wrap->setEnableFlags( 'warn' );
 
-		\MediaWiki\suppressWarnings();
+		\Wikimedia\suppressWarnings();
 		ini_set( 'session.serialize_handler', $handler );
-		\MediaWiki\restoreWarnings();
+		\Wikimedia\restoreWarnings();
 		if ( ini_get( 'session.serialize_handler' ) !== $handler ) {
 			$this->markTestSkipped( "Cannot set session.serialize_handler to \"$handler\"" );
 		}
@@ -323,7 +324,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
 			->setMethods( null )
 			->disableOriginalConstructor()
 			->getMock();
-		\TestingAccessWrapper::newFromObject( $handler )->setEnableFlags( 'disable' );
+		TestingAccessWrapper::newFromObject( $handler )->setEnableFlags( 'disable' );
 		$oldValue = $rProp->getValue();
 		$rProp->setValue( $handler );
 		$reset = new \Wikimedia\ScopedCallback( [ $rProp, 'setValue' ], [ $oldValue ] );
@@ -350,7 +351,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
 			->setMethods( null )
 			->disableOriginalConstructor()
 			->getMock();
-		\TestingAccessWrapper::newFromObject( $handler )->setEnableFlags( 'enable' );
+		TestingAccessWrapper::newFromObject( $handler )->setEnableFlags( 'enable' );
 
 		call_user_func_array( [ $handler, $method ], $args );
 	}