Merge "Make MapCacheLRU throw errors for bad $field arguments"

diff --combined includes/libs/MapCacheLRU.php
index 864880a,a0381de..4f1e7b0
--- 1/includes/libs/MapCacheLRU.php
--- 2/includes/libs/MapCacheLRU.php
+++ b/includes/libs/MapCacheLRU.php
@@@ -64,7 -64,7 +64,7 @@@ class MapCacheLRU implements IExpiringS
                Assert::parameter( $maxKeys > 0, '$maxKeys', 'must be above zero' );
  
                $this->maxCacheKeys = $maxKeys;
 -              // Use the current time as the default "as of" timesamp of entries
 +              // Use the current time as the default "as of" timestamp of entries
                $this->epoch = $this->getCurrentTime();
        }
  
@@@ -141,7 -141,7 +141,7 @@@
        public function has( $key, $maxAge = 0.0 ) {
                if ( !is_int( $key ) && !is_string( $key ) ) {
                        throw new UnexpectedValueException(
-                               __METHOD__ . ' called with invalid key. Must be string or integer.' );
+                               __METHOD__ . ': invalid key; must be string or integer.' );
                }
  
                if ( !array_key_exists( $key, $this->cache ) ) {
@@@ -183,6 -183,11 +183,11 @@@
                        $this->set( $key, [], $initRank );
                }
  
+               if ( !is_int( $field ) && !is_string( $field ) ) {
+                       throw new UnexpectedValueException(
+                               __METHOD__ . ": invalid field for '$key'; must be string or integer." );
+               }
+ 
                if ( !is_array( $this->cache[$key] ) ) {
                        throw new UnexpectedValueException( "The value of '$key' is not an array." );
                }
@@@ -199,6 -204,12 +204,12 @@@
         */
        public function hasField( $key, $field, $maxAge = 0.0 ) {
                $value = $this->get( $key );
+ 
+               if ( !is_int( $field ) && !is_string( $field ) ) {
+                       throw new UnexpectedValueException(
+                               __METHOD__ . ": invalid field for '$key'; must be string or integer." );
+               }
+ 
                if ( !is_array( $value ) || !array_key_exists( $field, $value ) ) {
                        return false;
                }