site: Streamline Site class using modern PHP features

I believe this makes such code much easier to read and less
error-prone.

Change-Id: I40023b28b934bc75d1217d23ad6ec181312db11e

1 files changed, 6 insertions, 16 deletions

diff --git a/includes/site/Site.php b/includes/site/Site.php
index b70bcb804f70..bf6925c4563a 100644
--- a/includes/site/Site.php
+++ b/includes/site/Site.php
@@ -278,13 +278,8 @@ class Site {
 			throw new UnexpectedValueException( "failed to parse URL '$path'" );
 		}
 
-		// No schema
-		if ( $protocol === null ) {
-			// Used for protocol relative URLs
-			$protocol = '';
-		}
-
-		return $protocol;
+		// Used for protocol relative URLs
+		return $protocol ?? '';
 	}
 
 	/**
@@ -489,9 +484,7 @@ class Site {
 			$this->localIds = [];
 		}
 
-		if ( !array_key_exists( $type, $this->localIds ) ) {
-			$this->localIds[$type] = [];
-		}
+		$this->localIds[$type] ??= [];
 
 		if ( !in_array( $identifier, $this->localIds[$type] ) ) {
 			$this->localIds[$type][] = $identifier;
@@ -528,9 +521,7 @@ class Site {
 	 * @return string[]
 	 */
 	public function getInterwikiIds() {
-		return array_key_exists( self::ID_INTERWIKI, $this->localIds )
-			? $this->localIds[self::ID_INTERWIKI]
-			: [];
+		return $this->localIds[self::ID_INTERWIKI] ?? [];
 	}
 
 	/**
@@ -542,9 +533,7 @@ class Site {
 	 * @return string[]
 	 */
 	public function getNavigationIds() {
-		return array_key_exists( self::ID_EQUIVALENT, $this->localIds )
-			? $this->localIds[self::ID_EQUIVALENT] :
-			[];
+		return $this->localIds[self::ID_EQUIVALENT] ?? [];
 	}
 
 	/**
@@ -618,6 +607,7 @@ class Site {
 	 * @return Site
 	 */
 	public static function newForType( $siteType ) {
+		/** @var class-string<Site>[] $siteTypes */
 		$siteTypes = MediaWikiServices::getInstance()->getMainConfig()->get(
 			MainConfigNames::SiteTypes
 		);