Merge "Fix IDEA warnings in FileBackendStore"

diff --combined includes/libs/filebackend/FileBackendStore.php
index d1bda26,96c8f22..b1b7652
--- 1/includes/libs/filebackend/FileBackendStore.php
--- 2/includes/libs/filebackend/FileBackendStore.php
+++ b/includes/libs/filebackend/FileBackendStore.php
@@@ -38,8 -38,6 +38,8 @@@
  abstract class FileBackendStore extends FileBackend {
        /** @var WANObjectCache */
        protected $memCache;
 +      /** @var BagOStuff */
 +      protected $srvCache;
        /** @var ProcessCacheLRU Map of paths to small (RAM/disk) cache items */
        protected $cheapCache;
        /** @var ProcessCacheLRU Map of paths to large (RAM/disk) cache items */
@@@ -60,7 -58,6 +60,7 @@@
        /**
         * @see FileBackend::__construct()
         * Additional $config params include:
 +       *   - srvCache     : BagOStuff cache to APC/XCache or the like.
         *   - wanCache     : WANObjectCache object to use for persistent caching.
         *   - mimeCallback : Callback that takes (storage path, content, file system path) and
         *                    returns the MIME type of the file or 'unknown/unknown'. The file
@@@ -73,7 -70,6 +73,7 @@@
                $this->mimeCallback = isset( $config['mimeCallback'] )
                        ? $config['mimeCallback']
                        : null;
 +              $this->srvCache = new EmptyBagOStuff(); // disabled by default
                $this->memCache = WANObjectCache::newEmpty(); // disabled by default
                $this->cheapCache = new ProcessCacheLRU( self::CACHE_CHEAP_SIZE );
                $this->expensiveCache = new ProcessCacheLRU( self::CACHE_EXPENSIVE_SIZE );
@@@ -675,6 -671,7 +675,7 @@@
  
        /**
         * @see FileBackendStore::getFileStat()
+        * @param array $params
         */
        abstract protected function doGetFileStat( array $params );
  
@@@ -727,6 -724,7 +728,7 @@@
  
        /**
         * @see FileBackendStore::getFileXAttributes()
+        * @param array $params
         * @return bool|string
         */
        protected function doGetFileXAttributes( array $params ) {