From 7f01755fdf193828cd7c722a8b044daf5f4466c0 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 20 Oct 2015 03:17:36 +0100
Subject: [PATCH] CacheLRU: Simplify >0 assertion and remove verbose inline
 comment

* Consistently refer to above zero as '> 0', not ">= 1" or "not <= 0".

* Remove superfluous comment that say what ping() does.

Change-Id: I25d276faa555e02feb99e656eb9cb7071f8205c0
---
 includes/libs/MapCacheLRU.php     | 13 ++++++-------
 includes/libs/ProcessCacheLRU.php | 12 +++++-------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/includes/libs/MapCacheLRU.php b/includes/libs/MapCacheLRU.php
index a0230bee83..a49eb0106c 100644
--- a/includes/libs/MapCacheLRU.php
+++ b/includes/libs/MapCacheLRU.php
@@ -39,11 +39,11 @@ class MapCacheLRU {
 
 	/**
 	 * @param int $maxKeys Maximum number of entries allowed (min 1).
-	 * @throws Exception When $maxCacheKeys is not an int or =< 0.
+	 * @throws Exception When $maxCacheKeys is not an int or not above zero.
 	 */
 	public function __construct( $maxKeys ) {
 		Assert::parameterType( 'integer', $maxKeys, '$maxKeys' );
-		Assert::parameter( $maxKeys >= 1, '$maxKeys', 'must be >= 1' );
+		Assert::parameter( $maxKeys > 0, '$maxKeys', 'must be above zero' );
 
 		$this->maxCacheKeys = $maxKeys;
 	}
@@ -59,7 +59,7 @@ class MapCacheLRU {
 	 */
 	public function set( $key, $value ) {
 		if ( array_key_exists( $key, $this->cache ) ) {
-			$this->ping( $key ); // push to top
+			$this->ping( $key );
 		} elseif ( count( $this->cache ) >= $this->maxCacheKeys ) {
 			reset( $this->cache );
 			$evictKey = key( $this->cache );
@@ -87,12 +87,11 @@ class MapCacheLRU {
 	 * @return mixed
 	 */
 	public function get( $key ) {
-		if ( array_key_exists( $key, $this->cache ) ) {
-			$this->ping( $key ); // push to top
-			return $this->cache[$key];
-		} else {
+		if ( !array_key_exists( $key, $this->cache ) ) {
 			return null;
 		}
+		$this->ping( $key );
+		return $this->cache[$key];
 	}
 
 	/**
diff --git a/includes/libs/ProcessCacheLRU.php b/includes/libs/ProcessCacheLRU.php
index b55ff9da8b..eec31cee56 100644
--- a/includes/libs/ProcessCacheLRU.php
+++ b/includes/libs/ProcessCacheLRU.php
@@ -55,7 +55,7 @@ class ProcessCacheLRU {
 	 */
 	public function set( $key, $prop, $value ) {
 		if ( isset( $this->cache[$key] ) ) {
-			$this->ping( $key ); // push to top
+			$this->ping( $key );
 		} elseif ( count( $this->cache ) >= $this->maxCacheKeys ) {
 			reset( $this->cache );
 			$evictKey = key( $this->cache );
@@ -94,13 +94,11 @@ class ProcessCacheLRU {
 	 * @return mixed
 	 */
 	public function get( $key, $prop ) {
-		if ( isset( $this->cache[$key][$prop] ) ) {
-			// push to top
-			$this->ping( $key );
-			return $this->cache[$key][$prop];
-		} else {
+		if ( !isset( $this->cache[$key][$prop] ) ) {
 			return null;
 		}
+		$this->ping( $key );
+		return $this->cache[$key][$prop];
 	}
 
 	/**
@@ -130,7 +128,7 @@ class ProcessCacheLRU {
 	 */
 	public function resize( $maxKeys ) {
 		Assert::parameterType( 'integer', $maxKeys, '$maxKeys' );
-		Assert::parameter( $maxKeys >= 1, '$maxKeys', 'must be >= 1' );
+		Assert::parameter( $maxKeys > 0, '$maxKeys', 'must be above zero' );
 
 		$this->maxCacheKeys = $maxKeys;
 		while ( count( $this->cache ) > $this->maxCacheKeys ) {
-- 
2.20.1