Merge "Cleanups to MigrateFileRepoLayout"

diff --combined includes/filerepo/file/File.php
index fc9870a,9a7c21c..43d1eb5
--- 1/includes/filerepo/file/File.php
--- 2/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@@ -574,7 -574,7 +574,7 @@@ abstract class File implements IDBAcces
         * In files that support multiple language, what is the default language
         * to use if none specified.
         *
 -       * @return string Lang code, or null if filetype doesn't support multiple languages.
 +       * @return string|null Lang code, or null if filetype doesn't support multiple languages.
         * @since 1.23
         */
        public function getDefaultRenderLanguage() {
@@@ -922,7 -922,7 +922,7 @@@
         *
         * @param array $params Handler-specific parameters
         * @param int $flags Bitfield that supports THUMB_* constants
 -       * @return string
 +       * @return string|null
         */
        public function thumbName( $params, $flags = 0 ) {
                $name = ( $this->repo && !( $flags & self::THUMB_FULL_NAME ) )
@@@ -937,7 -937,7 +937,7 @@@
         *
         * @param string $name
         * @param array $params Parameters which will be passed to MediaHandler::makeParamString
 -       * @return string
 +       * @return string|null
         */
        public function generateThumbName( $name, $params ) {
                if ( !$this->getHandler() ) {
@@@ -1444,7 -1444,7 +1444,7 @@@
         * @param string $end Only revisions newer than $end will be returned
         * @param bool $inc Include the endpoints of the time range
         *
-        * @return array
+        * @return File[]
         */
        function getHistory( $limit = null, $start = null, $end = null, $inc = true ) {
                return array();

diff --combined includes/filerepo/file/LocalFile.php
index 1bccf81,0092e17..0db3195
--- 1/includes/filerepo/file/LocalFile.php
--- 2/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@@ -433,7 -433,7 +433,7 @@@ class LocalFile extends File 
        }
  
        /**
 -       * @param DatabaseBase $dbr
 +       * @param IDatabase $dbr
         * @param string $fname
         * @return array|bool
         */
@@@ -986,7 -986,7 +986,7 @@@
         * @param int $start Optional: Timestamp, start from
         * @param int $end Optional: Timestamp, end at
         * @param bool $inc
-        * @return array
+        * @return OldLocalFile[]
         */
        function getHistory( $limit = null, $start = null, $end = null, $inc = true ) {
                $dbr = $this->repo->getSlaveDB();