Add some casts for sanity before BagOStuff::add() calls

Change-Id: I6ecb609c88e4fc1ef614e94c551199bd610ca360

diff --git a/includes/objectcache/BagOStuff.php b/includes/objectcache/BagOStuff.php
index 56f1be2..dca5f32 100644 (file)
--- a/includes/objectcache/BagOStuff.php
+++ b/includes/objectcache/BagOStuff.php
@@ -338,7 +338,7 @@ abstract class BagOStuff {
         */
        public function incrWithInit( $key, $ttl, $value = 1, $init = 1 ) {
                return $this->incr( $key, $value ) ||
-                       $this->add( $key, $init, $ttl ) || $this->incr( $key, $value );
+                       $this->add( $key, (int)$init, $ttl ) || $this->incr( $key, $value );
        }
 
        /**

diff --git a/includes/utils/UIDGenerator.php b/includes/utils/UIDGenerator.php
index e2013b0..0ce90c1 100644 (file)
--- a/includes/utils/UIDGenerator.php
+++ b/includes/utils/UIDGenerator.php
@@ -285,7 +285,7 @@ class UIDGenerator {
                if ( $cache ) {
                        $counter = $cache->incr( $bucket, $count );
                        if ( $counter === false ) {
-                               if ( !$cache->add( $bucket, $count ) ) {
+                               if ( !$cache->add( $bucket, (int)$count ) ) {
                                        throw new MWException( 'Unable to set value to ' . get_class( $cache ) );
                                }
                                $counter = $count;