Merge "Consistent behavior of read-only reason"

diff --combined includes/auth/AuthManager.php
index b2528fe,818f778..9407c42
--- 1/includes/auth/AuthManager.php
--- 2/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@@ -975,7 -975,7 +975,7 @@@ class AuthManager implements LoggerAwar
        public function checkAccountCreatePermissions( User $creator ) {
                // Wiki is read-only?
                if ( wfReadOnly() ) {
-                       return Status::newFatal( 'readonlytext', wfReadOnlyReason() );
+                       return Status::newFatal( wfMessage( 'readonlytext', wfReadOnlyReason() ) );
                }
  
                // This is awful, this permission check really shouldn't go through Title.
@@@ -1579,7 -1579,7 +1579,7 @@@
                        ] );
                        $user->setId( 0 );
                        $user->loadFromId();
-                       return Status::newFatal( 'readonlytext', wfReadOnlyReason() );
+                       return Status::newFatal( wfMessage( 'readonlytext', wfReadOnlyReason() ) );
                }
  
                // Check the session, if we tried to create this user already there's
@@@ -2131,7 -2131,7 +2131,7 @@@
         * @param AuthenticationRequest[] &$reqs
         * @param string $action
         * @param string|null $username
 -       * @param boolean $forceAction
 +       * @param bool $forceAction
         */
        private function fillRequests( array &$reqs, $action, $username, $forceAction = false ) {
                foreach ( $reqs as $req ) {

diff --combined includes/page/WikiPage.php
index d5a2f3f,134bb88..edccc66
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -1638,7 -1638,7 +1638,7 @@@ class WikiPage implements Page, IDBAcce
  
        /**
         * @param Content $content Pre-save transform content
 -       * @param integer $flags
 +       * @param int $flags
         * @param User $user
         * @param string $summary
         * @param array $meta
@@@ -1812,7 -1812,7 +1812,7 @@@
  
        /**
         * @param Content $content Pre-save transform content
 -       * @param integer $flags
 +       * @param int $flags
         * @param User $user
         * @param string $summary
         * @param array $meta
@@@ -2111,13 -2111,13 +2111,13 @@@
         * @param Revision $revision
         * @param User $user User object that did the revision
         * @param array $options Array of options, following indexes are used:
 -       * - changed: boolean, whether the revision changed the content (default true)
 -       * - created: boolean, whether the revision created the page (default false)
 -       * - moved: boolean, whether the page was moved (default false)
 -       * - restored: boolean, whether the page was undeleted (default false)
 +       * - changed: bool, whether the revision changed the content (default true)
 +       * - created: bool, whether the revision created the page (default false)
 +       * - moved: bool, whether the page was moved (default false)
 +       * - restored: bool, whether the page was undeleted (default false)
         * - oldrevision: Revision object for the pre-update revision (default null)
 -       * - oldcountable: boolean, null, or string 'no-change' (default null):
 -       *   - boolean: whether the page was counted as an article before that
 +       * - oldcountable: bool, null, or string 'no-change' (default null):
 +       *   - bool: whether the page was counted as an article before that
         *     revision, only used in changed is true and created is false
         *   - null: if created is false, don't update the article count; if created
         *     is true, do update the article count
@@@ -2302,7 -2302,7 +2302,7 @@@
                global $wgCascadingRestrictionLevels, $wgContLang;
  
                if ( wfReadOnly() ) {
-                       return Status::newFatal( 'readonlytext', wfReadOnlyReason() );
+                       return Status::newFatal( wfMessage( 'readonlytext', wfReadOnlyReason() ) );
                }
  
                $this->loadPageData( 'fromdbmaster' );
@@@ -2919,7 -2919,7 +2919,7 @@@
        /**
         * Lock the page row for this title+id and return page_latest (or 0)
         *
 -       * @return integer Returns 0 if no row was found with this title+id
 +       * @return int Returns 0 if no row was found with this title+id
         * @since 1.27
         */
        public function lockAndGetLatest() {
@@@ -3414,7 -3414,7 +3414,7 @@@
         *
         * @param array $added The names of categories that were added
         * @param array $deleted The names of categories that were deleted
 -       * @param integer $id Page ID (this should be the original deleted page ID)
 +       * @param int $id Page ID (this should be the original deleted page ID)
         */
        public function updateCategoryCounts( array $added, array $deleted, $id = 0 ) {
                $id = $id ?: $this->getId();