Merge "Fix type annotations"

diff --combined includes/Title.php
index 1507a0d,f8bd8dc..64ff5b4
--- 1/includes/Title.php
--- 2/includes/Title.php
+++ b/includes/Title.php
@@@ -835,7 -835,7 +835,7 @@@ class Title implements LinkTarget 
        /**
         * Returns the DB name of the distant wiki which owns the object.
         *
 -       * @return string The DB name
 +       * @return string|false The DB name
         */
        public function getTransWikiID() {
                if ( !$this->isExternal() ) {
@@@ -974,7 -974,7 +974,7 @@@
        /**
         * Get the namespace text
         *
 -       * @return string Namespace text
 +       * @return string|false Namespace text
         */
        public function getNsText() {
                if ( $this->isExternal() ) {
@@@ -1627,7 -1627,7 +1627,7 @@@
         *
         * @since 1.19 (r105919)
         * @param array|string $query
-        * @param bool $query2
+        * @param string|string[]|bool $query2
         * @return string
         */
        private static function fixUrlQueryArgs( $query, $query2 = false ) {
@@@ -1663,8 -1663,8 +1663,8 @@@
         *
         * @see self::getLocalURL for the arguments.
         * @see wfExpandUrl
-        * @param array|string $query
-        * @param bool $query2
+        * @param string|string[] $query
+        * @param string|string[]|bool $query2
         * @param string $proto Protocol type to use in URL
         * @return string The URL
         */
@@@ -1696,11 -1696,11 +1696,11 @@@
         *  valid to link, locally, to the current Title.
         * @see self::newFromText to produce a Title object.
         *
-        * @param string|array $query An optional query string,
+        * @param string|string[] $query An optional query string,
         *   not used for interwiki links. Can be specified as an associative array as well,
         *   e.g., array( 'action' => 'edit' ) (keys and values will be URL-escaped).
         *   Some query patterns will trigger various shorturl path replacements.
-        * @param array $query2 An optional secondary query array. This one MUST
+        * @param string|string[]|bool $query2 An optional secondary query array. This one MUST
         *   be an array. If a string is passed it will be interpreted as a deprecated
         *   variant argument and urlencoded into a variant= argument.
         *   This second query argument will be added to the $query
@@@ -1795,7 -1795,7 +1795,7 @@@
         * The result obviously should not be URL-escaped, but does need to be
         * HTML-escaped if it's being output in HTML.
         *
-        * @param array $query
+        * @param string|string[] $query
         * @param bool $query2
         * @param string|int|bool $proto A PROTO_* constant on how the URL should be expanded,
         *                               or false (default) for no expansion
@@@ -4436,7 -4436,7 +4436,7 @@@
         * Get the last touched timestamp
         *
         * @param IDatabase $db Optional db
 -       * @return string Last-touched timestamp
 +       * @return string|false Last-touched timestamp
         */
        public function getTouched( $db = null ) {
                if ( $db === null ) {