Merge "Made RepoGroup use ProcessCacheLRU"

diff --cc includes/filerepo/RepoGroup.php
index c6e93b6,039f435..33ab8ae
--- 1/includes/filerepo/RepoGroup.php
--- 2/includes/filerepo/RepoGroup.php
+++ b/includes/filerepo/RepoGroup.php
@@@ -36,13 -35,10 +36,13 @@@ class RepoGroup 
        /** @var bool */
        protected $reposInitialised = false;
  
 +      /** @var array */
        protected $localInfo;
 +
 +      /** @var array */
        protected $foreignInfo;
  
-       /** @var array  */
+       /** @var ProcessCacheLRU  */
        protected $cache;
  
        /** @var RepoGroup */
@@@ -453,32 -428,9 +447,9 @@@
                }
        }
  
-       /**
-        * Move a cache entry to the top (such as when accessed)
-        */
-       protected function pingCache( $key ) {
-               if ( isset( $this->cache[$key] ) ) {
-                       $tmp = $this->cache[$key];
-                       unset( $this->cache[$key] );
-                       $this->cache[$key] = $tmp;
-               }
-       }
- 
-       /**
-        * Limit cache memory
-        */
-       protected function trimCache() {
-               while ( count( $this->cache ) >= self::MAX_CACHE_SIZE ) {
-                       reset( $this->cache );
-                       $key = key( $this->cache );
-                       wfDebug( __METHOD__ . ": evicting $key\n" );
-                       unset( $this->cache[$key] );
-               }
-       }
- 
        /**
         * Clear RepoGroup process cache used for finding a file
 -       * @param $title Title|null Title of the file or null to clear all files
 +       * @param Title|null $title Title of the file or null to clear all files
         */
        public function clearCache( Title $title = null ) {
                if ( $title == null ) {