Merge "objectcache: Use faster getArrayCopy() in WAN cache methods"

diff --combined includes/libs/objectcache/WANObjectCache.php
index 6fbe898,58e4e09..0842e04
--- 1/includes/libs/objectcache/WANObjectCache.php
--- 2/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@@ -202,7 -202,8 +202,7 @@@ class WANObjectCache implements IExpiri
        public static function newEmpty() {
                return new self( [
                        'cache'   => new EmptyBagOStuff(),
 -                      'pool'    => 'empty',
 -                      'relayer' => new EventRelayerNull( [] )
 +                      'pool'    => 'empty'
                ] );
        }
  
@@@ -1108,7 -1109,7 +1108,7 @@@
        final public function getMultiWithSetCallback(
                ArrayIterator $keyedIds, $ttl, callable $callback, array $opts = []
        ) {
-               $valueKeys = array_keys( iterator_to_array( $keyedIds, true ) );
+               $valueKeys = array_keys( $keyedIds->getArrayCopy() );
                $checkKeys = isset( $opts['checkKeys'] ) ? $opts['checkKeys'] : [];
  
                // Load required keys into process cache in one go
@@@ -1194,7 -1195,7 +1194,7 @@@
        final public function getMultiWithUnionSetCallback(
                ArrayIterator $keyedIds, $ttl, callable $callback, array $opts = []
        ) {
-               $idsByValueKey = iterator_to_array( $keyedIds, true );
+               $idsByValueKey = $keyedIds->getArrayCopy();
                $valueKeys = array_keys( $idsByValueKey );
                $checkKeys = isset( $opts['checkKeys'] ) ? $opts['checkKeys'] : [];
                unset( $opts['lockTSE'] ); // incompatible