Output only to stderr in unit tests

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

diff --git a/tests/phpunit/includes/session/PHPSessionHandlerTest.php b/tests/phpunit/includes/session/PHPSessionHandlerTest.php
index 0a2e84e..045ba2f 100644 (file)
--- a/tests/phpunit/includes/session/PHPSessionHandlerTest.php
+++ b/tests/phpunit/includes/session/PHPSessionHandlerTest.php
@@ -15,15 +15,6 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
        private function getResetter( &$rProp = null ) {
                $reset = [];
 
-               // Ignore "headers already sent" warnings during this test
-               set_error_handler( function ( $errno, $errstr ) use ( &$warnings ) {
-                       if ( preg_match( '/headers already sent/', $errstr ) ) {
-                               return true;
-                       }
-                       return false;
-               } );
-               $reset[] = new \Wikimedia\ScopedCallback( 'restore_error_handler' );
-
                $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' );
                $rProp->setAccessible( true );
                if ( $rProp->getValue() ) {
@@ -109,7 +100,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
                $reset[] = $this->getResetter( $rProp );
 
                $this->setMwGlobals( [
-                       'wgSessionProviders' => [ [ 'class' => 'DummySessionProvider' ] ],
+                       'wgSessionProviders' => [ [ 'class' => \DummySessionProvider::class ] ],
                        'wgObjectCacheSessionExpiry' => 2,
                ] );
 
@@ -130,9 +121,9 @@ class PHPSessionHandlerTest extends MediaWikiTestCase {
                );
                $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\"" );
                }