X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FStubObject.php;h=1583dbf9f7619bdf1965d42a1d70f81dd061edd8;hp=5208b8f1fafee04e5240d57f77040dcdc239e48e;hb=e996b5391357ab03d53f0347854ec42a9b091a53;hpb=f4a53c54065c385172363416eb3cb44b67585ca2

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 5208b8f1fa..1583dbf9f7 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -19,6 +19,7 @@
  *
  * @file
  */
+use Wikimedia\ObjectFactory;
 
 /**
  * Class to implement stub globals, which are globals that delay loading the
@@ -55,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.
 	 */
@@ -86,7 +87,7 @@ class StubObject {
 	 * infinite loop when unstubbing an object or to avoid reference parameter
 	 * breakage.
 	 *
-	 * @param object $obj Object to check.
+	 * @param object &$obj Object to check.
 	 * @return void
 	 */
 	public static function unstub( &$obj ) {
@@ -170,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();
-	}
-}