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 c1df365..3eb7498 100644 (file)
--- a/tests/phpunit/includes/session/CookieSessionProviderTest.php
+++ b/tests/phpunit/includes/session/CookieSessionProviderTest.php
@@ -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',
@@ -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 ) {