Merge "Use LinkTarget in TitleValue only methods"

diff --combined includes/Title.php
index 7ec017f,fdd773b..55c7179
--- 1/includes/Title.php
--- 2/includes/Title.php
+++ b/includes/Title.php
@@@ -236,17 -236,28 +236,28 @@@ class Title implements LinkTarget 
         * @return Title
         */
        public static function newFromTitleValue( TitleValue $titleValue ) {
+               return self::newFromLinkTarget( $titleValue );
+       }
+ 
+       /**
+        * Create a new Title from a LinkTarget
+        *
+        * @param LinkTarget $linkTarget Assumed to be safe.
+        *
+        * @return Title
+        */
+       public static function newFromLinkTarget( LinkTarget $linkTarget ) {
                return self::makeTitle(
-                       $titleValue->getNamespace(),
-                       $titleValue->getText(),
-                       $titleValue->getFragment() );
+                       $linkTarget->getNamespace(),
+                       $linkTarget->getText(),
+                       $linkTarget->getFragment() );
        }
  
        /**
         * Create a new Title from text, such as what one would find in a link. De-
         * codes any HTML entities in the text.
         *
 -       * @param string|null $text The link text; spaces, prefixes, and an
 +       * @param string|int|null $text The link text; spaces, prefixes, and an
         *   initial ':' indicating the main namespace are accepted.
         * @param int $defaultNamespace The namespace to use if none is specified
         *   by a prefix.  If you want to force a specific namespace even if
@@@ -259,8 -270,7 +270,8 @@@
                if ( is_object( $text ) ) {
                        throw new InvalidArgumentException( '$text must be a string.' );
                }
 -              if ( $text !== null && !is_string( $text ) ) {
 +              // DWIM: Integers can be passed in here when page titles are used as array keys.
 +              if ( $text !== null && !is_string( $text ) && !is_int( $text ) ) {
                        wfDebugLog( 'T76305', wfGetAllCallers( 5 ) );
                        return null;
                }
@@@ -269,7 -279,7 +280,7 @@@
                }
  
                try {
 -                      return Title::newFromTextThrow( $text, $defaultNamespace );
 +                      return Title::newFromTextThrow( strval( $text ), $defaultNamespace );
                } catch ( MalformedTitleException $ex ) {
                        return null;
                }