From f208215e8bd08f18c0f78e99f61672639f6f34cc Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 27 Apr 2015 12:55:19 -0700 Subject: [PATCH] Cleaned up a few exceptions and IDE errors in BagOStuff Change-Id: I7ae88009f50c259c20572349b5d01480e36f7cb8 --- includes/libs/objectcache/BagOStuff.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/libs/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php index 5447ee7257..7708eb145d 100644 --- a/includes/libs/objectcache/BagOStuff.php +++ b/includes/libs/objectcache/BagOStuff.php @@ -119,10 +119,11 @@ abstract class BagOStuff implements LoggerAwareInterface { * @param int $exptime Either an interval in seconds or a unix timestamp for expiry * @param int $attempts The amount of times to attempt a merge in case of failure * @return bool Success + * @throws InvalidArgumentException */ public function merge( $key, $callback, $exptime = 0, $attempts = 10 ) { if ( !is_callable( $callback ) ) { - throw new Exception( "Got invalid callback." ); + throw new InvalidArgumentException( "Got invalid callback." ); } return $this->mergeViaLock( $key, $callback, $exptime, $attempts ); @@ -166,6 +167,7 @@ abstract class BagOStuff implements LoggerAwareInterface { * @param mixed $value * @param int $exptime Either an interval in seconds or a unix timestamp for expiry * @return bool Success + * @throws Exception */ protected function cas( $casToken, $key, $value, $exptime = 0 ) { throw new Exception( "CAS is not implemented in " . __CLASS__ ); -- 2.20.1