Avoid passing null to strcasecmp(), for PHP 8.1

samwilson · samwilson · commit 2a917876614f · 2022-06-11T17:35:37.000+08:00
Bug: T307282
Change-Id: I523928b3f5e0e02e23c45e7023d9d2701d986e5c
diff --git a/includes/session/CookieSessionProvider.php b/includes/session/CookieSessionProvider.php
@@ -98,8 +98,8 @@ protected function postInitSetup() {
 				?: $this->getConfig()->get( MainConfigNames::CookiePrefix ) . '_session',
 		];
 
-		$this->useCrossSiteCookies =
-			strcasecmp( $this->getConfig()->get( MainConfigNames::CookieSameSite ), 'none' ) === 0;
+		$sameSite = $this->getConfig()->get( MainConfigNames::CookieSameSite );
+		$this->useCrossSiteCookies = $sameSite !== null && strcasecmp( $sameSite, 'none' ) === 0;
 
 		// @codeCoverageIgnoreStart
 		$this->cookieOptions += [
@@ -110,7 +110,7 @@ protected function postInitSetup() {
 			'secure' => $this->getConfig()->get( MainConfigNames::CookieSecure )
 				|| $this->getConfig()->get( MainConfigNames::ForceHTTPS ),
 			'httpOnly' => $this->getConfig()->get( MainConfigNames::CookieHttpOnly ),
-			'sameSite' => $this->getConfig()->get( MainConfigNames::CookieSameSite ),
+			'sameSite' => $sameSite,
 		];
 	}
 
