X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fparser%2FParserOptions.php;h=7c84b6734ba31d34a12227cd9e392d0689222498;hb=7bbc880626c92055f1ff22deb90d132f8f766160;hp=edd491198953fbe76069aea4c183f5713bd79773;hpb=543723c79254c66f6b6c6e387aa4fc326a697f0e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index edd4911989..7c84b6734b 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -275,7 +275,7 @@ class ParserOptions {
 	 *
 	 * {{int: }} uses this which used to produce inconsistent link tables (bug 14404).
 	 *
-	 * @return Language object
+	 * @return Language
 	 * @since 1.19
 	 */
 	function getUserLangObj() {
@@ -286,7 +286,7 @@ class ParserOptions {
 	/**
 	 * Same as getUserLangObj() but returns a string instead.
 	 *
-	 * @return String Language code
+	 * @return string Language code
 	 * @since 1.17
 	 */
 	function getUserLang() {
@@ -303,7 +303,7 @@ class ParserOptions {
 	function setAllowSpecialInclusion( $x )     { return wfSetVar( $this->mAllowSpecialInclusion, $x ); }
 	function setTidy( $x )                      { return wfSetVar( $this->mTidy, $x ); }
 
-	/** @deprecated in 1.19 */
+	/** @deprecated since 1.19 */
 	function setSkin( $x )                      { wfDeprecated( __METHOD__, '1.19' ); }
 	function setInterfaceMessage( $x )          { return wfSetVar( $this->mInterfaceMessage, $x ); }
 	function setTargetLanguage( $x )            { return wfSetVar( $this->mTargetLanguage, $x, true ); }
@@ -344,8 +344,8 @@ class ParserOptions {
 
 	/**
 	 * Constructor
-	 * @param $user User object
-	 * @param $lang Language object
+	 * @param User $user
+	 * @param Language $lang
 	 */
 	function __construct( $user = null, $lang = null ) {
 		if ( $user === null ) {
@@ -370,8 +370,8 @@ class ParserOptions {
 	 * Get a ParserOptions object from a given user.
 	 * Language will be taken from $wgLang.
 	 *
-	 * @param $user User object
-	 * @return ParserOptions object
+	 * @param User $user
+	 * @return ParserOptions
 	 */
 	public static function newFromUser( $user ) {
 		return new ParserOptions( $user );
@@ -380,9 +380,9 @@ class ParserOptions {
 	/**
 	 * Get a ParserOptions object from a given user and language
 	 *
-	 * @param $user User object
-	 * @param $lang Language object
-	 * @return ParserOptions object
+	 * @param User $user
+	 * @param Language $lang
+	 * @return ParserOptions
 	 */
 	public static function newFromUserAndLang( User $user, Language $lang ) {
 		return new ParserOptions( $user, $lang );
@@ -391,8 +391,8 @@ class ParserOptions {
 	/**
 	 * Get a ParserOptions object from a IContextSource object
 	 *
-	 * @param $context IContextSource object
-	 * @return ParserOptions object
+	 * @param IContextSource $context
+	 * @return ParserOptions
 	 */
 	public static function newFromContext( IContextSource $context ) {
 		return new ParserOptions( $context->getUser(), $context->getLanguage() );
@@ -401,8 +401,8 @@ class ParserOptions {
 	/**
 	 * Get user options
 	 *
-	 * @param $user User object
-	 * @param $lang Language object
+	 * @param User $user
+	 * @param Language $lang
 	 */
 	private function initialiseFromUser( $user, $lang ) {
 		global $wgInterwikiMagic, $wgAllowExternalImages,
@@ -441,6 +441,7 @@ class ParserOptions {
 	/**
 	 * Registers a callback for tracking which ParserOptions which are used.
 	 * This is a private API with the parser.
+	 * @param callable $callback
 	 */
 	function registerWatcher( $callback ) {
 		$this->onAccessCallback = $callback;
@@ -448,7 +449,7 @@ class ParserOptions {
 
 	/**
 	 * Called when an option is accessed.
-	 * @param string $optionName name of the option
+	 * @param string $optionName Name of the option
 	 */
 	public function optionUsed( $optionName ) {
 		if ( $this->onAccessCallback ) {