Merge "Title: Add warning if newFromText is given non-string/non-null value"

diff --combined includes/Title.php
index 13e7ffb,82df19f..1fdeca8
--- 1/includes/Title.php
--- 2/includes/Title.php
+++ b/includes/Title.php
@@@ -252,7 -252,7 +252,7 @@@ class Title 
         * 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 $text The link text; spaces, prefixes, and an
+        * @param string|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
@@@ -264,13 -264,13 +264,13 @@@
        public static function newFromText( $text, $defaultNamespace = NS_MAIN ) {
                if ( is_object( $text ) ) {
                        throw new InvalidArgumentException( '$text must be a string.' );
-               } elseif ( !is_string( $text ) ) {
+               }
+               if ( $text !== null && !is_string( $text ) ) {
                        wfDebugLog( 'T76305', wfGetAllCallers( 5 ) );
-                       wfWarn(
-                               __METHOD__ . ': $text must be a string. ' .
-                                       'This will throw an InvalidArgumentException in future.',
-                               2
-                       );
+                       return null;
+               }
+               if ( $text === null ) {
+                       return null;
                }
  
                try {
@@@ -296,7 -296,7 +296,7 @@@
         */
        public static function newFromTextThrow( $text, $defaultNamespace = NS_MAIN ) {
                if ( is_object( $text ) ) {
-                       throw new MWException( 'Title::newFromTextThrow given an object' );
+                       throw new MWException( '$text must be a string, given an object' );
                }
  
                $cache = self::getTitleCache();
@@@ -1944,7 -1944,7 +1944,7 @@@
         *   - secure : does cheap and expensive checks, using the master as needed
         * @param array $ignoreErrors Array of Strings Set this to a list of message keys
         *   whose corresponding errors may be ignored.
 -       * @return array Array of arguments to wfMessage to explain permissions problems.
 +       * @return array Array of arrays of the arguments to wfMessage to explain permissions problems.
         */
        public function getUserPermissionsErrors(
                $action, $user, $rigor = 'secure', $ignoreErrors = array()
@@@ -1953,12 -1953,9 +1953,12 @@@
  
                // Remove the errors being ignored.
                foreach ( $errors as $index => $error ) {
 -                      $error_key = is_array( $error ) ? $error[0] : $error;
 +                      $errKey = is_array( $error ) ? $error[0] : $error;
  
 -                      if ( in_array( $error_key, $ignoreErrors ) ) {
 +                      if ( in_array( $errKey, $ignoreErrors ) ) {
 +                              unset( $errors[$index] );
 +                      }
 +                      if ( $errKey instanceof MessageSpecifier && in_array( $errKey->getKey(), $ignoreErrors ) ) {
                                unset( $errors[$index] );
                        }
                }
@@@ -2057,9 -2054,6 +2057,9 @@@
                } elseif ( $result !== '' && is_string( $result ) ) {
                        // A string representing a message-id
                        $errors[] = array( $result );
 +              } elseif ( $result instanceof MessageSpecifier ) {
 +                      // A message specifier representing an error
 +                      $errors[] = array( $result );
                } elseif ( $result === false ) {
                        // a generic "We don't want them to do that"
                        $errors[] = array( 'badaccess-group0' );