tests: Replace PHPUnit's loose assertEquals(null) with assertNull()

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

diff --git a/tests/phpunit/includes/session/CookieSessionProviderTest.php b/tests/phpunit/includes/session/CookieSessionProviderTest.php
index a47fd9a..3eb7498 100644 (file)
--- a/tests/phpunit/includes/session/CookieSessionProviderTest.php
+++ b/tests/phpunit/includes/session/CookieSessionProviderTest.php
@@ -157,7 +157,7 @@ class CookieSessionProviderTest extends MediaWikiTestCase {
                );
 
                $msg = $provider->whyNoSession();
-               $this->assertInstanceOf( 'Message', $msg );
+               $this->assertInstanceOf( \Message::class, $msg );
                $this->assertSame( 'sessionprovider-nocookies', $msg->getKey() );
        }
 
@@ -376,7 +376,7 @@ class CookieSessionProviderTest extends MediaWikiTestCase {
                ] );
 
                $request = new \FauxRequest();
-               $this->assertEquals( null, $provider->suggestLoginUsername( $request ) );
+               $this->assertNull( $provider->suggestLoginUsername( $request ) );
 
                $request->setCookies( [
                        'xUserName' => 'Example',
@@ -415,7 +415,7 @@ class CookieSessionProviderTest extends MediaWikiTestCase {
                );
                TestingAccessWrapper::newFromObject( $backend )->usePhpSessionHandling = false;
 
-               $mock = $this->getMockBuilder( 'stdClass' )
+               $mock = $this->getMockBuilder( stdClass::class )
                        ->setMethods( [ 'onUserSetCookies' ] )
                        ->getMock();
                $mock->expects( $this->never() )->method( 'onUserSetCookies' );
@@ -519,7 +519,7 @@ class CookieSessionProviderTest extends MediaWikiTestCase {
 
                $normalExpiry = $config->get( 'CookieExpiration' );
                $extendedExpiry = $config->get( 'ExtendedLoginCookieExpiration' );
-               $extendedExpiry = (int)( $extendedExpiry === null ? 0 : $extendedExpiry );
+               $extendedExpiry = (int)( $extendedExpiry ?? 0 );
                $expect = [
                        'MySessionName' => [
                                'value' => (string)$sessionId,
@@ -540,7 +540,7 @@ class CookieSessionProviderTest extends MediaWikiTestCase {
                        'forceHTTPS' => [
                                'value' => $secure ? 'true' : '',
                                'secure' => false,
-                               'expire' => $secure ? $remember ? $defaults['expire'] : 0 : -31536000,
+                               'expire' => $secure ? ( $remember ? $defaults['expire'] : 0 ) : -31536000,
                        ] + $defaults,
                ];
                foreach ( $expect as $key => $value ) {
@@ -563,14 +563,14 @@ class CookieSessionProviderTest extends MediaWikiTestCase {
        }
 
        protected function getSentRequest() {
-               $sentResponse = $this->getMockBuilder( 'FauxResponse' )
+               $sentResponse = $this->getMockBuilder( \FauxResponse::class )
                        ->setMethods( [ 'headersSent', 'setCookie', 'header' ] )->getMock();
                $sentResponse->expects( $this->any() )->method( 'headersSent' )
                        ->will( $this->returnValue( true ) );
                $sentResponse->expects( $this->never() )->method( 'setCookie' );
                $sentResponse->expects( $this->never() )->method( 'header' );
 
-               $sentRequest = $this->getMockBuilder( 'FauxRequest' )
+               $sentRequest = $this->getMockBuilder( \FauxRequest::class )
                        ->setMethods( [ 'response' ] )->getMock();
                $sentRequest->expects( $this->any() )->method( 'response' )
                        ->will( $this->returnValue( $sentResponse ) );
@@ -608,7 +608,7 @@ class CookieSessionProviderTest extends MediaWikiTestCase {
                TestingAccessWrapper::newFromObject( $backend )->usePhpSessionHandling = false;
 
                // Anonymous user
-               $mock = $this->getMockBuilder( 'stdClass' )
+               $mock = $this->getMockBuilder( stdClass::class )
                        ->setMethods( [ 'onUserSetCookies' ] )->getMock();
                $mock->expects( $this->never() )->method( 'onUserSetCookies' );
                $this->mergeMwGlobalArrayValue( 'wgHooks', [ 'UserSetCookies' => [ $mock ] ] );