From: Ori Livneh <ori@wikimedia.org>
Date: Mon, 21 Sep 2015 18:29:50 +0000 (-0700)
Subject: MultiWriteBagOStuff: require nonempty 'caches' param
X-Git-Tag: 1.31.0-rc.0~9936
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=481d5a322164cad7c2249cb1660e5e6afef4ba9c;p=lhc%2Fweb%2Fwiklou.git

MultiWriteBagOStuff: require nonempty 'caches' param

MultiWriteBagOStuff::__construct() barfs if the 'caches' parameter is unset,
but it permits it to be an empty array. This means that subsequent operations
that need to reference the first (primary) cache backend need to check that
it is there at all.

Since there is not much sense in having a MultiWriteBagOStuff object with zero
cache backends, make the constructor require a nonempty array for 'caches', and
remove the subsequent checks that are made redundant by this new restriction.

Change-Id: I30f3e0dcbfe67570a368e64b8233cc0ba7f90b2f
---

diff --git a/includes/objectcache/MultiWriteBagOStuff.php b/includes/objectcache/MultiWriteBagOStuff.php
index b3906596be..329cd7055e 100644
--- a/includes/objectcache/MultiWriteBagOStuff.php
+++ b/includes/objectcache/MultiWriteBagOStuff.php
@@ -61,8 +61,8 @@ class MultiWriteBagOStuff extends BagOStuff {
 	public function __construct( $params ) {
 		parent::__construct( $params );
 
-		if ( !isset( $params['caches'] ) ) {
-			throw new InvalidArgumentException( __METHOD__ . ': "caches" parameter required' );
+		if ( empty( $params['caches'] ) || !is_array( $params['caches'] ) ) {
+			throw new InvalidArgumentException( __METHOD__ . ': "caches" parameter must be an array of caches' );
 		}
 
 		$this->caches = array();
@@ -149,11 +149,7 @@ class MultiWriteBagOStuff extends BagOStuff {
 	 */
 	public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
 		// Lock only the first cache, to avoid deadlocks
-		if ( isset( $this->caches[0] ) ) {
-			return $this->caches[0]->lock( $key, $timeout, $expiry, $rclass );
-		} else {
-			return true;
-		}
+		return $this->caches[0]->lock( $key, $timeout, $expiry, $rclass );
 	}
 
 	/**
@@ -161,11 +157,7 @@ class MultiWriteBagOStuff extends BagOStuff {
 	 * @return bool
 	 */
 	public function unlock( $key ) {
-		if ( isset( $this->caches[0] ) ) {
-			return $this->caches[0]->unlock( $key );
-		} else {
-			return true;
-		}
+		return $this->caches[0]->unlock( $key );
 	}
 
 	/**
@@ -180,13 +172,11 @@ class MultiWriteBagOStuff extends BagOStuff {
 	}
 
 	public function getLastError() {
-		return isset( $this->caches[0] ) ? $this->caches[0]->getLastError() : self::ERR_NONE;
+		return $this->caches[0]->getLastError();
 	}
 
 	public function clearLastError() {
-		if ( isset( $this->caches[0] ) ) {
-			$this->caches[0]->clearLastError();
-		}
+		$this->caches[0]->clearLastError();
 	}
 
 	/**
@@ -208,7 +198,7 @@ class MultiWriteBagOStuff extends BagOStuff {
 				// Secondary write in async mode: do not block this HTTP request
 				$logger = $this->logger;
 				DeferredUpdates::addCallableUpdate(
-					function() use ( $cache, $method, $args, $logger ) {
+					function () use ( $cache, $method, $args, $logger ) {
 						if ( !call_user_func_array( array( $cache, $method ), $args ) ) {
 							$logger->warning( "Async $method op failed" );
 						}