X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStubObject.php;h=2052c44842585489963f75eab4b906e567bf40cf;hb=b17ac5d24e0d6a459b562c16a05fce868059c918;hp=067f11f63ee6169560425e07fc952d8f07b80f10;hpb=0c2687f44eb0e8c7f480b7303f89056682ba0bfb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 067f11f63e..2052c44842 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -56,8 +56,8 @@ class StubObject {
 	protected $params;
 
 	/**
-	 * @param string $global Name of the global variable.
-	 * @param string|callable $class Name of the class of the real object
+	 * @param string|null $global Name of the global variable.
+	 * @param string|callable|null $class Name of the class of the real object
 	 *                               or a factory function to call
 	 * @param array $params Parameters to pass to constructor of the real object.
 	 */
@@ -79,7 +79,7 @@ class StubObject {
 	 * @return bool True if $obj is not an instance of StubObject class.
 	 */
 	public static function isRealObject( $obj ) {
-		return is_object( $obj ) && !$obj instanceof StubObject;
+		return is_object( $obj ) && !$obj instanceof self;
 	}
 
 	/**
@@ -91,7 +91,7 @@ class StubObject {
 	 * @return void
 	 */
 	public static function unstub( &$obj ) {
-		if ( $obj instanceof StubObject ) {
+		if ( $obj instanceof self ) {
 			$obj = $obj->_unstub( 'unstub', 3 );
 		}
 	}
@@ -153,7 +153,7 @@ class StubObject {
 	public function _unstub( $name = '_unstub', $level = 2 ) {
 		static $recursionLevel = 0;
 
-		if ( !$GLOBALS[$this->global] instanceof StubObject ) {
+		if ( !$GLOBALS[$this->global] instanceof self ) {
 			return $GLOBALS[$this->global]; // already unstubbed.
 		}
 
@@ -171,38 +171,3 @@ class StubObject {
 		}
 	}
 }
-
-/**
- * Stub object for the user language. Assigned to the $wgLang global.
- */
-class StubUserLang extends StubObject {
-
-	public function __construct() {
-		parent::__construct( 'wgLang' );
-	}
-
-	/**
-	 * Call Language::findVariantLink after unstubbing $wgLang.
-	 *
-	 * This method is implemented with a full signature rather than relying on
-	 * __call so that the pass-by-reference signature of the proxied method is
-	 * honored.
-	 *
-	 * @param string &$link The name of the link
-	 * @param Title &$nt The title object of the link
-	 * @param bool $ignoreOtherCond To disable other conditions when
-	 *   we need to transclude a template or update a category's link
-	 */
-	public function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
-		global $wgLang;
-		$this->_unstub( 'findVariantLink', 3 );
-		$wgLang->findVariantLink( $link, $nt, $ignoreOtherCond );
-	}
-
-	/**
-	 * @return Language
-	 */
-	public function _newObject() {
-		return RequestContext::getMain()->getLanguage();
-	}
-}