From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 22 Apr 2019 08:21:50 +0000 (-0700)
Subject: Avoid various phpstorm warnings in MediaWikiServices due to "object" return hint
X-Git-Tag: 1.34.0-rc.0~1743
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=8e71dbbfc2edefb453cb1a12b801e1672aa01e50;p=lhc%2Fweb%2Fwiklou.git

Avoid various phpstorm warnings in MediaWikiServices due to "object" return hint

Change-Id: Icbd115104d34e3c7f4075902e75484c4779637eb
---

diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index d6f50bf8aa..9dbfc1bec7 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -225,6 +225,7 @@ class MediaWikiServices extends ServiceContainer {
 		}
 	}
 
+	/** @noinspection PhpDocSignatureInspection */
 	/**
 	 * Salvages the state of any salvageable service instances in $other.
 	 *
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index a30534e865..9b064ce703 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -43,6 +43,7 @@ use MediaWiki\Block\BlockManager;
 use MediaWiki\Block\BlockRestrictionStore;
 use MediaWiki\Config\ConfigRepository;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\Linker\LinkRenderer;
@@ -170,7 +171,7 @@ return [
 		return new DateFormatterFactory;
 	},
 
-	'DBLoadBalancer' => function ( MediaWikiServices $services ) : Wikimedia\Rdbms\LoadBalancer {
+	'DBLoadBalancer' => function ( MediaWikiServices $services ) : Wikimedia\Rdbms\ILoadBalancer {
 		// just return the default LB from the DBLoadBalancerFactory service
 		return $services->getDBLoadBalancerFactory()->getMainLB();
 	},
@@ -212,8 +213,8 @@ return [
 	},
 
 	'HttpRequestFactory' =>
-	function ( MediaWikiServices $services ) : \MediaWiki\Http\HttpRequestFactory {
-		return new \MediaWiki\Http\HttpRequestFactory();
+	function ( MediaWikiServices $services ) : HttpRequestFactory {
+		return new HttpRequestFactory();
 	},
 
 	'InterwikiLookup' => function ( MediaWikiServices $services ) : InterwikiLookup {
diff --git a/includes/libs/services/ServiceContainer.php b/includes/libs/services/ServiceContainer.php
index 59e5c4bdb8..25d1d6a311 100644
--- a/includes/libs/services/ServiceContainer.php
+++ b/includes/libs/services/ServiceContainer.php
@@ -399,7 +399,7 @@ class ServiceContainer implements DestructibleService {
 	 * @throws ContainerDisabledException if this container has already been destroyed.
 	 * @throws ServiceDisabledException if the requested service has been disabled.
 	 *
-	 * @return object The service instance
+	 * @return mixed The service instance
 	 */
 	public function getService( $name ) {
 		if ( $this->destroyed ) {