From a36be914c308c7f2c6c57a4702224ee9101c981c Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Sun, 11 May 2014 11:08:36 +0200
Subject: [PATCH] Pass phpcs-strict on includes/objectcache/

Change-Id: Ib99f2e34255df0cc846727b134d1788aec48529d
---
 includes/objectcache/HashBagOStuff.php       |  3 +-
 includes/objectcache/MemcachedClient.php     |  1 +
 includes/objectcache/MultiWriteBagOStuff.php |  3 +-
 includes/objectcache/ObjectCache.php         |  7 +--
 includes/objectcache/SqlBagOStuff.php        | 49 +++++++++++++-------
 5 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/includes/objectcache/HashBagOStuff.php b/includes/objectcache/HashBagOStuff.php
index db0e579922..6e50a8c39f 100644
--- a/includes/objectcache/HashBagOStuff.php
+++ b/includes/objectcache/HashBagOStuff.php
@@ -28,7 +28,8 @@
  * @ingroup Cache
  */
 class HashBagOStuff extends BagOStuff {
-	var $bag;
+	/** @var array */
+	protected $bag;
 
 	function __construct() {
 		$this->bag = array();
diff --git a/includes/objectcache/MemcachedClient.php b/includes/objectcache/MemcachedClient.php
index bc59c6ff05..9de840b62c 100644
--- a/includes/objectcache/MemcachedClient.php
+++ b/includes/objectcache/MemcachedClient.php
@@ -1,4 +1,5 @@
 <?php
+// @codingStandardsIgnoreFile It's an external lib and it isn't. Let's not bother.
 /**
  * Memcached client for PHP.
  *
diff --git a/includes/objectcache/MultiWriteBagOStuff.php b/includes/objectcache/MultiWriteBagOStuff.php
index c656bdd698..497f75d2d6 100644
--- a/includes/objectcache/MultiWriteBagOStuff.php
+++ b/includes/objectcache/MultiWriteBagOStuff.php
@@ -29,7 +29,8 @@
  * @ingroup Cache
  */
 class MultiWriteBagOStuff extends BagOStuff {
-	var $caches;
+	/** @var array BagOStuff[] */
+	protected $caches;
 
 	/**
 	 * Constructor. Parameters are:
diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 3be251ceb4..0009999aed 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -27,7 +27,7 @@
  * @ingroup Cache
  */
 class ObjectCache {
-	static $instances = array();
+	public static $instances = array();
 
 	/**
 	 * Get a cached instance of the specified type of cache object.
@@ -87,8 +87,9 @@ class ObjectCache {
 			$class = $params['class'];
 			return new $class( $params );
 		} else {
-			throw new MWException( "The definition of cache type \"" . print_r( $params, true ) . "\" lacks both " .
-				"factory and class parameters." );
+			throw new MWException( "The definition of cache type \""
+				. print_r( $params, true ) . "\" lacks both "
+				. "factory and class parameters." );
 		}
 	}
 
diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php
index e6a8c45ed9..bcd5942879 100644
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -27,22 +27,37 @@
  * @ingroup Cache
  */
 class SqlBagOStuff extends BagOStuff {
-	/**
-	 * @var LoadBalancer
-	 */
-	var $lb;
+	/** @var LoadBalancer */
+	protected $lb;
+
+	protected $serverInfos;
+
+	/** @var array */
+	protected $serverNames;
+
+	/** @var int */
+	protected $numServers;
+
+	/** @var array */
+	protected $conns;
+
+	/** @var int */
+	protected $lastExpireAll = 0;
 
-	var $serverInfos;
-	var $serverNames;
-	var $numServers;
-	var $conns;
-	var $lastExpireAll = 0;
-	var $purgePeriod = 100;
-	var $shards = 1;
-	var $tableName = 'objectcache';
+	/** @var int */
+	protected $purgePeriod = 100;
 
-	protected $connFailureTimes = array(); // UNIX timestamps
-	protected $connFailureErrors = array(); // exceptions
+	/** @var int */
+	protected $shards = 1;
+
+	/** @var string */
+	protected $tableName = 'objectcache';
+
+	/** @var array UNIX timestamps */
+	protected $connFailureTimes = array();
+
+	/** @var array Exceptions */
+	protected $connFailureErrors = array();
 
 	/**
 	 * Constructor. Parameters are:
@@ -721,7 +736,8 @@ class SqlBagOStuff extends BagOStuff {
 		if ( $exception->db && $exception->db->wasReadOnlyError() ) {
 			try {
 				$exception->db->rollback( __METHOD__ );
-			} catch ( DBError $e ) {}
+			} catch ( DBError $e ) {
+			}
 		}
 		wfDebugLog( 'SQLBagOStuff', "DBError: {$exception->getMessage()}" );
 		if ( $exception instanceof DBConnectionError ) {
@@ -780,4 +796,5 @@ class SqlBagOStuff extends BagOStuff {
 /**
  * Backwards compatibility alias
  */
-class MediaWikiBagOStuff extends SqlBagOStuff { }
+class MediaWikiBagOStuff extends SqlBagOStuff {
+}
-- 
2.20.1