From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 12 Aug 2013 09:28:15 +0200
Subject: Update to MediaWiki 1.21.1

---
 includes/context/DerivativeContext.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'includes/context/DerivativeContext.php')

diff --git a/includes/context/DerivativeContext.php b/includes/context/DerivativeContext.php
index 5adf3621..b9a70068 100644
--- a/includes/context/DerivativeContext.php
+++ b/includes/context/DerivativeContext.php
@@ -30,7 +30,6 @@
  *     a different Title instance set on it.
  */
 class DerivativeContext extends ContextSource {
-
 	/**
 	 * @var WebRequest
 	 */
@@ -68,7 +67,7 @@ class DerivativeContext extends ContextSource {
 
 	/**
 	 * Constructor
-	 * @param $context IContextSource Context to inherit from
+	 * @param IContextSource $context Context to inherit from
 	 */
 	public function __construct( IContextSource $context ) {
 		$this->setContext( $context );
@@ -77,7 +76,7 @@ class DerivativeContext extends ContextSource {
 	/**
 	 * Set the WebRequest object
 	 *
-	 * @param $r WebRequest object
+	 * @param WebRequest $r
 	 */
 	public function setRequest( WebRequest $r ) {
 		$this->request = $r;
@@ -99,7 +98,7 @@ class DerivativeContext extends ContextSource {
 	/**
 	 * Set the Title object
 	 *
-	 * @param $t Title object
+	 * @param Title $t
 	 */
 	public function setTitle( Title $t ) {
 		$this->title = $t;
@@ -140,7 +139,7 @@ class DerivativeContext extends ContextSource {
 	 * Set the WikiPage object
 	 *
 	 * @since 1.19
-	 * @param $p WikiPage object
+	 * @param WikiPage $p
 	 */
 	public function setWikiPage( WikiPage $p ) {
 		$this->wikipage = $p;
@@ -166,7 +165,7 @@ class DerivativeContext extends ContextSource {
 	/**
 	 * Set the OutputPage object
 	 *
-	 * @param $o OutputPage
+	 * @param OutputPage $o
 	 */
 	public function setOutput( OutputPage $o ) {
 		$this->output = $o;
@@ -175,7 +174,7 @@ class DerivativeContext extends ContextSource {
 	/**
 	 * Get the OutputPage object
 	 *
-	 * @return OutputPage object
+	 * @return OutputPage
 	 */
 	public function getOutput() {
 		if ( !is_null( $this->output ) ) {
@@ -188,7 +187,7 @@ class DerivativeContext extends ContextSource {
 	/**
 	 * Set the User object
 	 *
-	 * @param $u User
+	 * @param User $u
 	 */
 	public function setUser( User $u ) {
 		$this->user = $u;
@@ -211,7 +210,7 @@ class DerivativeContext extends ContextSource {
 	 * Set the Language object
 	 *
 	 * @deprecated 1.19 Use setLanguage instead
-	 * @param $l Mixed Language instance or language code
+	 * @param Language|string $l Language instance or language code
 	 */
 	public function setLang( $l ) {
 		wfDeprecated( __METHOD__, '1.19' );
@@ -221,7 +220,8 @@ class DerivativeContext extends ContextSource {
 	/**
 	 * Set the Language object
 	 *
-	 * @param $l Mixed Language instance or language code
+	 * @param Language|string $l Language instance or language code
+	 * @throws MWException
 	 * @since 1.19
 	 */
 	public function setLanguage( $l ) {
@@ -262,7 +262,7 @@ class DerivativeContext extends ContextSource {
 	/**
 	 * Set the Skin object
 	 *
-	 * @param $s Skin
+	 * @param Skin $s
 	 */
 	public function setSkin( Skin $s ) {
 		$this->skin = clone $s;
@@ -281,6 +281,4 @@ class DerivativeContext extends ContextSource {
 			return $this->getContext()->getSkin();
 		}
 	}
-
 }
-
-- 
cgit v1.2.2