Merge "language: Fix nullable documentation for property, args and return types"

includes/changes/ChangesListFilterGroup.php

@@ -88,7 +88,7 @@ abstract class ChangesListFilterGroup {
 	 * Priority integer.  Higher values means higher up in the
 	 * group list.
 	 *
-	 * @var string
+	 * @var int
 	 */
 	protected $priority;
 

includes/language/ConverterRule.php

@@ -66,7 +66,7 @@ class ConverterRule {
 	 * Check if variants array in convert array.
 	 *
 	 * @param array|string $variants Variant language code
-	 * @return string Translated text
+	 * @return string|false Translated text
 	 */
 	public function getTextInBidtable( $variants ) {
 		$variants = (array)$variants;

includes/language/ILanguageConverter.php

@@ -49,7 +49,7 @@ interface ILanguageConverter {
 
 	/**
 	 * Get the title produced by the conversion rule.
-	 * @return string The converted title text
+	 * @return string|false The converted title text
 	 */
 	public function getConvRuleTitle();
 

includes/language/Language.php

@@ -1820,7 +1820,7 @@ class Language {
 	 *
 	 * @param int $year
 	 *
-	 * @return string
+	 * @return int
 	 */
 	private static function hebrewYearStart( $year ) {
 		$a = ( 12 * ( $year - 1 ) + 17 ) % 19;
@@ -2097,9 +2097,9 @@ class Language {
 	 * Used by date() and time() to adjust the time output.
 	 *
 	 * @param string $ts The time in date('YmdHis') format
-	 * @param mixed $tz Adjust the time by this amount (default false, mean we
+	 * @param string|false $tz Adjust the time by this amount (default false, mean we
 	 *   get user timecorrection setting)
-	 * @return int
+	 * @return string
 	 */
 	public function userAdjust( $ts, $tz = false ) {
 		global $wgLocalTZoffset;
@@ -4390,7 +4390,7 @@ class Language {
 	 * @param string $filename $prefix . $languageCode . $suffix
 	 * @param string $prefix Prefix before the language code
 	 * @param string $suffix Suffix after the language code
-	 * @return string Language code, or false if $prefix or $suffix isn't found
+	 * @return string|false Language code, or false if $prefix or $suffix isn't found
 	 */
 	public static function getCodeFromFileName( $filename, $prefix = 'Language', $suffix = '.php' ) {
 		$m = null;
@@ -4783,7 +4783,7 @@ class Language {
 	 *
 	 * @deprecated since 1.35 use LanguageConverter::getConvRuleTitle instead
 	 *
-	 * @return string
+	 * @return string|false
 	 */
 	public function getConvRuleTitle() {
 		return $this->getConverter()->getConvRuleTitle();

includes/language/Message.php

@@ -200,12 +200,12 @@ class Message implements MessageSpecifier, Serializable {
 	protected $contextPage = null;
 
 	/**
-	 * @var Content Content object representing the message.
+	 * @var Content|null Content object representing the message.
 	 */
 	protected $content = null;
 
 	/**
-	 * @var string
+	 * @var string|null
 	 */
 	protected $message;