From: Umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 3 Jul 2019 20:11:51 +0000 (+0200)
Subject: Fix type hints in objectcache related classes
X-Git-Tag: 1.34.0-rc.0~1166^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=24f03d327684bdd7ffc867934b56cc10973618d4

Fix type hints in objectcache related classes

handleException is only used for RedisException
doWrite is also used with single array

Change-Id: I3010457ce2f143f41c4748ec957dfc3333af9761
---

diff --git a/includes/libs/objectcache/MultiWriteBagOStuff.php b/includes/libs/objectcache/MultiWriteBagOStuff.php
index 050338237d..e8327344c7 100644
--- a/includes/libs/objectcache/MultiWriteBagOStuff.php
+++ b/includes/libs/objectcache/MultiWriteBagOStuff.php
@@ -299,7 +299,7 @@ class MultiWriteBagOStuff extends BagOStuff {
 	 * @param int[] $indexes List of backing cache indexes
 	 * @param bool $asyncWrites
 	 * @param string $method Method name of backing caches
-	 * @param array[] $args Arguments to the method of backing caches
+	 * @param array $args Arguments to the method of backing caches
 	 * @return bool
 	 */
 	protected function doWrite( $indexes, $asyncWrites, $method, array $args ) {
diff --git a/includes/libs/objectcache/RedisBagOStuff.php b/includes/libs/objectcache/RedisBagOStuff.php
index 0ba9c3f448..743b9eba2c 100644
--- a/includes/libs/objectcache/RedisBagOStuff.php
+++ b/includes/libs/objectcache/RedisBagOStuff.php
@@ -427,7 +427,7 @@ class RedisBagOStuff extends BagOStuff {
 	 * not. The safest response for us is to explicitly destroy the connection
 	 * object and let it be reopened during the next request.
 	 * @param RedisConnRef $conn
-	 * @param Exception $e
+	 * @param RedisException $e
 	 */
 	protected function handleException( RedisConnRef $conn, $e ) {
 		$this->setLastError( BagOStuff::ERR_UNEXPECTED );